From 26fea935765dddb4ab0f58c823763d40afdbe707 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Thu, 5 Dec 2024 15:37:42 +0000 Subject: [PATCH] Settings tidyup (#788) Fix a few settings that shouldn't have been changed or change when project is loaded --- Assets/Oculus/OculusProjectConfig.asset | 4 ++-- Assets/XR/Settings/Open XR Package Settings.asset | 4 ++-- Assets/XR/Settings/OpenXR Editor Settings.asset | 6 ++---- Assets/XR/XRGeneralSettings.asset | 4 ++-- ProjectSettings/ProjectSettings.asset | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset index 6444d5efbd..20354b8411 100644 --- a/Assets/Oculus/OculusProjectConfig.asset +++ b/Assets/Oculus/OculusProjectConfig.asset @@ -41,5 +41,5 @@ MonoBehaviour: systemSplashScreen: {fileID: 0} systemSplashScreenType: 0 _systemLoadingScreenBackground: 0 - ovrPluginMd5Win64: d72fb658f3d9064293fb2241e5525905551003f900539e0b4fc00777d76dbee1 - ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8aba8131f9f19a0720cb301a8c9f89d2b5 + ovrPluginMd5Win64: d72fb658f3d9064293fb2241e55259057f9ac34a260fafcf32f36c4a3005911c + ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8ae14dbda69fd9877bc13b87ed87f3752b diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index fd5ffba0d8..241e7c1e1e 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -428,7 +428,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1927c045052a06d49a9b21fdcaa26db6, type: 3} m_Name: OculusXRFeature Standalone m_EditorClassIdentifier: - m_enabled: 1 + m_enabled: 0 nameUi: Meta XR Feature version: 0.0.1 featureIdInternal: com.meta.openxr.feature.metaxr @@ -647,7 +647,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1927c045052a06d49a9b21fdcaa26db6, type: 3} m_Name: OculusXRFeature Android m_EditorClassIdentifier: - m_enabled: 1 + m_enabled: 0 nameUi: Meta XR Feature version: 0.0.1 featureIdInternal: com.meta.openxr.feature.metaxr diff --git a/Assets/XR/Settings/OpenXR Editor Settings.asset b/Assets/XR/Settings/OpenXR Editor Settings.asset index 9de4c9635a..eb45bb42b6 100644 --- a/Assets/XR/Settings/OpenXR Editor Settings.asset +++ b/Assets/XR/Settings/OpenXR Editor Settings.asset @@ -14,8 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: Keys: 0100000007000000 Values: - - featureSets: - - com.meta.openxr.featureset.metaxr - - featureSets: - - com.meta.openxr.featureset.metaxr + - featureSets: [] + - featureSets: [] m_vulkanAdditionalGraphicsQueue: 0 diff --git a/Assets/XR/XRGeneralSettings.asset b/Assets/XR/XRGeneralSettings.asset index 42542c8510..ae01ae95ad 100644 --- a/Assets/XR/XRGeneralSettings.asset +++ b/Assets/XR/XRGeneralSettings.asset @@ -16,7 +16,7 @@ MonoBehaviour: m_AutomaticLoading: 0 m_AutomaticRunning: 0 m_Loaders: - - {fileID: 11400000, guid: df02db4506fe02b4892b2f1dab25abe6, type: 2} + - {fileID: 11400000, guid: 0aff50989b9ead845bdb50daaf977456, type: 2} --- !u!114 &-5428386068462531570 MonoBehaviour: m_ObjectHideFlags: 0 @@ -157,7 +157,7 @@ MonoBehaviour: m_AutomaticLoading: 0 m_AutomaticRunning: 0 m_Loaders: - - {fileID: 11400000, guid: df02db4506fe02b4892b2f1dab25abe6, type: 2} + - {fileID: 11400000, guid: 0aff50989b9ead845bdb50daaf977456, type: 2} --- !u!114 &8915350425150617969 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5f01f77f81..a73dfef0ed 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -265,7 +265,7 @@ PlayerSettings: clonedFromGUID: 00000000000000000000000000000000 templatePackageId: templateDefaultScene: - useCustomMainManifest: 0 + useCustomMainManifest: 1 useCustomLauncherManifest: 0 useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0