From 34557c7b1345b66c7ca491710c8e4cd559d92905 Mon Sep 17 00:00:00 2001 From: Cody Wright Date: Fri, 15 Dec 2023 16:11:42 -0500 Subject: [PATCH] Applied changed to the Cartridge_V3 Variant Interactable.prefab Applied the made changes to the parts that are affected by gravity on the cartridge --- .../Cartridge_V3 Variant Interactable.prefab | 18 ++--- Assets/Prefabs/Cartridge-Interactable.prefab | 6 +- Assets/Prefabs/LabSpace.prefab | 16 ++++ Assets/Scenes/BasicScene.unity | 76 ++++++++++--------- 4 files changed, 68 insertions(+), 48 deletions(-) diff --git a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab index d7f7809..085dfd9 100644 --- a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab +++ b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab @@ -379,8 +379,8 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 + m_UseGravity: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 @@ -530,7 +530,7 @@ MonoBehaviour: m_RotationOrder: 4 m_ThrowVelocityScale: 1.5 m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 + m_ForceGravityOnDetach: 1 m_RetainTransformParent: 1 m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] @@ -2716,8 +2716,8 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 + m_UseGravity: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 @@ -2867,7 +2867,7 @@ MonoBehaviour: m_RotationOrder: 4 m_ThrowVelocityScale: 1.5 m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 + m_ForceGravityOnDetach: 1 m_RetainTransformParent: 1 m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] @@ -3178,8 +3178,8 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 + m_UseGravity: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 @@ -3329,7 +3329,7 @@ MonoBehaviour: m_RotationOrder: 4 m_ThrowVelocityScale: 1.5 m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 + m_ForceGravityOnDetach: 1 m_RetainTransformParent: 1 m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] diff --git a/Assets/Prefabs/Cartridge-Interactable.prefab b/Assets/Prefabs/Cartridge-Interactable.prefab index 910d67b..f9255cb 100644 --- a/Assets/Prefabs/Cartridge-Interactable.prefab +++ b/Assets/Prefabs/Cartridge-Interactable.prefab @@ -3107,8 +3107,8 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 + m_UseGravity: 1 + m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 @@ -3258,7 +3258,7 @@ MonoBehaviour: m_RotationOrder: 4 m_ThrowVelocityScale: 1.5 m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 + m_ForceGravityOnDetach: 1 m_RetainTransformParent: 0 m_AttachPointCompatibilityMode: 0 m_StartingSingleGrabTransformers: [] diff --git a/Assets/Prefabs/LabSpace.prefab b/Assets/Prefabs/LabSpace.prefab index 9405438..4a38961 100644 --- a/Assets/Prefabs/LabSpace.prefab +++ b/Assets/Prefabs/LabSpace.prefab @@ -200,6 +200,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1024681846135835656} m_Modifications: + - target: {fileID: 3774238497440674398, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} + propertyPath: isLocked + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3970644888107419690, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} + propertyPath: isLocked + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5446038345979176515, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} propertyPath: m_Name value: Cartridge-Interactable @@ -244,10 +252,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8075794149781177989, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} + propertyPath: isLocked + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8075794149781177989, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} propertyPath: lockedLayerMask.m_Bits value: 1 objectReference: {fileID: 0} + - target: {fileID: 8138633126094991808, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} + propertyPath: isLocked + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 423589b..4734188 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -123,6 +123,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!54 &59573854 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 7812820016551315205, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + m_PrefabInstance: {fileID: 1835422393} + m_PrefabAsset: {fileID: 0} --- !u!20 &135570299 stripped Camera: m_CorrespondingSourceObject: {fileID: 731506051283350118, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} @@ -133,6 +138,16 @@ Light: m_CorrespondingSourceObject: {fileID: 4610388823093620668, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} m_PrefabInstance: {fileID: 1835422393} m_PrefabAsset: {fileID: 0} +--- !u!54 &593329662 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 584571707657079726, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + m_PrefabInstance: {fileID: 1835422393} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1111219719 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 7885669140710470493, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + m_PrefabInstance: {fileID: 1835422393} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1520454031 PrefabInstance: m_ObjectHideFlags: 0 @@ -190,6 +205,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e629b36dd520da42a7d3b0c54050ea4, type: 3} +--- !u!54 &1723099566 stripped +Rigidbody: + m_CorrespondingSourceObject: {fileID: 365544109579859515, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + m_PrefabInstance: {fileID: 1835422393} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1835422393 PrefabInstance: m_ObjectHideFlags: 0 @@ -202,22 +222,6 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 135570299} - - target: {fileID: 365544109579859515, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_UseGravity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 365544109579859515, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_IsKinematic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 584571707657079726, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_UseGravity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 584571707657079726, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_IsKinematic - value: 0 - objectReference: {fileID: 0} - target: {fileID: 816057727172110300, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -270,6 +274,14 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 135570299} + - target: {fileID: 1749934368914098634, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: rigidbody + value: + objectReference: {fileID: 593329662} + - target: {fileID: 1960013199680762814, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: rigidbody + value: + objectReference: {fileID: 59573854} - target: {fileID: 2193716159056342434, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -312,7 +324,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -420,7 +432,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -448,7 +460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -510,6 +522,14 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6863889943897360229, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: rigidbody + value: + objectReference: {fileID: 1111219719} + - target: {fileID: 6890982149484982304, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: rigidbody + value: + objectReference: {fileID: 1723099566} - target: {fileID: 6899455370481246272, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -614,22 +634,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7812820016551315205, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_UseGravity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7812820016551315205, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_IsKinematic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7885669140710470493, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_UseGravity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7885669140710470493, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} - propertyPath: m_IsKinematic - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -644,7 +648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40 objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y