diff --git a/Assets/Content/WorldObjects/Structures/Walls/SteelGirderUnbolted.prefab b/Assets/Content/WorldObjects/Structures/Walls/SteelGirderUnbolted.prefab index 3ef8ea3f7..44457115f 100644 --- a/Assets/Content/WorldObjects/Structures/Walls/SteelGirderUnbolted.prefab +++ b/Assets/Content/WorldObjects/Structures/Walls/SteelGirderUnbolted.prefab @@ -159,7 +159,6 @@ MonoBehaviour: _networkBehaviours: - {fileID: 6528007219760414512} - {fileID: 3677971068628630644} - - {fileID: 0} - {fileID: 4376666213352250170} k__BackingField: {fileID: 0} k__BackingField: [] @@ -272,7 +271,7 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3591147544166670882} serializedVersion: 2 - m_Mass: 600 + m_Mass: 100 m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 1 @@ -309,7 +308,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7074274b1e6ce7441a60a1b0798d7a45, type: 3} m_Name: m_EditorClassIdentifier: - _componentIndexCache: 3 + _componentIndexCache: 2 _addedNetworkObject: {fileID: -2900075557854325373} _networkObjectCache: {fileID: -2900075557854325373} _dragged: 0 diff --git a/Assets/Scripts/SS3D/Systems/Animations/GrabAnimation.cs b/Assets/Scripts/SS3D/Systems/Animations/GrabAnimation.cs index 34fb0347c..6c1bda7f6 100644 --- a/Assets/Scripts/SS3D/Systems/Animations/GrabAnimation.cs +++ b/Assets/Scripts/SS3D/Systems/Animations/GrabAnimation.cs @@ -128,11 +128,12 @@ private void HandleGrabbing() _grabbedObject.transform.position = _mainHand.Hold.HoldTransform.position; grabbedRb.velocity = Vector3.zero; grabbedRb.position = _mainHand.Hold.HoldTransform.position; + grabbedRb.detectCollisions = false; } - grabbedRb.detectCollisions = false; + - _fixedJoint = _mainHand.HandBone.gameObject.AddComponent(); + _fixedJoint = Controller.GameObject.AddComponent(); _fixedJoint.connectedBody = grabbedRb; _fixedJoint.breakForce = _jointBreakForce; }