diff --git a/Assets/Scripts/System/GameSetup.cs b/Assets/Scripts/System/GameSetup.cs
index 491d9c7..6634c00 100644
--- a/Assets/Scripts/System/GameSetup.cs
+++ b/Assets/Scripts/System/GameSetup.cs
@@ -17,6 +17,7 @@ namespace System
 #endif
 #if UNITY_EDITOR
             DontDestroyOnLoad (this.gameObject);
+            return;
 #endif
             GameStateManager.Instance.Active(StateSystem.GameGlobalState.GameBegin);
         }
diff --git a/Assets/Scripts/System/StateSystem/State/StateInit.cs b/Assets/Scripts/System/StateSystem/State/StateInit.cs
index f7b8660..2a94b51 100644
--- a/Assets/Scripts/System/StateSystem/State/StateInit.cs
+++ b/Assets/Scripts/System/StateSystem/State/StateInit.cs
@@ -47,11 +47,11 @@ namespace StateSystem.State
             // return;
             //初始化资源管理器，并挂载AlwaysRes下的所有资源
             AssetManager.Instance.Rouse ();
-#if UNITY_EDITOR
-            ManagerInit ();
-            return;
-#endif
-            if (SceneManager.GetActiveScene ().name != SceneName.InitScene.ToString ())
+// #if UNITY_EDITOR
+//             ManagerInit ();
+//             return;
+// #endif
+            if (SceneManager.GetActiveScene ().name == "SetupScene")
             {
                 this._sceneLoader = new SceneLoader (SceneName.InitScene, true);
                 this._sceneLoader.BeginLoad (null, ManagerInit);