fix: prioritize the use of PreloadedProjectSettings if present in the…

… project.
mob-sakai · Dec 6, 2023 · 7a2b449 · 7a2b449
1 parent 6781c96
commit 7a2b449
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Packages/NanoMonitor/Scripts/ProjectSettings/PreloadedProjectSettings.cs b/Packages/NanoMonitor/Scripts/ProjectSettings/PreloadedProjectSettings.cs
@@ -31,7 +31,11 @@ private static Object[] GetPreloadedSettings(Type type)
 
         protected static PreloadedProjectSettings GetDefaultSettings(Type type)
         {
-            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings;
+            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings
+                ?? AssetDatabase.FindAssets($"t:{nameof(PreloadedProjectSettings)}")
+                    .Select(AssetDatabase.GUIDToAssetPath)
+                    .Select(AssetDatabase.LoadAssetAtPath<PreloadedProjectSettings>)
+                    .FirstOrDefault(x => x && x.GetType() == type);
         }
 
         protected static void SetDefaultSettings(PreloadedProjectSettings asset)
@@ -138,6 +142,9 @@ private void OnPlayModeStateChanged(PlayModeStateChange state)
         public static T instance => s_Instance ? s_Instance : s_Instance = CreateInstance<T>();
 #endif
 
+        /// <summary>
+        /// This function is called when the object becomes enabled and active.
+        /// </summary>
         protected virtual void OnEnable()
         {
 #if UNITY_EDITOR
@@ -155,6 +162,9 @@ protected virtual void OnEnable()
             s_Instance = this as T;
         }
 
+        /// <summary>
+        /// This function is called when the behaviour becomes disabled.
+        /// </summary>
         protected virtual void OnDisable()
         {
 #if UNITY_EDITOR

diff --git a/Packages/SceneNavigator/ProjectSettings/PreloadedProjectSettings.cs b/Packages/SceneNavigator/ProjectSettings/PreloadedProjectSettings.cs
@@ -31,7 +31,11 @@ private static Object[] GetPreloadedSettings(Type type)
 
         protected static PreloadedProjectSettings GetDefaultSettings(Type type)
         {
-            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings;
+            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings
+                ?? AssetDatabase.FindAssets($"t:{nameof(PreloadedProjectSettings)}")
+                    .Select(AssetDatabase.GUIDToAssetPath)
+                    .Select(AssetDatabase.LoadAssetAtPath<PreloadedProjectSettings>)
+                    .FirstOrDefault(x => x && x.GetType() == type);
         }
 
         protected static void SetDefaultSettings(PreloadedProjectSettings asset)
@@ -138,6 +142,9 @@ private void OnPlayModeStateChanged(PlayModeStateChange state)
         public static T instance => s_Instance ? s_Instance : s_Instance = CreateInstance<T>();
 #endif
 
+        /// <summary>
+        /// This function is called when the object becomes enabled and active.
+        /// </summary>
         protected virtual void OnEnable()
         {
 #if UNITY_EDITOR
@@ -155,6 +162,9 @@ protected virtual void OnEnable()
             s_Instance = this as T;
         }
 
+        /// <summary>
+        /// This function is called when the behaviour becomes disabled.
+        /// </summary>
         protected virtual void OnDisable()
         {
 #if UNITY_EDITOR

diff --git a/Packages/src/Runtime/ProjectSettings/PreloadedProjectSettings.cs b/Packages/src/Runtime/ProjectSettings/PreloadedProjectSettings.cs
@@ -31,7 +31,11 @@ private static Object[] GetPreloadedSettings(Type type)
 
         protected static PreloadedProjectSettings GetDefaultSettings(Type type)
         {
-            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings;
+            return GetPreloadedSettings(type).FirstOrDefault() as PreloadedProjectSettings
+                ?? AssetDatabase.FindAssets($"t:{nameof(PreloadedProjectSettings)}")
+                    .Select(AssetDatabase.GUIDToAssetPath)
+                    .Select(AssetDatabase.LoadAssetAtPath<PreloadedProjectSettings>)
+                    .FirstOrDefault(x => x && x.GetType() == type);
         }
 
         protected static void SetDefaultSettings(PreloadedProjectSettings asset)