diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 2bebd22..29c931a 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -105,8 +105,8 @@ Rigidbody: m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 88 - m_CollisionDetection: 0 + m_Constraints: 8 + m_CollisionDetection: 2 --- !u!114 &1772573266731274173 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Rotator.cs b/Assets/Rotator.cs index 42ce9d8..756d27c 100644 --- a/Assets/Rotator.cs +++ b/Assets/Rotator.cs @@ -6,17 +6,22 @@ public class Rotator : MonoBehaviour { [SerializeField] - private float rotSpeed; + private Vector3 EulerRot; + [SerializeField] + private List bodies; + private Rigidbody rb; // Start is called before the first frame update void Start() { - + bodies.AddRange(GetComponentsInChildren()); + rb = GetComponent(); + EulerRot = new Vector3(0, 0, rotSpeed); } // Update is called once per frame - void Update() + void FixedUpdate() { - transform.Rotate(0,0,Time.deltaTime * rotSpeed); + rb.MoveRotation(rb.rotation * Quaternion.Euler(EulerRot * Time.fixedDeltaTime)); } } diff --git a/Assets/Scenes/Obstacles.unity b/Assets/Scenes/Obstacles.unity index ba27e57..8921716 100644 --- a/Assets/Scenes/Obstacles.unity +++ b/Assets/Scenes/Obstacles.unity @@ -251,7 +251,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111805105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 40.830006, y: 20.7, z: 0} + m_LocalPosition: {x: 10.63, y: 20.81, z: 0} m_LocalScale: {x: 2.8042, y: 2.8042, z: 6.9} m_ConstrainProportionsScale: 0 m_Children: [] @@ -321,12 +321,34 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 111805105} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &188521135 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8185732859686289177, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + m_PrefabInstance: {fileID: 8185732859503011254} + m_PrefabAsset: {fileID: 0} --- !u!4 &188521136 stripped Transform: m_CorrespondingSourceObject: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} m_PrefabInstance: {fileID: 8185732859503011254} m_PrefabAsset: {fileID: 0} +--- !u!54 &188521138 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188521135} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 --- !u!1 &206662342 GameObject: m_ObjectHideFlags: 0 @@ -1512,6 +1534,28 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070079036} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1134343326 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8185732858472026408, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + m_PrefabInstance: {fileID: 8185732859503011254} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1134343331 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1134343326} + serializedVersion: 2 + m_Mass: 1000 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 --- !u!1 &1166806157 GameObject: m_ObjectHideFlags: 0 @@ -1709,8 +1753,8 @@ PrefabInstance: objectReference: {fileID: 1301531513} - target: {fileID: 1772573266731274174, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} - propertyPath: m_Constraints - value: 8 + propertyPath: m_CollisionDetection + value: 2 objectReference: {fileID: 0} - target: {fileID: 1772573266731274175, guid: 4dbf735f9da7b9f43b69f1577e4e5763, type: 3} @@ -1775,6 +1819,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1341139406} m_PrefabAsset: {fileID: 0} +--- !u!1 &1500657984 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8185732858306452726, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + m_PrefabInstance: {fileID: 8185732859503011254} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1500657989 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1500657984} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 --- !u!1 &1530935835 GameObject: m_ObjectHideFlags: 0 @@ -2492,6 +2558,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7300022110886448938} m_PrefabAsset: {fileID: 0} +--- !u!1 &2046941238 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8185732857791692160, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + m_PrefabInstance: {fileID: 8185732859503011254} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2046941243 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2046941238} + serializedVersion: 2 + m_Mass: 1000 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 1 --- !u!1 &2129712287 GameObject: m_ObjectHideFlags: 0 @@ -2851,6 +2939,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 778227310} m_Modifications: + - target: {fileID: 8185732858306452726, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + propertyPath: m_Name + value: Center + objectReference: {fileID: 0} - target: {fileID: 8185732859686289158, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_RootOrder @@ -2906,6 +2999,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8185732859686289159, guid: 3aef9205067d34c46bee46559d8e90dd, + type: 3} + propertyPath: rotSpeed + value: 100 + objectReference: {fileID: 0} - target: {fileID: 8185732859686289177, guid: 3aef9205067d34c46bee46559d8e90dd, type: 3} propertyPath: m_Name