-update: debug play level directly in prefab level

pancake-llc · Nov 3, 2023 · 972966f · 972966f
1 parent 7186c11
commit 972966f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 13 deletions.
diff --git a/Assets/Heart/Modules/LevelSystem/Runtime/LevelComponent.cs b/Assets/Heart/Modules/LevelSystem/Runtime/LevelComponent.cs
@@ -1,6 +1,7 @@
 using Pancake.Apex;
 using Pancake.Scriptable;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace Pancake.LevelSystem
 {
@@ -50,16 +51,26 @@ protected virtual void OnDespawned()
 
 #if UNITY_EDITOR
 
-        [Button]
-        private void PlayThisLevel()
+        [Button, ButtonHeight(30)]
+        public void PlayThisLevel()
         {
             LevelDebug.IsTest = true;
-            LevelDebug.PathLevelPrefab =  UnityEditor.AssetDatabase.GetAssetPath(UnityEditor.Selection.activeGameObject);
-            if (UnityEditor.SceneManagement.EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
+            LevelDebug.LevelPrefab = null;
+            LevelDebug.PathLevelPrefab = UnityEditor.AssetDatabase.GetAssetPath(UnityEditor.Selection.activeGameObject);
+            if (!Application.isPlaying)
             {
-                string path = UnityEngine.SceneManagement.SceneUtility.GetScenePathByBuildIndex(0);
-                UnityEditor.SceneManagement.EditorSceneManager.OpenScene(path, UnityEditor.SceneManagement.OpenSceneMode.Single);
-                UnityEditor.EditorApplication.isPlaying = true;
+                if (UnityEditor.SceneManagement.EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
+                {
+                    string path = SceneUtility.GetScenePathByBuildIndex(0);
+                    UnityEditor.SceneManagement.EditorSceneManager.OpenScene(path, UnityEditor.SceneManagement.OpenSceneMode.Single);
+                    UnityEditor.EditorApplication.isPlaying = true;
+                }
+            }
+            else
+            {
+                // recreate
+                var levelInstantiate = FindObjectOfType<LevelInstantiate>();
+                levelInstantiate.OnReCreateLevelLoaded();
             }
         }
 #endif

diff --git a/Assets/Heart/Modules/LevelSystem/Runtime/LevelDebug.cs b/Assets/Heart/Modules/LevelSystem/Runtime/LevelDebug.cs
@@ -31,6 +31,7 @@ public static LevelComponent LevelPrefab
                 levelPrefab = AssetDatabase.LoadAssetAtPath<GameObject>(PathLevelPrefab)?.GetComponent<LevelComponent>();
                 return levelPrefab;
             }
+           internal set => levelPrefab = value;
         }
 
         static LevelDebug() { EditorApplication.playModeStateChanged += OnPlayModeStateChanged; }

diff --git a/...cripts/Gameplay/Level/LevelInstantiate.cs → ...s/LevelSystem/Runtime/LevelInstantiate.cs b/...cripts/Gameplay/Level/LevelInstantiate.cs → ...s/LevelSystem/Runtime/LevelInstantiate.cs
@@ -1,8 +1,7 @@
-using Pancake.LevelSystem;
 using Pancake.Scriptable;
 using UnityEngine;
 
-namespace Pancake.SceneFlow
+namespace Pancake.LevelSystem
 {
     public class LevelInstantiate : GameComponent
     {
@@ -19,10 +18,16 @@ public void Start()
 
         protected override void OnDisabled() { reCreateLevelLoadedEvent.OnRaised -= OnReCreateLevelLoaded; }
 
-        private void OnReCreateLevelLoaded()
+        public void OnReCreateLevelLoaded()
         {
             root.RemoveAllChildren();
-            var _ = Instantiate(loadLevelCachedEvent.Raise(), root, false);
+            LevelComponent levelComponent = null;
+#if UNITY_EDITOR
+            levelComponent = LevelDebug.IsTest ? LevelDebug.LevelPrefab : loadLevelCachedEvent.Raise();
+#else
+            levelComponent = loadLevelCachedEvent.Raise();
+#endif
+            var _ = Instantiate(levelComponent, root, false);
         }
     }
 }
diff --git a/...s/Gameplay/Level/LevelInstantiate.cs.meta → ...elSystem/Runtime/LevelInstantiate.cs.meta b/...s/Gameplay/Level/LevelInstantiate.cs.meta → ...elSystem/Runtime/LevelInstantiate.cs.meta
diff --git a/Assets/_Root/Prefabs/Level/LevelNormal/Level_1.prefab b/Assets/_Root/Prefabs/Level/LevelNormal/Level_1.prefab
@@ -301,8 +301,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b4a2f3af39cf1cc449dc56c4adc5135b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  originLevelIndex: 1
-  currentLevelIndex: 37
+  originLevelIndex: 0
+  currentLevelIndex: 0
   winEvent: {fileID: 0}
   loseEvent: {fileID: 0}
   replayEvent: {fileID: 0}