foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updat core

Browse Source
This commit is contained in:
Foldcc_b1
2024-10-21 22:29:53 +08:00
parent 6c950bb377
commit fbbd08e0a5
40 changed files with 6519 additions and 5112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Assets/Scripts/System/StateSystem/State/StateHome.cs
View File

@@ -23,17 +23,18 @@ namespace StateSystem.State
AudioManager.Instance.PlayBGM (BgmAudio.LobbyBgm);
GameUpdateMgr.Instance.AddUpdater (DoUpdate);
var activeScene = SceneManager.GetActiveScene ();
if (activeScene.name != SceneName.MainScene.ToString ())
{
Debug.Log ("进入Home，开始加载场景：" + SceneName.MainScene.ToString ());
this._loader = new SceneLoader (SceneName.MainScene);
this._loader.BeginLoad (OnLoading, OnActived);
}
else
{
OnActived ();
}
// var activeScene = SceneManager.GetActiveScene ();
// if (activeScene.name != SceneName.MainScene.ToString ())
// {
// Debug.Log ("进入Home，开始加载场景：" + SceneName.MainScene.ToString ());
// this._loader = new SceneLoader (SceneName.MainScene);
// this._loader.BeginLoad (OnLoading, OnActived);
// }
// else
// {
// OnActived ();
// }
OnActived ();
}
private void OnLoading (float obj)
@@ -57,7 +58,7 @@ namespace StateSystem.State
protected override void OnExit ()
{
GameUpdateMgr.Instance.RemoveUpdater (DoUpdate);
this._loader.Kill ();
// this._loader.Kill ();
}
private void DoUpdate ()

15
Assets/Scripts/System/StateSystem/State/StateInit.cs
View File

@@ -17,6 +17,7 @@ using Framework.Timer;
using Framework.UI;
using Framework.Utils;
using Framework.Utils.Extend;
using Game;
using Runtime.ADAggregator;
using StateSystem.Loader;
using TMPro;
@@ -33,7 +34,8 @@ namespace StateSystem.State
{
public class StateInit : StateMachine<GameGlobalState>
{
private SceneLoader _sceneLoader;
public static bool HasTempGame;
private SceneLoader _sceneLoader;
protected override void OnEnter (params object[] args)
{
CameraEffectUtils.Instance.SetGameCamBlur(0, 0, null);
@@ -55,10 +57,12 @@ namespace StateSystem.State
{
this._sceneLoader = new SceneLoader (SceneName.InitScene, true);
this._sceneLoader.BeginLoad (null, ManagerInit);
HasTempGame = false;
}
else
{
ManagerInit ();
HasTempGame = true;
}
}
@@ -139,7 +143,14 @@ namespace StateSystem.State
GameUpdateMgr.Instance.CreateTimer (1f , () =>
{
BeginStaticPanel.ReleasePanel ();
this.stateMachineRunner.OpenState (GameGlobalState.GameRoom);
if (HasTempGame)
{
this.stateMachineRunner.OpenState (GameGlobalState.GameRoom);
}
else
{
this.stateMachineRunner.OpenState (GameGlobalState.GameHome);
}
});
}
}