You've already forked taptap2024_GJ_chidouren
updat core
This commit is contained in:
@@ -17,6 +17,7 @@ namespace System
|
|||||||
#endif
|
#endif
|
||||||
#if UNITY_EDITOR
|
#if UNITY_EDITOR
|
||||||
DontDestroyOnLoad (this.gameObject);
|
DontDestroyOnLoad (this.gameObject);
|
||||||
|
return;
|
||||||
#endif
|
#endif
|
||||||
GameStateManager.Instance.Active(StateSystem.GameGlobalState.GameBegin);
|
GameStateManager.Instance.Active(StateSystem.GameGlobalState.GameBegin);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,11 +47,11 @@ namespace StateSystem.State
|
|||||||
// return;
|
// return;
|
||||||
//初始化资源管理器,并挂载AlwaysRes下的所有资源
|
//初始化资源管理器,并挂载AlwaysRes下的所有资源
|
||||||
AssetManager.Instance.Rouse ();
|
AssetManager.Instance.Rouse ();
|
||||||
#if UNITY_EDITOR
|
// #if UNITY_EDITOR
|
||||||
ManagerInit ();
|
// ManagerInit ();
|
||||||
return;
|
// return;
|
||||||
#endif
|
// #endif
|
||||||
if (SceneManager.GetActiveScene ().name != SceneName.InitScene.ToString ())
|
if (SceneManager.GetActiveScene ().name == "SetupScene")
|
||||||
{
|
{
|
||||||
this._sceneLoader = new SceneLoader (SceneName.InitScene, true);
|
this._sceneLoader = new SceneLoader (SceneName.InitScene, true);
|
||||||
this._sceneLoader.BeginLoad (null, ManagerInit);
|
this._sceneLoader.BeginLoad (null, ManagerInit);
|
||||||
|
|||||||
Reference in New Issue
Block a user