From dc7922d80c1d133b6261b8af1d521567d2c0a35d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 30 十月 2025 16:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

---
 Main/Main.cs |   88 ++++++++++++++++++++++++++++++++++++-------
 1 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/Main/Main.cs b/Main/Main.cs
index 17951d3..d9cb64f 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -4,7 +4,6 @@
 using UnityEngine;
 using Cysharp.Threading;
 using Cysharp.Threading.Tasks;
-using System.Threading.Tasks;
 
 /// <summary>
 /// Main绫伙紝浣滀负鐑洿鏂扮▼搴忛泦鐨勫叆鍙ｇ偣
@@ -19,7 +18,11 @@
     public static void Init()
     {
         Debug.Log("Main.Init() 琚皟鐢�");
-
+        var launchWin = UIManager.Instance.GetUI<LaunchWin>();
+        if (launchWin != null)
+        {
+            launchWin.FadeOut();
+        }
         SwitchToLoginScene();
     }
 
@@ -29,7 +32,63 @@
         // UIManager.Instance.OpenWindow<LoginWin>();
         Debug.Log("鍒囨崲鍒扮櫥褰曞満鏅�");
         ConfigManager.Instance.Init();
+        GeneralDefine.Init();
+#if UNITY_EDITOR
+        SysNotifyMgr.Instance.BeforePlayerDataInitializeEvent();
+#endif
         StageManager.Instance.ToLoginScene();
+
+        ClearGameData();
+
+    }
+
+    public static async UniTask InitManagers()
+    {
+        ReleaseMgrs();
+
+        // 鍒濆鍖栨父鎴忕郴缁�
+        managers.Add(BattleManager.Instance);
+        managers.Add(VirtualPackManager.Instance);
+        managers.Add(OtherPlayerDetailManager.Instance);
+        managers.Add(RechargeManager.Instance);
+        managers.Add(StoreModel.Instance);
+        managers.Add(PhantasmPavilionModel.Instance);
+        managers.Add(GuildManager.Instance);
+        managers.Add(TeamManager.Instance);
+        managers.Add(TaskManager.Instance);
+        managers.Add(MailManager.Instance);
+        managers.Add(PackManager.Instance);
+        managers.Add(HappyXBModel.Instance);
+        managers.Add(HeroManager.Instance);
+        managers.Add(GMCmdManager.Instance);
+        managers.Add(GuildEmblemModel.Instance);
+        managers.Add(EquipModel.Instance);
+        managers.Add(DungeonManager.Instance);
+        managers.Add(CustomizedRechargeModel.Instance);
+        managers.Add(CustomizedGiftModel.Instance);
+        managers.Add(ChatManager.Instance);
+        managers.Add(ChatBubbleManager.Instance);
+        managers.Add(OfficialRankManager.Instance);
+        managers.Add(RankModel.Instance);
+        managers.Add(PlayerMainDate.Instance);
+        managers.Add(HeroUIManager.Instance);
+        managers.Add(InvestModel.Instance);
+        managers.Add(BlessLVManager.Instance);
+        managers.Add(AutoFightModel.Instance);
+        managers.Add(MainLevelManager.Instance);
+        managers.Add(BattleSettlementManager.Instance);
+        managers.Add(GoldRushManager.Instance);
+        managers.Add(FirstChargeManager.Instance);
+        managers.Add(NewBieCenter.Instance);
+        managers.Add(AdsManager.Instance);
+        managers.Add(BoneFieldManager.Instance);
+        managers.Add(ArenaManager.Instance);
+        foreach (var manager in managers)
+        {
+            manager.Init();
+        }
+
+        await UniTask.Yield();
     }
 
     public static void OnEnterGameScene()
@@ -37,26 +96,19 @@
         // 鍒濆鍖栨父鎴忓満鏅�
         Debug.Log("鍒濆鍖栨父鎴忓満鏅�");
 
-        ReleaseMgrs();
-
-        // 鍒濆鍖栨父鎴忕郴缁�
-        managers.Add(BattleManager.Instance);
-
-        foreach (var manager in managers)
-        {
-            manager.Init();
-        }
-
         foreach (var manager in managers)
         {
             manager.RequestNessaryData();
         }
 
+        UIManager.Instance.CloseWindow<LaunchBackGroundWin>();
+        UIManager.Instance.CloseWindow<LoginWin>();
     }
 
     public static void OnSwitchToLoginScene()
     {
-        ReleaseMgrs();
+        //  鍓嶉潰鏈夐噸鏂癐nitManagers浜� 杩欓噷灏变笉鍦ㄥ仛娓呴櫎
+        // ReleaseMgrs();
     }
 
     private static void ReleaseMgrs()
@@ -68,14 +120,20 @@
 
         managers.Clear();
     }
-    
+
     /// <summary>
     /// 鎵撳紑鐧诲綍鐣岄潰
     /// </summary>
     private static void OpenLoginUI()
     {
+    }
 
 
-
+    //杩欓噷娓呯悊鏃舵満涓�瀹氭槸閲嶆柊鐧诲綍/鍒囨崲璐﹀彿锛岃�屼笉鏄煭鏆傜殑鏂嚎閲嶈繛
+    static void ClearGameData()
+    {
+        DTC0403_tagPlayerLoginLoadOK.finishedLogin = false;
+        DTC0102_tagCDBPlayer.isAfterPlayerDataInitialize = false;
+        ConfirmCancel.toggleCheckDict.Clear();
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0