diff --git a/Assets/Environment/Prefabs/FortusRoom.prefab b/Assets/Environment/Prefabs/FortusRoom.prefab index 4f32cfb..3c3492d 100644 --- a/Assets/Environment/Prefabs/FortusRoom.prefab +++ b/Assets/Environment/Prefabs/FortusRoom.prefab @@ -214,8 +214,37 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5741860179393267535, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} + insertIndex: -1 + addedObject: {fileID: 1905471977410855824} m_SourcePrefab: {fileID: 100100000, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} +--- !u!1 &2802984800076200956 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5741860179393267535, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} + m_PrefabInstance: {fileID: 7586626634383244467} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1905471977410855824 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802984800076200956} + 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: 53.427174, y: 53.427174, z: 3.7410493} + m_Center: {x: 0, y: 0, z: -26.870525} --- !u!4 &4213704193420156802 stripped Transform: m_CorrespondingSourceObject: {fileID: 5995145536042165041, guid: 438b66bbe420dbe4890742c3ed1a6b25, type: 3} diff --git a/Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab b/Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab index 3e9ce65..3b0e47a 100644 --- a/Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab +++ b/Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab @@ -233,7 +233,7 @@ MonoBehaviour: m_TwoHandedGrabMoveProvider: {fileID: 1693138946238447057} m_LeftHandManager: {fileID: 5391623461294573136} m_RightHandManager: {fileID: 4873594585171399648} - m_LeftHandLocomotionType: 1 + m_LeftHandLocomotionType: 0 m_RightHandLocomotionType: 1 m_LeftHandTurnStyle: 0 m_RightHandTurnStyle: 0 @@ -2796,7 +2796,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.size - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_Enabled @@ -2806,6 +2806,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_LocomotionProvider value: @@ -2814,6 +2818,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_LocomotionProvider value: objectReference: {fileID: 2712917594593259727} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_LocomotionProvider + value: + objectReference: {fileID: 8725212308983713987} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_EaseInTime value: 0.3 @@ -2822,6 +2830,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_EaseInTime value: 0.3 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_EaseInTime + value: 0.3 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_EaseOutTime value: 0.3 @@ -2830,6 +2842,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_EaseOutTime value: 0.3 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_EaseOutTime + value: 0.3 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_ApertureSize value: 0.7 @@ -2838,6 +2854,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_ApertureSize value: 0.7 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_ApertureSize + value: 0.7 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_VignetteColor.a value: 1 @@ -2846,6 +2866,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_VignetteColor.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_VignetteColor.a + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_FeatheringEffect value: 0.2 @@ -2854,6 +2878,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_FeatheringEffect value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_FeatheringEffect + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocomotionVignetteProviders.Array.data[0].m_OverrideParameters.m_VignetteColorBlend.a value: 1 @@ -2862,6 +2890,10 @@ PrefabInstance: propertyPath: m_LocomotionVignetteProviders.Array.data[1].m_OverrideParameters.m_VignetteColorBlend.a value: 1 objectReference: {fileID: 0} + - target: {fileID: 8429981633443581383, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} + propertyPath: m_LocomotionVignetteProviders.Array.data[2].m_OverrideParameters.m_VignetteColorBlend.a + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/BasicScene.unity b/Assets/Scenes/BasicScene.unity index 7b65dd5..3453ebc 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!20 &135570299 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 731506051283350118, guid: 264e5f04d776bce4fba764d0f71070e6, type: 3} + m_PrefabInstance: {fileID: 9070320327174004474} + m_PrefabAsset: {fileID: 0} --- !u!108 &299639868 stripped Light: m_CorrespondingSourceObject: {fileID: 4610388823093620668, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} @@ -193,6 +198,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 297548045005079955, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 135570299} - target: {fileID: 816057727172110300, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -241,6 +250,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.22 objectReference: {fileID: 0} + - target: {fileID: 1042618022035587862, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 135570299} - target: {fileID: 2193716159056342434, guid: b83677d186e49a64cadef8d7a5a9d3c6, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Assets/Settings/Project Configuration/BasicScene.scenetemplate b/Assets/Settings/Project Configuration/BasicScene.scenetemplate index e5c361e..02fcd6a 100644 --- a/Assets/Settings/Project Configuration/BasicScene.scenetemplate +++ b/Assets/Settings/Project Configuration/BasicScene.scenetemplate @@ -378,8 +378,8 @@ MonoBehaviour: instantiationMode: 1 - dependency: {fileID: 2100000, guid: d0f7f54f8772944d689ec62d2b51cb32, type: 2} instantiationMode: 0 - - dependency: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - instantiationMode: 0 + - dependency: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + instantiationMode: 1 - dependency: {fileID: 2100000, guid: ad98cc39fd9deb3458bcc94d6475b7c0, type: 2} instantiationMode: 0 - dependency: {fileID: 4922582553321831162, guid: 76f3439a0ae796e4b81bee3f91f888ee, type: 3} @@ -388,8 +388,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 919132149155446097, guid: 50541ae5f58723244b7e75541e48344c, type: 3} instantiationMode: 0 - - dependency: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - instantiationMode: 1 + - dependency: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + instantiationMode: 0 - dependency: {fileID: 2800000, guid: 1aeae93672718ba4ca82c27e22183965, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 43ab3caa9db31417abb055b874f705ca, type: 3} @@ -450,6 +450,8 @@ MonoBehaviour: instantiationMode: 0 - dependency: {fileID: 2800000, guid: 4a99f79176fcd43beb3b9c7db5eee038, type: 3} instantiationMode: 0 + - dependency: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} + instantiationMode: 0 - dependency: {fileID: -5475051401550479605, guid: d76b454bee8e3db44acf749b2f4ac142, type: 3} instantiationMode: 1 - dependency: {fileID: 2800000, guid: 9321c717551734a79a19e8edda0f9b96, type: 3} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d66206e..7f02f7b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,9 +8,12 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/SampleScene.unity guid: 55daccc09a3b69647bbab145b54a3ab3 - - enabled: 1 + - enabled: 0 path: Assets/XRI_Examples/Scenes/XRI_Examples_Main.unity guid: ba755f5a181505a4799b21685d4c7576 + - enabled: 1 + path: Assets/Scenes/BasicScene.unity + guid: 4e9fef26e6adb88479ad1b9834a32d94 m_configObjects: Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2}