diff --git a/Assets/NoFriction.physicMaterial b/Assets/NoFriction.physicMaterial new file mode 100644 index 0000000..7f2c685 --- /dev/null +++ b/Assets/NoFriction.physicMaterial @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoFriction + dynamicFriction: 0 + staticFriction: 0 + bounciness: 0 + frictionCombine: 0 + bounceCombine: 0 diff --git a/Assets/NoFriction.physicMaterial.meta b/Assets/NoFriction.physicMaterial.meta new file mode 100644 index 0000000..943e13f --- /dev/null +++ b/Assets/NoFriction.physicMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa15d3dbf2db3504eab6d81839f8c74b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 13400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index b1a1f33..0fdac7b 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795195828905777770} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -148,6 +149,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -213,7 +215,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 494189295979627311} - - component: {fileID: 8068927831030430839} - component: {fileID: 7337432708349338768} m_Layer: 0 m_Name: House @@ -238,22 +239,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8068927831030430839 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5179206290616997027} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &7337432708349338768 MonoBehaviour: m_ObjectHideFlags: 0 @@ -268,3 +253,4 @@ MonoBehaviour: m_EditorClassIdentifier: title: House description: A place for people to live in. + buildingType: 0 diff --git a/Assets/Prefabs/Buildings/HouseConstruction.prefab b/Assets/Prefabs/Buildings/HouseConstruction.prefab index fedf1e8..07b56fb 100644 --- a/Assets/Prefabs/Buildings/HouseConstruction.prefab +++ b/Assets/Prefabs/Buildings/HouseConstruction.prefab @@ -52,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -89,7 +90,7 @@ BoxCollider: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1874134898345004315} - m_Material: {fileID: 0} + m_Material: {fileID: 13400000, guid: fa15d3dbf2db3504eab6d81839f8c74b, type: 2} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 @@ -147,6 +148,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -199,7 +201,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 301781106009560158} - - component: {fileID: 8041566757370854614} - component: {fileID: 1315160238030080861} m_Layer: 0 m_Name: HouseConstruction @@ -224,22 +225,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &8041566757370854614 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4975262029746308050} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 --- !u!114 &1315160238030080861 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Character/PlayerMovement.cs b/Assets/Scripts/Character/PlayerMovement.cs index e11bc10..59dbc69 100644 --- a/Assets/Scripts/Character/PlayerMovement.cs +++ b/Assets/Scripts/Character/PlayerMovement.cs @@ -30,6 +30,8 @@ public class PlayerMovement : MonoBehaviour Vector3 movement; + + private void Start() { rb = GetComponent();