+misc

4 files changed, 13 insertions, 8 deletions

diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
index 9b53354..430c2d8 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStageBase.cs
@@ -9,7 +9,7 @@ namespace WK
 
     public class GameStageBase : AsyncStatemachine.State
     {
-        GameStageManager owner = GameStageManager.Instance;
+        protected GameStageManager manager = GameStageManager.Instance;
         
         public override IEnumerator<float> OnStart()
         {
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
index 2e1ea6b..d5caf15 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStageManager.cs
@@ -7,11 +7,11 @@ using WK.Tools;
 namespace WK
 {
 
+    /// <summary>
+    /// 游戏最上层的状态机
+    /// </summary>
     public sealed class GameStageManager : Singleton<GameStageManager>, ISubsystem
     {
-        /// <summary>
-        /// GameStage的状态机
-        /// </summary>
         private AsyncStatemachine m_Statemachine;
         private int[] stages = new int[(int)EGameStage.Num];
         private EGameStage prevStage = EGameStage.Launch;
diff --git a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
index fa4e8ed..ed06222 100644
--- a/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
+++ b/WorldlineKeepers/Assets/Scripts/Stages/GameStage_Dojo.cs
@@ -10,8 +10,11 @@ namespace WK
 
         public override IEnumerator<float> OnStart()
         {
-            GameSceneManager.Instance.LoadScene("Scenes/3_Dojo");
-            yield break;
+            GameSceneManager.Instance.LoadScene(StaticDefine.Scene_Dojo);
+            while(!GameSceneManager.Instance.AsyncOpt.isDone)
+            {
+                yield return 0f;
+            }
         }
 
         public override IEnumerator<float> OnEnd()
@@ -22,7 +25,6 @@ namespace WK
         public override void OnUpdate(float deltaTime)
         {
 
-
         }
 
     }
diff --git a/WorldlineKeepers/Assets/Scripts/StaticDefine.cs b/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
index 3f62e8c..adf8f3e 100644
--- a/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
+++ b/WorldlineKeepers/Assets/Scripts/StaticDefine.cs
@@ -10,7 +10,10 @@ namespace WK
         public static string StatsFilePath = "metadata/default_stats.csv";
         public static string BuffFilePath = "metadata/default_buffs.csv";
 
-        public static string RoninPath = "characters/ronin/ronin.json"; 
+        public static string RoninPath = "characters/ronin/ronin.json";
+
+        public static string Scene_Dojo = "Scenes/3_Dojo";
+        public static string Scene_Stage = "Scenes/4_Stage";
 
     }