diff --git a/Assets/Scenes/HDRobo_Main.unity b/Assets/Scenes/HDRobo_Main.unity index 7d9f560..a0e0369 100644 --- a/Assets/Scenes/HDRobo_Main.unity +++ b/Assets/Scenes/HDRobo_Main.unity @@ -6096,7 +6096,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -24.539} + m_AnchoredPosition: {x: 0, y: -24.539001} m_SizeDelta: {x: 0, y: -27.634} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &489881852 @@ -12280,7 +12280,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -60.6375} + m_AnchoredPosition: {x: 0, y: -60.637497} m_SizeDelta: {x: 1820, y: 680.3164} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &894852500 @@ -16165,7 +16165,7 @@ RectTransform: m_GameObject: {fileID: 1243479628} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.6, z: 1} + m_LocalScale: {x: 0.15, y: 0.3, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 489881851} @@ -23907,9 +23907,9 @@ Canvas: m_GameObject: {fileID: 1814192174} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 + m_RenderMode: 1 + m_Camera: {fileID: 1928531731} + m_PlaneDistance: 1 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -25413,6 +25413,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4381072889419385576, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4750419573833148750, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -25529,10 +25533,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5961466993189031681, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7431851489725401817, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7917674758326848207, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: near clip plane value: 0.3 objectReference: {fileID: 0} + - target: {fileID: 8298782634366228632, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8806329115733545877, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} propertyPath: m_Name value: XR Origin Hands (XR Rig) @@ -25581,6 +25597,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8935853449824297509, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -27090,7 +27110,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 10 + m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!224 &2084353335 RectTransform: @@ -27100,7 +27120,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084353331} m_LocalRotation: {x: -0, y: -0.72839886, z: -0, w: 0.68515337} - m_LocalPosition: {x: 0, y: 0, z: 0.7} + m_LocalPosition: {x: 0, y: 0, z: -0.368} m_LocalScale: {x: 0.673158, y: 0.904753, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -27109,7 +27129,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: -93.505, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1.471, y: 1.16} + m_AnchoredPosition: {x: 2.676, y: 1.548} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &2084731555 diff --git a/Assets/Scenes/HDRobo_Splash.unity b/Assets/Scenes/HDRobo_Splash.unity index 4bde95e..157ceb7 100644 --- a/Assets/Scenes/HDRobo_Splash.unity +++ b/Assets/Scenes/HDRobo_Splash.unity @@ -146,7 +146,7 @@ RectTransform: m_GameObject: {fileID: 425006992} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.8, y: 0.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1373784185} @@ -340,7 +340,7 @@ RectTransform: m_GameObject: {fileID: 511466031} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1612368891} @@ -376,7 +376,7 @@ RectTransform: m_GameObject: {fileID: 603491856} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1803634297} @@ -616,7 +616,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!223 &1373784184 Canvas: m_ObjectHideFlags: 0 @@ -626,9 +626,9 @@ Canvas: m_GameObject: {fileID: 1373784181} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 2 + m_RenderMode: 1 m_Camera: {fileID: 1414103441} - m_PlaneDistance: 10 + m_PlaneDistance: 1 m_PixelPerfect: 0 m_ReceivesEvents: 1 m_OverrideSorting: 0 @@ -647,26 +647,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373784181} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 10} - m_LocalScale: {x: 0.010691671, y: 0.010691671, z: 0.010691671} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 425006993} - {fileID: 511466032} - {fileID: 603491857} - m_Father: {fileID: 1414103437} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920.0001, y: 1080} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!4 &1414103437 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7917674758326848202, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} - m_PrefabInstance: {fileID: 1928531730} - m_PrefabAsset: {fileID: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!20 &1414103441 stripped Camera: m_CorrespondingSourceObject: {fileID: 7917674758326848207, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} @@ -1683,12 +1678,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9059786329452581396, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} + propertyPath: m_RequestedTrackingOriginMode + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7917674758326848202, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} - insertIndex: -1 - addedObject: {fileID: 1373784185} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 77e7c27b2c5525e4aa8cc9f99d654486, type: 3} --- !u!1 &1965096371 @@ -1743,5 +1739,6 @@ SceneRoots: - {fileID: 478405401} - {fileID: 1965096373} - {fileID: 1679960212} + - {fileID: 1373784185} - {fileID: 1207209737} - {fileID: 1842775752} diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index b2c2e23..c5cce7d 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -105,6 +105,20 @@ MonoBehaviour: m_AutomaticLoading: 0 m_AutomaticRunning: 0 m_Loaders: [] +--- !u!114 &-779316384827428128 +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: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Unknown Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 8311880425158443191} + m_InitManagerOnStart: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -117,13 +131,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} m_Name: XRGeneralSettings m_EditorClassIdentifier: - Keys: 01000000070000001c000000040000000d000000 + Keys: 01000000070000001c000000040000000d00000000000000 Values: - {fileID: -6517218471499782410} - {fileID: -8196854396901781169} - {fileID: 332800863423338148} - {fileID: -6546576050900071261} - {fileID: -3005570668656043318} + - {fileID: -779316384827428128} --- !u!114 &332800863423338148 MonoBehaviour: m_ObjectHideFlags: 0 @@ -171,3 +186,19 @@ MonoBehaviour: m_AutomaticLoading: 0 m_AutomaticRunning: 0 m_Loaders: [] +--- !u!114 &8311880425158443191 +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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Unknown Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index 356ea23..7c585be 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -12,6 +12,7 @@ "com.unity.xr.hands": "1.6.2", "com.unity.xr.interaction.toolkit": "3.2.1", "com.unity.xr.management": "4.5.2", + "com.unity.xr.oculus": "4.5.2", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 45b0a8e..5d63d32 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -330,6 +330,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.xr.oculus": { + "version": "4.5.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.xr.management": "4.4.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.xr.openxr": { "version": "1.15.1", "depth": 1, diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 3e9e3a1..7e69d25 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,7 +9,7 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - Teleport - Water - UI -