From b78087d82270ba1aa0ac6d50dbe5b7d7ecf413c5 Mon Sep 17 00:00:00 2001 From: Mark Joshwel Date: Fri, 31 Jan 2025 19:12:33 +0800 Subject: [PATCH] game(meta/packages): reimport xr --- .../Interactors/Left_NearFarInteractor.prefab | 14 -- .../Prefabs/Interactors/Ray Interactor.prefab | 13 -- .../Right_NearFarInteractor.prefab | 4 - .../Interactors/Teleport Interactor.prefab | 13 -- .../Prefabs/XR Origin (XR Rig).prefab | 127 +----------------- .../Shaders/Interactable.shadergraph | 87 +++++------- .../TunnelingVignette.prefab | 1 - Game/Assets/XR/XRGeneralSettings.asset | 2 +- Game/Packages/manifest.json | 1 + Game/Packages/packages-lock.json | 2 +- Game/ProjectSettings/ProjectSettings.asset | 6 +- 11 files changed, 40 insertions(+), 230 deletions(-) diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab index 0adaa34..cd43e9b 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Left_NearFarInteractor.prefab @@ -101,7 +101,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 4 m_CustomizeExpandLineDrawPercent: 1 @@ -141,7 +140,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 4 m_CustomizeExpandLineDrawPercent: 1 @@ -181,7 +179,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 5 m_CustomizeExpandLineDrawPercent: 1 @@ -221,7 +218,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 5 m_CustomizeExpandLineDrawPercent: 1 @@ -261,7 +257,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 4 m_CustomizeExpandLineDrawPercent: 1 @@ -272,7 +267,6 @@ MonoBehaviour: m_EmptyHitMaterial: {fileID: 0} --- !u!120 &3053154067257784704 LineRenderer: - serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -358,20 +352,16 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 8 numCapVertices: 8 alignment: 0 textureMode: 0 - textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 - m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 - m_ApplyActiveColorSpace: 0 --- !u!210 &6278253758758756215 SortingGroup: m_ObjectHideFlags: 0 @@ -383,7 +373,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30005 - m_SortAtRoot: 0 --- !u!1 &4804964734930210078 GameObject: m_ObjectHideFlags: 0 @@ -483,7 +472,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_ActivateInput: @@ -513,7 +501,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 @@ -596,7 +583,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_UIScrollInput: diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab index 44013e8..a64d6eb 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab @@ -98,7 +98,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_ActivateInput: @@ -128,7 +127,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 @@ -240,7 +238,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_UIScrollInput: @@ -326,7 +323,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_ScaleOverTimeInput: @@ -359,7 +355,6 @@ MonoBehaviour: m_ManualValue: 0 --- !u!120 &7693184380767619946 LineRenderer: - serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -454,20 +449,16 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 4 numCapVertices: 4 alignment: 0 textureMode: 0 - textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 - m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 - m_ApplyActiveColorSpace: 0 --- !u!114 &4924506573850889901 MonoBehaviour: m_ObjectHideFlags: 0 @@ -540,7 +531,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_InvalidColorGradient: @@ -570,7 +560,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_BlockedColorGradient: @@ -600,7 +589,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_TreatSelectionAsValidState: 1 @@ -627,7 +615,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30005 - m_SortAtRoot: 0 --- !u!114 &5800936643595229357 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Right_NearFarInteractor.prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Right_NearFarInteractor.prefab index 8850bdc..f603a3d 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Right_NearFarInteractor.prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Right_NearFarInteractor.prefab @@ -5,7 +5,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2442306273320644280, guid: 3df3e1220f2164f448701a6de8084f92, type: 3} @@ -89,7 +88,4 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3} diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab index 9af05a2..880d5a2 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab @@ -98,7 +98,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_ActivateInput: @@ -128,7 +127,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 0 @@ -240,7 +238,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_UIScrollInput: @@ -326,7 +323,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_ScaleOverTimeInput: @@ -359,7 +355,6 @@ MonoBehaviour: m_ManualValue: 0 --- !u!120 &2761784063978902504 LineRenderer: - serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -454,20 +449,16 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 - textureScale: {x: 1, y: 1} shadowBias: 0.5 generateLightingData: 0 - m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 - m_ApplyActiveColorSpace: 0 --- !u!114 &2761784063978902505 MonoBehaviour: m_ObjectHideFlags: 0 @@ -540,7 +531,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_InvalidColorGradient: @@ -570,7 +560,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_BlockedColorGradient: @@ -600,7 +589,6 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 - m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 m_TreatSelectionAsValidState: 0 @@ -627,7 +615,6 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30005 - m_SortAtRoot: 0 --- !u!114 &3616344554909481683 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab index cd6cb71..d2188a9 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Prefabs/XR Origin (XR Rig).prefab @@ -416,7 +416,6 @@ GameObject: - component: {fileID: 1767192439} - component: {fileID: 1767192437} - component: {fileID: 6232745470614056083} - - component: {fileID: 785240573026610109} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -453,17 +452,9 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -599,50 +590,6 @@ MonoBehaviour: m_Action: Rotation m_Flags: 0 m_Flags: 0 ---- !u!114 &785240573026610109 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1767192433} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 --- !u!1 &58445280694286476 GameObject: m_ObjectHideFlags: 0 @@ -913,17 +860,9 @@ CharacterController: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1717954561962503725} 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 + serializedVersion: 2 m_Height: 1.36144 m_Radius: 0.1 m_SlopeLimit: 45 @@ -1266,7 +1205,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_GrabMoveAction: @@ -1330,7 +1268,6 @@ MonoBehaviour: m_ManualValue: 0 m_ManualQueuePerformed: 0 m_ManualQueueWasPerformedThisFrame: 0 - m_ManualQueueWasCompletedThisFrame: 0 m_ManualQueueValue: 0 m_ManualQueueTargetFrame: 0 m_GrabMoveAction: @@ -1699,7 +1636,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 202364688} m_Modifications: - target: {fileID: 8270855663187062767, guid: 1392f805216c47742996d4742c80721c, type: 3} @@ -1751,9 +1687,6 @@ PrefabInstance: value: Left Controller Visual objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1392f805216c47742996d4742c80721c, type: 3} --- !u!4 &8366379412631108205 stripped Transform: @@ -1765,7 +1698,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1670256625} m_Modifications: - target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3} @@ -1885,9 +1817,6 @@ PrefabInstance: value: objectReference: {fileID: 4238984354899526239} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3} --- !u!114 &2449787133337329425 stripped MonoBehaviour: @@ -1910,7 +1839,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 202364688} m_Modifications: - target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} @@ -1978,12 +1906,6 @@ PrefabInstance: value: 10 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} - insertIndex: -1 - addedObject: {fileID: 2814764233898000032} - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} --- !u!4 &1666320186578454293 stripped Transform: @@ -2016,7 +1938,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 202364688} m_Modifications: - target: {fileID: 2761784063978902503, guid: c1800acf6366418a9b5f610249000331, type: 3} @@ -2136,9 +2057,6 @@ PrefabInstance: value: objectReference: {fileID: 5967689310316253315} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1800acf6366418a9b5f610249000331, type: 3} --- !u!4 &1319746309 stripped Transform: @@ -2161,7 +2079,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1670256625} m_Modifications: - target: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} @@ -2225,12 +2142,6 @@ PrefabInstance: value: -10 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 780270278251679399, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} - insertIndex: -1 - addedObject: {fileID: 2052418245113747934} - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27024f5809f4a4347b9cd7f26a1bdf93, type: 3} --- !u!114 &2141651114331267770 stripped MonoBehaviour: @@ -2263,7 +2174,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1670256625} m_Modifications: - target: {fileID: 2447424620550846319, guid: b200f6587d118224eba8467281481800, type: 3} @@ -2315,9 +2225,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b200f6587d118224eba8467281481800, type: 3} --- !u!114 &1883230248363655243 stripped MonoBehaviour: @@ -2340,7 +2247,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 202364688} m_Modifications: - target: {fileID: 4804964734930210078, guid: 3df3e1220f2164f448701a6de8084f92, type: 3} @@ -2392,9 +2298,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3df3e1220f2164f448701a6de8084f92, type: 3} --- !u!4 &1543070802843469984 stripped Transform: @@ -2417,7 +2320,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1666320186578454293} m_Modifications: - target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} @@ -2485,21 +2387,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} ---- !u!4 &2814764233898000032 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} - m_PrefabInstance: {fileID: 6764233457049000944} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7400760887118150798 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 3954319948395782924} m_Modifications: - target: {fileID: 863512645795027999, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} @@ -2567,21 +2460,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} ---- !u!4 &2052418245113747934 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8849414207674852688, guid: bb91fcbcb3cc896468b372b1c762bfab, type: 3} - m_PrefabInstance: {fileID: 7400760887118150798} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7684238452101615925 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1670256625} m_Modifications: - target: {fileID: 3475118261464492563, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3} @@ -2633,9 +2517,6 @@ PrefabInstance: value: Right Controller Visual objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f3369e30fbd31f4bb596b1a99babe83, type: 3} --- !u!4 &6528530117482412838 stripped Transform: @@ -2647,7 +2528,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1680501587} m_Modifications: - target: {fileID: 3055433562365713971, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3} @@ -2711,9 +2591,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b84cd05e1160fe34cab2585022c8cd99, type: 3} --- !u!4 &2196849375614954873 stripped Transform: diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Shaders/Interactable.shadergraph b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Shaders/Interactable.shadergraph index 22fd054..753107c 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Shaders/Interactable.shadergraph +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Shaders/Interactable.shadergraph @@ -609,6 +609,9 @@ "m_Id": "" }, "m_ActiveTargets": [ + { + "m_Id": "7f4faf20e056441da3400fcf5a01bd1d" + }, { "m_Id": "4aa8a973dd78498e827b15fa6d213bc0" } @@ -774,7 +777,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -810,7 +812,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -844,7 +845,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -867,7 +867,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -960,7 +959,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1001,7 +999,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1085,7 +1082,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1121,7 +1117,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1267,7 +1262,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1318,7 +1312,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1360,7 +1353,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -1433,7 +1425,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1483,7 +1474,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1565,7 +1555,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1621,7 +1610,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1644,7 +1632,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1672,7 +1659,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -1795,22 +1781,19 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 1, "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 + "m_EnableGlobalMipBias": true } { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "4aa8a973dd78498e827b15fa6d213bc0", - "m_Datas": [], "m_ActiveSubTarget": { "m_Id": "8950326a11f44a81b3fc69ca5170c9c1" }, @@ -1823,7 +1806,6 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, - "m_SupportsLODCrossFade": false, "m_CustomEditorGUI": "", "m_SupportVFX": false } @@ -1854,7 +1836,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1919,13 +1900,20 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInLitSubTarget", + "m_ObjectId": "4f5ac9a480ac4addaabd14ae58f8f316", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -2099,7 +2087,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2209,7 +2196,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2336,6 +2322,23 @@ "m_Space": 0 } +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInTarget", + "m_ObjectId": "7f4faf20e056441da3400fcf5a01bd1d", + "m_ActiveSubTarget": { + "m_Id": "4f5ac9a480ac4addaabd14ae58f8f316" + }, + "m_AllowMaterialOverride": true, + "m_SurfaceType": 0, + "m_ZWriteControl": 0, + "m_ZTestMode": 4, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CustomEditorGUI": "" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", @@ -2391,13 +2394,12 @@ } { - "m_SGVersion": 2, + "m_SGVersion": 0, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", "m_ObjectId": "8950326a11f44a81b3fc69ca5170c9c1", "m_WorkflowMode": 1, "m_NormalDropOffSpace": 0, - "m_ClearCoat": false, - "m_BlendModePreserveSpecular": false + "m_ClearCoat": false } { @@ -2463,7 +2465,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2502,7 +2503,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2553,7 +2553,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2639,7 +2638,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -2728,7 +2726,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2853,7 +2850,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2916,7 +2912,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 2, "m_CustomColors": { "m_SerializableColors": [] @@ -3000,7 +2995,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3102,15 +3096,13 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] }, "m_TextureType": 0, "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 + "m_EnableGlobalMipBias": true } { @@ -3139,7 +3131,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3173,7 +3164,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3237,7 +3227,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3354,7 +3343,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3539,7 +3527,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3573,7 +3560,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3692,7 +3678,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3754,7 +3739,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3837,7 +3821,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3898,7 +3881,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3942,7 +3924,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3983,7 +3964,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4005,7 +3985,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4044,7 +4023,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4156,7 +4134,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] diff --git a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab index ba29a0a..7899549 100644 --- a/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab +++ b/Game/Assets/Samples/XR Interaction Toolkit/3.0.3/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab @@ -129,4 +129,3 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30010 - m_SortAtRoot: 0 diff --git a/Game/Assets/XR/XRGeneralSettings.asset b/Game/Assets/XR/XRGeneralSettings.asset index 81fef02..7c56bd2 100644 --- a/Game/Assets/XR/XRGeneralSettings.asset +++ b/Game/Assets/XR/XRGeneralSettings.asset @@ -123,7 +123,7 @@ MonoBehaviour: m_AutomaticLoading: 0 m_AutomaticRunning: 0 m_Loaders: - - {fileID: 11400000, guid: 28fe04729daeb2345bebc951fad25769, type: 2} + - {fileID: 11400000, guid: eb6d337c1678a97408eb0481002d9ae2, type: 2} --- !u!114 &4897379186331661704 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Game/Packages/manifest.json b/Game/Packages/manifest.json index 973f8a1..8fd81e1 100644 --- a/Game/Packages/manifest.json +++ b/Game/Packages/manifest.json @@ -24,6 +24,7 @@ "com.unity.xr.interaction.toolkit": "3.0.3", "com.unity.xr.legacyinputhelpers": "2.1.12", "com.unity.xr.management": "4.5.0", + "com.unity.xr.oculus": "4.4.0", "com.unity.xr.openxr": "1.14.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Game/Packages/packages-lock.json b/Game/Packages/packages-lock.json index 758f79c..a964b5c 100644 --- a/Game/Packages/packages-lock.json +++ b/Game/Packages/packages-lock.json @@ -372,7 +372,7 @@ }, "com.unity.xr.oculus": { "version": "4.4.0", - "depth": 1, + "depth": 0, "source": "registry", "dependencies": { "com.unity.xr.management": "4.4.0" diff --git a/Game/ProjectSettings/ProjectSettings.asset b/Game/ProjectSettings/ProjectSettings.asset index 98ad44c..56dbcae 100644 --- a/Game/ProjectSettings/ProjectSettings.asset +++ b/Game/ProjectSettings/ProjectSettings.asset @@ -825,7 +825,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2 + Android: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS CloudRendering: UNITY_POST_PROCESSING_STACK_V2 EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2 GameCoreXboxOne: UNITY_POST_PROCESSING_STACK_V2 @@ -834,9 +834,9 @@ PlayerSettings: PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 - Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2 + Standalone: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS WebGL: UNITY_POST_PROCESSING_STACK_V2 - Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2 + Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;UNITY_POST_PROCESSING_STACK_V2;USE_STICK_CONTROL_THUMBSTICKS XboxOne: UNITY_POST_PROCESSING_STACK_V2 tvOS: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {}