From 45bb69ff565297c2fde8e59f0dd478a9f0b83f0a Mon Sep 17 00:00:00 2001 From: Cody Wright Date: Wed, 13 Dec 2023 17:09:22 -0500 Subject: [PATCH 1/5] Add Gravity to Removed Parts Added gravity to the clip, CanisterTape, plug, and Flip_Pad_Pull_Out (Rigidbody) --- .vscode/extensions.json | 5 ++ .vscode/launch.json | 10 ++++ .vscode/settings.json | 55 +++++++++++++++++++ .../Model/Cartridge_V3.fbx.meta | 2 +- Assets/Scenes/BasicScene.unity | 40 ++++++++++++-- .../Settings/Open XR Package Settings.asset | 28 +++++++++- Packages/manifest.json | 8 +-- Packages/packages-lock.json | 42 +++++++------- ProjectSettings/ProjectVersion.txt | 4 +- 9 files changed, 161 insertions(+), 33 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..ddb6ff8 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "visualstudiotoolsforunity.vstuc" + ] +} diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..da60e25 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,10 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Unity", + "type": "vstuc", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..19d6062 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,55 @@ +{ + "files.exclude": { + "**/.DS_Store": true, + "**/.git": true, + "**/.gitmodules": true, + "**/*.booproj": true, + "**/*.pidb": true, + "**/*.suo": true, + "**/*.user": true, + "**/*.userprefs": true, + "**/*.unityproj": true, + "**/*.dll": true, + "**/*.exe": true, + "**/*.pdf": true, + "**/*.mid": true, + "**/*.midi": true, + "**/*.wav": true, + "**/*.gif": true, + "**/*.ico": true, + "**/*.jpg": true, + "**/*.jpeg": true, + "**/*.png": true, + "**/*.psd": true, + "**/*.tga": true, + "**/*.tif": true, + "**/*.tiff": true, + "**/*.3ds": true, + "**/*.3DS": true, + "**/*.fbx": true, + "**/*.FBX": true, + "**/*.lxo": true, + "**/*.LXO": true, + "**/*.ma": true, + "**/*.MA": true, + "**/*.obj": true, + "**/*.OBJ": true, + "**/*.asset": true, + "**/*.cubemap": true, + "**/*.flare": true, + "**/*.mat": true, + "**/*.meta": true, + "**/*.prefab": true, + "**/*.unity": true, + "build/": true, + "Build/": true, + "Library/": true, + "library/": true, + "obj/": true, + "Obj/": true, + "ProjectSettings/": true, + "temp/": true, + "Temp/": true + }, + "dotnet.defaultSolution": "MAVRIC.sln" +} \ No newline at end of file diff --git a/Assets/Models/Fortus Canister/Model/Cartridge_V3.fbx.meta b/Assets/Models/Fortus Canister/Model/Cartridge_V3.fbx.meta index bb903a0..9bdabce 100644 --- a/Assets/Models/Fortus Canister/Model/Cartridge_V3.fbx.meta +++ b/Assets/Models/Fortus Canister/Model/Cartridge_V3.fbx.meta @@ -90,7 +90,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 0.001 + globalScale: 0.1 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 9fcdea6..423589b 100644 --- a/Assets/Scenes/BasicScene.unity +++ b/Assets/Scenes/BasicScene.unity @@ -202,6 +202,22 @@ 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 @@ -296,7 +312,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2628940897587494939, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -404,7 +420,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5285082825006261282, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -432,7 +448,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5286286915731469758, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y @@ -598,6 +614,22 @@ 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 @@ -612,7 +644,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8078270248637806159, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index 57a0a28..4033da4 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -15,6 +15,7 @@ MonoBehaviour: features: [] m_renderMode: 1 m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &-8895518590110429109 MonoBehaviour: m_ObjectHideFlags: 0 @@ -270,6 +271,7 @@ MonoBehaviour: - {fileID: -5611916350011621528} m_renderMode: 1 m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &-6368128839055358620 MonoBehaviour: m_ObjectHideFlags: 0 @@ -589,6 +591,7 @@ MonoBehaviour: - {fileID: 2220871646205782247} m_renderMode: 1 m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &-2985913013423072367 MonoBehaviour: m_ObjectHideFlags: 0 @@ -834,6 +837,7 @@ MonoBehaviour: - {fileID: -7581625304019661375} m_renderMode: 1 m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &-34596358968032513 MonoBehaviour: m_ObjectHideFlags: 0 @@ -886,12 +890,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} m_Name: Open XR Package Settings m_EditorClassIdentifier: - Keys: 01000000070000000e00000004000000 + Keys: 01000000070000000e000000040000000d000000 Values: - {fileID: -3160651408743164439} - {fileID: -64324148185763206} - {fileID: 4257799398954384198} - {fileID: -9211917895290312687} + - {fileID: 8014290140957049348} --- !u!114 &32361891232910083 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1503,6 +1508,7 @@ MonoBehaviour: - {fileID: -5644509607064669464} m_renderMode: 1 m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &4451366187881382638 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1877,6 +1883,10 @@ MonoBehaviour: manifestName: cambria enabled: 1 forceRemoveInternetPermission: 1 + symmetricProjection: 0 + systemSplashScreen: {fileID: 0} + lateLatchingMode: 0 + lateLatchingDebug: 0 --- !u!114 &7558681416710770871 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1917,6 +1927,22 @@ MonoBehaviour: company: priority: 0 required: 0 +--- !u!114 &8014290140957049348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} + m_Name: WebGL + m_EditorClassIdentifier: + features: [] + m_renderMode: 1 + m_depthSubmissionMode: 0 + m_symmetricProjection: 0 --- !u!114 &8165340515022376955 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index ef57f7b..752e7c7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.7", + "com.unity.collab-proxy": "2.2.0", "com.unity.feature.development": "1.0.1", "com.unity.feature.vr": "1.0.0", "com.unity.learn.iet-framework": "3.1.3", - "com.unity.render-pipelines.universal": "14.0.8", + "com.unity.render-pipelines.universal": "14.0.9", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.visualscripting": "1.9.1", "com.unity.xr.hands": "1.3.0", "com.unity.xr.interaction.toolkit": "2.5.2", - "com.unity.xr.management": "4.3.3", - "com.unity.xr.openxr": "1.8.2", + "com.unity.xr.management": "4.4.0", + "com.unity.xr.openxr": "1.9.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c6a7a6c..e2aaf0c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.burst": { - "version": "1.8.8", + "version": "1.8.9", "depth": 1, "source": "registry", "dependencies": { @@ -10,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.7", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": {}, @@ -35,8 +35,8 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.ide.visualstudio": "2.0.18", - "com.unity.ide.rider": "3.0.24", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ide.rider": "3.0.26", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.2.2", @@ -49,12 +49,12 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.xr.oculus": "4.0.0", - "com.unity.xr.openxr": "1.8.2" + "com.unity.xr.oculus": "4.1.1", + "com.unity.xr.openxr": "1.9.1" } }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.26", "depth": 1, "source": "registry", "dependencies": { @@ -63,7 +63,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 1, "source": "registry", "dependencies": { @@ -112,7 +112,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { @@ -123,14 +123,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.9", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", - "com.unity.render-pipelines.core": "14.0.8", - "com.unity.shadergraph": "14.0.8" + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "14.0.9", + "com.unity.shadergraph": "14.0.9" } }, "com.unity.searcher": { @@ -148,11 +148,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.9", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.9", "com.unity.searcher": "4.9.2" } }, @@ -265,7 +265,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.3.3", + "version": "4.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -277,22 +277,22 @@ "url": "https://packages.unity.com" }, "com.unity.xr.oculus": { - "version": "4.0.0", + "version": "4.1.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.2.0" + "com.unity.xr.management": "4.4.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.8.2", + "version": "1.9.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.0.1", + "com.unity.xr.management": "4.4.0", "com.unity.xr.legacyinputhelpers": "2.1.2", - "com.unity.inputsystem": "1.4.4", + "com.unity.inputsystem": "1.6.3", "com.unity.xr.core-utils": "2.1.1" }, "url": "https://packages.unity.com" diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a74c35f..91206fd 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.9f1 -m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338) +m_EditorVersion: 2022.3.13f1 +m_EditorVersionWithRevision: 2022.3.13f1 (5f90a5ebde0f) From 0882c6e86623fc20b5e02a4e9c573ee57c24d72a Mon Sep 17 00:00:00 2001 From: "Brown, Caleb M" Date: Fri, 15 Dec 2023 12:13:25 -0500 Subject: [PATCH 2/5] BUGFIX: Fix for the InteractableLockingFilter blocking everything (including physics??) driven via the GrabInteractable when "locked" --- Assets/Prefabs/LabSpace.prefab | 4 + .../Filters/XRInteractableLockingFilter.cs | 95 ++++++++++--------- 2 files changed, 52 insertions(+), 47 deletions(-) diff --git a/Assets/Prefabs/LabSpace.prefab b/Assets/Prefabs/LabSpace.prefab index 31cf66d..9405438 100644 --- a/Assets/Prefabs/LabSpace.prefab +++ b/Assets/Prefabs/LabSpace.prefab @@ -244,6 +244,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8075794149781177989, guid: 1c45490f0e14d4e9c8930009b4ed7108, type: 3} + propertyPath: lockedLayerMask.m_Bits + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs b/Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs index 9b7aaa6..2d0873a 100644 --- a/Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs +++ b/Assets/Scripts/Interactions/Filters/XRInteractableLockingFilter.cs @@ -1,5 +1,7 @@ /// Traken from https://forum.unity.com/threads/how-to-prevent-interactable-from-being-selected-while-in-socket.1317246/#post-9101254 +using System; +using Sirenix.OdinInspector; using UnityEngine.Assertions; using UnityEngine.Serialization; @@ -11,18 +13,27 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering #region Fields [Tooltip("The interactor that this filter is associated with. If none, will attempt to find on self.")] - [SerializeField] - private XRBaseInteractable interactable; - - [FormerlySerializedAs("m_locked")] [SerializeField] - private bool isLocked = false; + [SerializeField] private XRBaseInteractable interactable; + [FormerlySerializedAs("m_locked")] + [SerializeField] private bool isLocked = false; + + [SerializeField] private InteractionLayerMask unlockedLayerMask = 1 << 0; // Default value is "Default" layer + #endregion #region Properties - - public bool IsLocked { get => isLocked; set => isLocked = value; } - + + public bool IsLocked + { + get => isLocked; + set + { + isLocked = value; + UpdateInteractionLayerMask(); + } + } + public bool canProcess => true; #endregion @@ -34,59 +45,49 @@ namespace UnityEngine.XR.Interaction.Toolkit.Filtering interactable = interactable ? interactable : GetComponent(); Assert.IsNotNull(interactable); } - + private void OnEnable() { - AddFilters(); + UpdateInteractionLayerMask(); } - - private void OnDisable() - { - RemoveFilters(); - } - - private void AddFilters() - { - if (interactable == null) return; - - // Add filter to interactable - interactable.startingHoverFilters.Add(this); - interactable.startingSelectFilters.Add(this); - - // Make extra sure that the filter is added to the interactable - interactable.hoverFilters.Add(this); - interactable.selectFilters.Add(this); - } - - private void RemoveFilters() - { - if (interactable == null) return; - - // Remove filter from interactable - interactable.startingHoverFilters.Remove(this); - interactable.startingSelectFilters.Remove(this); - interactable.hoverFilters.Remove(this); - interactable.selectFilters.Remove(this); - } - + public bool Process(IXRHoverInteractor interactor, IXRHoverInteractable interactable) { return Process(); } - + public bool Process(IXRSelectInteractor interactor, IXRSelectInteractable interactable) { return Process(); } - + private bool Process() { - if (interactable == null) - return false; - - return !isLocked; + UpdateInteractionLayerMask(); + + return canProcess; } - + + private void UpdateInteractionLayerMask() + { + if (interactable == null) + { + Debug.LogError($"Interactable is null on {gameObject.name}"); + return; + } + + if (IsLocked) + { + // Remove layer from interactable + interactable.interactionLayers &= ~unlockedLayerMask; + } + else + { + // Add layer to interactable + interactable.interactionLayers |= unlockedLayerMask; + } + } + #endregion } } \ No newline at end of file From ea3eaa6e0308a057a3d43692252349e6590d146f Mon Sep 17 00:00:00 2001 From: "Brown, Caleb M" Date: Fri, 15 Dec 2023 12:31:30 -0500 Subject: [PATCH 3/5] BUGFIX: Fixed Rigidbody Pad to be socketed on Active --- .../Cartridge_V3 Variant Interactable.prefab | 115 ++++++++++++++++++ Assets/Prefabs/Cartridge-Interactable.prefab | 16 +++ 2 files changed, 131 insertions(+) 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 77cf53e..d7f7809 100644 --- a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab +++ b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab @@ -894,6 +894,120 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2383595057096189641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7191601780445793351} + - component: {fileID: 8162120969493816073} + - component: {fileID: 7398400143197239005} + m_Layer: 0 + m_Name: Flip_Pad_Pull_Out (Socket) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7191601780445793351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2383595057096189641} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000059604616, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.00033500555, z: -0.00012999527} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 421256685097331234} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &8162120969493816073 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2383595057096189641} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.00025 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7398400143197239005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2383595057096189641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 32 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 0 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + m_SocketActive: 1 + m_InteractableHoverScale: 1.1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} --- !u!1 &2430839488996525746 GameObject: m_ObjectHideFlags: 0 @@ -1471,6 +1585,7 @@ Transform: m_Children: - {fileID: 6805840251457248530} - {fileID: 6456035007540429744} + - {fileID: 7191601780445793351} m_Father: {fileID: 2477252259466568489} m_LocalEulerAnglesHint: {x: 86, y: 0, z: 0} --- !u!33 &3790417273332515381 diff --git a/Assets/Prefabs/Cartridge-Interactable.prefab b/Assets/Prefabs/Cartridge-Interactable.prefab index d765727..910d67b 100644 --- a/Assets/Prefabs/Cartridge-Interactable.prefab +++ b/Assets/Prefabs/Cartridge-Interactable.prefab @@ -1296,6 +1296,8 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 --- !u!1 &2672275468392498656 GameObject: m_ObjectHideFlags: 0 @@ -3276,6 +3278,8 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 --- !u!1001 &3316605137565340392 PrefabInstance: m_ObjectHideFlags: 0 @@ -3384,6 +3388,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7398400143197239005, guid: b27049639847946ddac425fa7721eb71, type: 3} + propertyPath: m_StartingSelectedInteractable + value: + objectReference: {fileID: 4206626928681935766} - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_MovementType value: 0 @@ -3521,6 +3529,8 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 --- !u!114 &5809729421961169329 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 9126189417414843225, guid: b27049639847946ddac425fa7721eb71, type: 3} @@ -3556,6 +3566,8 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 --- !u!114 &6261687912628628780 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8710816239888859076, guid: b27049639847946ddac425fa7721eb71, type: 3} @@ -3586,6 +3598,8 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 --- !u!1 &8905706300752561573 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3} @@ -3631,3 +3645,5 @@ MonoBehaviour: m_EditorClassIdentifier: interactable: {fileID: 0} isLocked: 1 + unlockedLayerMask: + m_Bits: 1 From 34557c7b1345b66c7ca491710c8e4cd559d92905 Mon Sep 17 00:00:00 2001 From: Cody Wright Date: Fri, 15 Dec 2023 16:11:42 -0500 Subject: [PATCH 4/5] 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 From 453206a0f786c0f5b6761334dba94386f6bed5ec Mon Sep 17 00:00:00 2001 From: "Brown, Caleb M" Date: Thu, 21 Dec 2023 14:23:51 -0500 Subject: [PATCH 5/5] MAVRIC-2185: Fixed FlipArm door socket issue --- .../Cartridge_V3 Variant Interactable.prefab | 106 ------------------ Assets/Prefabs/Cartridge-Interactable.prefab | 49 +++----- 2 files changed, 18 insertions(+), 137 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 085dfd9..6ff1ff1 100644 --- a/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab +++ b/Assets/Models/Fortus Canister/Model/Cartridge_V3 Variant Interactable.prefab @@ -1584,7 +1584,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6805840251457248530} - - {fileID: 6456035007540429744} - {fileID: 7191601780445793351} m_Father: {fileID: 2477252259466568489} m_LocalEulerAnglesHint: {x: 86, y: 0, z: 0} @@ -1960,111 +1959,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &6165883632583038797 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6456035007540429744} - - component: {fileID: 7491122695439327624} - - component: {fileID: 2542004312418342111} - - component: {fileID: 3856986954198828731} - m_Layer: 0 - m_Name: Flip_Pad_Pull_Out - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6456035007540429744 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6165883632583038797} - serializedVersion: 2 - m_LocalRotation: {x: -0.000000089406946, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.00033500112, z: -0.00013000034} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 421256685097331234} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7491122695439327624 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6165883632583038797} - m_Mesh: {fileID: 1219518195786479877, guid: 9ab71472b5bb94890a03b7ca5ec138fa, type: 3} ---- !u!23 &2542004312418342111 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6165883632583038797} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 12d57f81b6c8b4e2594491000f517ebd, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3856986954198828731 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6165883632583038797} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.0005044888, y: 0.00028706918, z: 0.00007960753} - m_Center: {x: -0.0000000018626451, y: -0.0000000019354047, z: -0.000000003576135} --- !u!1 &6210601333934497842 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Cartridge-Interactable.prefab b/Assets/Prefabs/Cartridge-Interactable.prefab index f9255cb..f273bcd 100644 --- a/Assets/Prefabs/Cartridge-Interactable.prefab +++ b/Assets/Prefabs/Cartridge-Interactable.prefab @@ -748,30 +748,6 @@ MonoBehaviour: focusResponse: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 8905706300752561573} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 8681397286677477019} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 3970644888107419690} m_TargetAssemblyTypeName: UnityEngine.XR.Interaction.Toolkit.Filtering.XRInteractableFilter, Assembly-CSharp @@ -2998,7 +2974,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3299088965526146119 Transform: m_ObjectHideFlags: 0 @@ -3288,6 +3264,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6554210300994472440} m_Modifications: + - target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3} + propertyPath: m_UseGravity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 308438123433256243, guid: b27049639847946ddac425fa7721eb71, type: 3} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} - target: {fileID: 421256685097331234, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -86 @@ -3386,12 +3370,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7398400143197239005, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_StartingSelectedInteractable value: objectReference: {fileID: 4206626928681935766} + - target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3} + propertyPath: m_UseGravity + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7798793048474624085, guid: b27049639847946ddac425fa7721eb71, type: 3} + propertyPath: m_IsKinematic + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8523844120909673269, guid: b27049639847946ddac425fa7721eb71, type: 3} propertyPath: m_MovementType value: 0 @@ -3600,11 +3592,6 @@ MonoBehaviour: isLocked: 1 unlockedLayerMask: m_Bits: 1 ---- !u!1 &8905706300752561573 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6165883632583038797, guid: b27049639847946ddac425fa7721eb71, type: 3} - m_PrefabInstance: {fileID: 3316605137565340392} - m_PrefabAsset: {fileID: 0} --- !u!1 &9191249259938328202 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5875810263984471138, guid: b27049639847946ddac425fa7721eb71, type: 3}