diff --git a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions index 2644b02..54f0a00 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/Samples/XR Interaction Toolkit/2.0.4/Starter Assets/XRI Default Input Actions.inputactions @@ -127,7 +127,7 @@ { "name": "third", "id": "c98fc8c8-7fc6-4909-89b6-c5b7568e7275", - "path": "", + "path": "{LeftHand}/devicePose/rotation", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -171,7 +171,7 @@ { "name": "third", "id": "ae101942-9eaa-4c53-a388-cafc3fd89bdf", - "path": "", + "path": "{LeftHand}/devicePose/position", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -303,6 +303,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "92c5dab1-2af7-4047-a3b9-c31ee4be30ef", + "path": "{LeftHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "375e1a49-8284-47af-aadc-1437a489030b", + "path": "{LeftHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "49a23327-a116-48c0-8af9-0d2c50c15a88", @@ -336,6 +358,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "825ff4ef-5119-4e4d-b578-d277b585c276", + "path": "{LeftHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "cf5081b7-7c19-497f-a4c7-70012d4834dc", + "path": "{LeftHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "3b8b1b59-2fdc-4998-8259-50341075d9a2", @@ -667,7 +711,7 @@ { "name": "third", "id": "b9ecb60d-341e-47cf-b50a-41d5815af8b0", - "path": "", + "path": "{RightHand}/devicePose/rotation", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -711,7 +755,7 @@ { "name": "third", "id": "3ef0a781-60c5-48bc-a584-f95553f8ae0a", - "path": "", + "path": "{RightHand}/devicePose/position", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -843,6 +887,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "b0cb6b32-c949-451c-8522-7991d2399a29", + "path": "{RightHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47c96f90-8ca7-4dff-be85-40b592874e20", + "path": "{RightHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "dd433817-216c-46b9-8dd3-f3a4ea1767b9", @@ -876,6 +942,28 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "f41c2f64-194d-4880-aee3-cb4fa3ecca68", + "path": "{RightHand}/gripPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "55192c51-55d2-40c8-9fbc-2ef1500bfdd6", + "path": "{RightHand}/triggerPressed", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Activate", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "150f414f-61bf-47b1-b4f8-f772a2a40565", diff --git a/Assets/URP/URP-HighFidelity.asset b/Assets/URP/URP-HighFidelity.asset index 4809b53..4ef7655 100644 --- a/Assets/URP/URP-HighFidelity.asset +++ b/Assets/URP/URP-HighFidelity.asset @@ -32,6 +32,7 @@ MonoBehaviour: m_FsrSharpness: 0.92 m_EnableLODCrossFade: 1 m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 4096 @@ -80,5 +81,29 @@ MonoBehaviour: m_Textures: blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 0 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 1 diff --git a/Assets/VR/Assets/Prefabs/XR Origin.prefab b/Assets/VR/Assets/Prefabs/XR Origin.prefab index f55f1a6..ff9e527 100644 --- a/Assets/VR/Assets/Prefabs/XR Origin.prefab +++ b/Assets/VR/Assets/Prefabs/XR Origin.prefab @@ -922,6 +922,7 @@ MonoBehaviour: m_Bits: 4294967295 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} m_StartingTargetFilter: {fileID: 0} m_HoverEntered: @@ -1316,6 +1317,7 @@ MonoBehaviour: m_Bits: 4294967295 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 m_StartingSelectedInteractable: {fileID: 0} m_StartingTargetFilter: {fileID: 0} m_HoverEntered: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 973db36..0955798 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -41,6 +41,46 @@ MonoBehaviour: priority: 0 required: 0 ignoreValidationErrors: 0 +--- !u!114 &-8052587150971810870 +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: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} + m_Name: ValveIndexControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Valve Index Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.valveindex + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 +--- !u!114 &-5760303697926728946 +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: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} + m_Name: KHRSimpleControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Khronos Simple Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 --- !u!114 &-5645428411790280417 MonoBehaviour: m_ObjectHideFlags: 0 @@ -107,6 +147,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-3596709507277034392 +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: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} + m_Name: MetaQuestTouchProControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta Quest Touch Pro Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.metaquestpro + openxrExtensionStrings: XR_FB_touch_controller_pro + company: Unity + priority: 0 + required: 0 --- !u!114 &-3465480095234910706 MonoBehaviour: m_ObjectHideFlags: 0 @@ -127,6 +187,26 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &-3246497391830789495 +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: feeef8d85de8db242bdda70cc7ff5acd, type: 3} + m_Name: OculusTouchControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Oculus Touch Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.oculustouch + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 --- !u!114 &-2952216973661141114 MonoBehaviour: m_ObjectHideFlags: 0 @@ -169,6 +249,26 @@ MonoBehaviour: required: 0 cacheSize: 1048576 perThreadCacheSize: 51200 +--- !u!114 &-2525753227810615796 +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: f928d0d73a35f294fbe357ca17aa3547, type: 3} + m_Name: MicrosoftHandInteraction WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Microsoft Hand Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_MSFT_hand_interaction + company: Unity + priority: 0 + required: 0 --- !u!114 &-1692072991545479379 MonoBehaviour: m_ObjectHideFlags: 0 @@ -181,7 +281,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} m_Name: ValveIndexControllerProfile Standalone m_EditorClassIdentifier: - m_enabled: 0 + m_enabled: 1 nameUi: Valve Index Controller Profile version: 0.0.1 featureIdInternal: com.unity.openxr.feature.input.valveindex @@ -201,9 +301,137 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} m_Name: OpenXR Package Settings m_EditorClassIdentifier: - Keys: 01000000 + Keys: 010000000e000000 Values: - {fileID: -4807887856401509111} + - {fileID: 3846928703558156887} +--- !u!114 &10505211265528180 +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: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3} + m_Name: MicrosoftMotionControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Microsoft Motion Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 +--- !u!114 &1173906867656648867 +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: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} + m_Name: EyeGazeInteraction WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Eye Gaze Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.eyetracking + openxrExtensionStrings: XR_EXT_eye_gaze_interaction + company: Unity + priority: 0 + required: 0 +--- !u!114 &2289670083675959570 +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: 486b5e28864f9a94b979b9620ce5006d, type: 3} + m_Name: ConformanceAutomationFeature WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Conformance Automation + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.conformance + openxrExtensionStrings: XR_EXT_conformance_automation + company: Unity + priority: 0 + required: 0 +--- !u!114 &3846928703558156887 +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: WSA + m_EditorClassIdentifier: + features: + - {fileID: 2289670083675959570} + - {fileID: 1173906867656648867} + - {fileID: 5315868764271356596} + - {fileID: -5760303697926728946} + - {fileID: -3596709507277034392} + - {fileID: -2525753227810615796} + - {fileID: 10505211265528180} + - {fileID: -3246497391830789495} + - {fileID: 4642398570395311329} + - {fileID: -8052587150971810870} + m_renderMode: 1 + m_depthSubmissionMode: 0 +--- !u!114 &4642398570395311329 +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: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 + cacheSize: 1048576 + perThreadCacheSize: 51200 +--- !u!114 &5315868764271356596 +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: 274c02963f889a64e90bc2e596e21d13, type: 3} + m_Name: HTCViveControllerProfile WSA + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: HTC Vive Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.htcvive + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 --- !u!114 &8610061585994297492 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index d3a30e5..04a91b9 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -12,9 +12,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} m_Name: XRGeneralSettings m_EditorClassIdentifier: - Keys: 01000000 + Keys: 010000000e000000 Values: - {fileID: 1167000971541970262} + - {fileID: 757682515139781544} +--- !u!114 &757682515139781544 +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: WSA Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 6033658958249212551} + m_InitManagerOnStart: 1 --- !u!114 &1167000971541970262 MonoBehaviour: m_ObjectHideFlags: 0 @@ -29,6 +44,22 @@ MonoBehaviour: m_EditorClassIdentifier: m_LoaderManagerInstance: {fileID: 8982266685732825844} m_InitManagerOnStart: 1 +--- !u!114 &6033658958249212551 +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: WSA Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: [] --- !u!114 &8982266685732825844 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 599c69f..d8e268f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,7 +7,7 @@ "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", - "com.unity.xr.interaction.toolkit": "2.3.1", + "com.unity.xr.interaction.toolkit": "2.2.0", "com.unity.xr.mock-hmd": "1.3.1-preview.1", "com.unity.xr.openxr": "1.7.0", "io.realm.unity": "10.21.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7487b60..a6d8c86 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -65,7 +65,7 @@ "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.4", + "com.unity.burst": "1.8.2", "com.unity.render-pipelines.core": "14.0.7", "com.unity.shadergraph": "14.0.7" } @@ -86,6 +86,15 @@ "com.unity.searcher": "4.9.2" } }, + "com.unity.subsystemregistration": { + "version": "1.1.1", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.textmeshpro": { "version": "3.0.6", "depth": 0, @@ -127,7 +136,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.2.0", + "version": "2.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -136,15 +145,14 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.3.1", + "version": "2.2.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.inputsystem": "1.4.4", - "com.unity.mathematics": "1.2.6", + "com.unity.inputsystem": "1.3.0", "com.unity.ugui": "1.0.0", - "com.unity.xr.core-utils": "2.2.0", - "com.unity.xr.legacyinputhelpers": "2.1.10", + "com.unity.xr.core-utils": "2.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.8", "com.unity.modules.audio": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.physics": "1.0.0" @@ -162,14 +170,15 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.3.3", + "version": "4.2.0", "depth": 1, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7" + "com.unity.xr.legacyinputhelpers": "2.1.7", + "com.unity.subsystemregistration": "1.0.6" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8a35e9a..af1600e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,13 +5,13 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/Scenes/EscapeRoomEngine.unity guid: 99c9720ab356a0642a771bea13969a05 - enabled: 0 path: Assets/Scenes/ImpossibleSpaces.unity guid: 682c1d7d6103f0b44ba4e2e1bfd2114d - - enabled: 1 + - enabled: 0 path: Assets/Scenes/StencilPortalScene.unity guid: 56077ec5fbc90b04985e5cfae1891968 m_configObjects: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 48a18bb..c151e72 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,13 +133,10 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.1.0 + bundleVersion: 1.2.0 preloadedAssets: - {fileID: 0} - {fileID: 0} - - {fileID: 1167000971541970262, guid: 5038e8a8e7bee0a44a0c2892bcbf360e, type: 2} - - {fileID: 11400000, guid: d3188622f79ccb44db3e51adc5a9beb1, type: 2} - - {fileID: -4807887856401509111, guid: 4fc8ed80f87d6b94981580316e2b7811, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -812,7 +809,7 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: com.unity.template-starter-kit - metroPackageVersion: + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -820,7 +817,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: com.unity.template-starter-kit wsaImages: {} - metroTileShortName: + metroTileShortName: Escape Room Engine metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d1c07a3..48098f4 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.19f1 -m_EditorVersionWithRevision: 2022.2.19f1 (765657fe9343) +m_EditorVersion: 2022.2.14f1 +m_EditorVersionWithRevision: 2022.2.14f1 (b2c9b1ac6cc0)