Merge pull request #15 from mewlist/unified-scene

Unified scene validation
mewlist · Jan 20, 2024 · 1305675 · 1305675
2 parents b14532b + ec7e057
commit 1305675
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/Editor/Assets/SceneReferencePropertyDrawer.cs b/Editor/Assets/SceneReferencePropertyDrawer.cs
@@ -0,0 +1,45 @@
+using System.IO;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+
+namespace Mew.Core.Assets
+{
+    [CustomPropertyDrawer(typeof(SceneReference))]
+    public class SceneReferencePropertyDrawer : PropertyDrawer
+    {
+        private SceneAsset FindSceneAsset(string sceneName)
+        {
+            var targetScene = EditorBuildSettings.scenes.FirstOrDefault(x
+                => Path.GetFileNameWithoutExtension(x.path) == sceneName);
+            return targetScene != null
+                ? targetScene.enabled
+                    ? AssetDatabase.LoadAssetAtPath(targetScene.path, typeof(SceneAsset)) as SceneAsset
+                    : null
+                : null;
+        }
+
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            const string fieldName = "<SceneName>k__BackingField";
+            var serializedProperty = property.FindPropertyRelative(fieldName);
+            var sceneName = property.FindPropertyRelative(fieldName).stringValue;
+            var sceneAsset = FindSceneAsset(sceneName);
+            sceneAsset = (SceneAsset) EditorGUI.ObjectField(position, label, sceneAsset, typeof(SceneAsset), false);
+
+            if (!string.IsNullOrEmpty(serializedProperty.stringValue) && sceneAsset == null)
+            {
+                serializedProperty.stringValue = string.Empty;
+            }
+            else if (sceneAsset is not null && sceneAsset.name != serializedProperty.stringValue)
+            {
+                if (FindSceneAsset(sceneAsset.name) is null)
+                {
+                    Debug.LogWarning($"Scene {sceneAsset.name} is not found in build settings.");
+                    serializedProperty.stringValue = string.Empty;
+                }
+                serializedProperty.stringValue = sceneAsset.name;
+            }
+        }
+    }
+}
diff --git a/Editor/Assets/SceneReferencePropertyDrawer.cs.meta b/Editor/Assets/SceneReferencePropertyDrawer.cs.meta
diff --git a/Runtime/Assets/Scene/SceneLoader.cs b/Runtime/Assets/Scene/SceneLoader.cs
@@ -29,7 +29,7 @@ public async ValueTask<Scene> LoadAsync(UnifiedScene unifiedScene, CancellationT
                 var h = Addressables.LoadSceneAsync(unifiedScene.SceneResourceLocation, parameters);
                 handle = new SceneInstanceHandle(h);
             }
-            else if (unifiedScene.SceneAssetReference is not null)
+            else if (unifiedScene.SceneAssetReference is not null && unifiedScene.SceneAssetReference.RuntimeKeyIsValid())
             {
                 var h = Addressables.LoadSceneAsync(unifiedScene.SceneAssetReference, parameters);
                 handle = new SceneInstanceHandle(h);

diff --git a/Runtime/Assets/Scene/UnifiedScene.cs b/Runtime/Assets/Scene/UnifiedScene.cs
@@ -22,7 +22,7 @@ public bool IsSceneAssetReference
             get
             {
 #if USE_MEW_CORE_ASSETS
-                return SceneAssetReference != null;
+                return SceneAssetReference != null && SceneAssetReference.RuntimeKeyIsValid();
 #else
                 return false;
 #endif
@@ -40,5 +40,7 @@ public bool IsSceneResourceLocation
 #endif
             }
         }
+
+        public bool IsValid => IsSceneReference || IsSceneAssetReference || IsSceneResourceLocation;
     }
 }