From c8d3e3bc65d9d1021c41b07fbbedd0c6afeb2b8c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 10 六月 2025 23:57:22 +0800
Subject: [PATCH] 0312 版本号统一显示格式；表格重复加载；去除登录界面音乐；隐私界面调整；界面存在动画才增加根节点，无动画时默认组件可交互，点击空关闭mask的层级问题
---
Main/Manager/StageManager.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/Main/Manager/StageManager.cs b/Main/Manager/StageManager.cs
index 55bfdc8..f7dbbc8 100644
--- a/Main/Manager/StageManager.cs
+++ b/Main/Manager/StageManager.cs
@@ -13,14 +13,23 @@
{
public StageName currentStage;
+ public Action AfterLoadingGameScene;
+
+ public Action BeforeLoadingGameScene;
+
+ // public Action OnSwitchAccount;
+ private LaunchWinData launchWinData = null;
+
public void Init()
{
-
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
}
public void Release()
{
-
+ AfterLoadingGameScene = null;
+ BeforeLoadingGameScene = null;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
}
public async UniTaskVoid ToLoginScene()
@@ -29,12 +38,12 @@
AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Login");
- await OnLoading(asyncOperation, () => 1f);
+ await OnLoading(asyncOperation, ConfigManager.Instance.GetLoadingProgress);
Main.OnSwitchToLoginScene();
currentStage = StageName.Login;
-
+ UIManager.Instance.OpenWindow<LaunchBackGroundWin>();
UIManager.Instance.OpenWindow<LoginWin>();
}
@@ -63,15 +72,21 @@
public async UniTaskVoid ToGameScene()
{
UIManager.Instance.DestroyAllUI();
+
+ BeforeLoadingGameScene?.Invoke();
- ResManager.Instance.PrewarmResources();
+ // ResManager.Instance.PrewarmResources();
AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Game");
- await OnLoading(asyncOperation, GetManagerRequestDataProgress);
+ await OnLoading(asyncOperation, () => (DTC0403_tagPlayerLoginLoadOK.finishedLogin ? .5f : 0f) + GetManagerRequestDataProgress() * .5f);
// 鍔犺浇鍒濆鍖栨暟鎹畬鎴�
currentStage = StageName.Game;
+
+ Main.OnEnterGameScene();
+
+ AfterLoadingGameScene?.Invoke();
UIManager.Instance.OpenWindow<MainWin>();
}
@@ -81,6 +96,18 @@
asyncOperation.allowSceneActivation = false;
LoadingWin loadingWin = UIManager.Instance.OpenWindow<LoadingWin>();
+
+ LaunchWin launchWin = UIManager.Instance.GetUI<LaunchWin>();
+ if (null != launchWin && launchWin.IsActive() && launchWinData == null)
+ {
+ launchWinData = launchWin.GetData();
+ }
+
+ if (null != launchWinData)
+ {
+ loadingWin.SetData(launchWinData);
+ launchWinData = null;
+ }
while (!asyncOperation.isDone)
{
@@ -116,4 +143,12 @@
loadingWin.CloseWindow();
}
+
+ private void OnCloseWindow(UIBase closeUI)
+ {
+ if (closeUI is LaunchWin)
+ {
+ launchWinData = (closeUI as LaunchWin).GetData();
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0