diff --git a/Assets/Scenes/Main Scenes/Disco Club (Final) 1.unity b/Assets/Scenes/Main Scenes/Disco Club (Final) 1.unity index efdae1c1..0f030a9b 100644 --- a/Assets/Scenes/Main Scenes/Disco Club (Final) 1.unity +++ b/Assets/Scenes/Main Scenes/Disco Club (Final) 1.unity @@ -26379,107 +26379,6 @@ MonoBehaviour: G: 0 H: 0 _occupant: {fileID: 0} ---- !u!1001 &100297176 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 389892377827655713, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1313387626942770467, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1321845464265225198, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1455627500719408839, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1473804447825476082, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsKinematic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalPosition.x - value: -1.5233812 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.00000011920929 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalPosition.z - value: 8.515371 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2891151203823286733, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4058290337759795565, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4283908667850935776, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5282118117312683313, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_Name - value: Bottle - objectReference: {fileID: 0} - - target: {fileID: 6676465983268384331, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7601339144407773843, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9158440356451630870, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} --- !u!1001 &100734081 PrefabInstance: m_ObjectHideFlags: 0 @@ -106348,7 +106247,7 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 totalTravelTime: 0.8 - thrownObject: {fileID: 1833473052} + thrownObject: {fileID: 0} DEBUG_Points: 14 DEBUG_LineWidth: 13.4 --- !u!4 &382686758 @@ -379292,6 +379191,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1318005205} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1318844750 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalPosition.x + value: -2.475 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.015 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalPosition.z + value: 7.548 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1832655067751428217, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5282118117312683313, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} + propertyPath: m_Name + value: Bottle (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} --- !u!1 &1319791782 GameObject: m_ObjectHideFlags: 0 @@ -522336,11 +522292,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833307663} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1833473052 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2443804760169104021, guid: 5ac5805397af87a4e8ba160f6f84233e, type: 3} - m_PrefabInstance: {fileID: 100297176} - m_PrefabAsset: {fileID: 0} --- !u!1 &1833781282 GameObject: m_ObjectHideFlags: 0 @@ -752646,5 +752597,5 @@ SceneRoots: - {fileID: 1686598164} - {fileID: 382686758} - {fileID: 1938339774} - - {fileID: 100297176} - {fileID: 603400623} + - {fileID: 1318844750} diff --git a/Assets/Scripts/Behaviors/Throwable/Throwable.cs b/Assets/Scripts/Behaviors/Throwable/Throwable.cs index 40ed09c7..7d43e1b4 100644 --- a/Assets/Scripts/Behaviors/Throwable/Throwable.cs +++ b/Assets/Scripts/Behaviors/Throwable/Throwable.cs @@ -38,6 +38,8 @@ public int Range { set => _throwRange = value; } + [SerializeField] float torque = 15f; + public GridCell startCell; public GridCell targetCell; @@ -89,15 +91,22 @@ public override void GetControllingComponent() } public override IEnumerator ExecuteBehaviorCoroutine() { - Outline outline = Object.GetComponent(); + Outline outline = thrownObject.GetComponent(); if (outline != null) { outline.enabled = false; } + + Rigidbody rb = thrownObject.GetComponent(); + if (rb != null) + { + rb.AddTorque(rb.transform.right * torque); + } // Set up parabola _parabola.startTransform = startCell.transform; _parabola.endTransform = targetCell.transform; + _parabola.endTransform.position += targetCell.transform.up * 0.1f; _parabola.thrownObject = thrownObject; Debug.Log("Executing Throwable Routine");