From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/Main.cs |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Main/Main.cs b/Main/Main.cs
index 98041ca..bd05988 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -4,12 +4,23 @@
 using UnityEngine;
 using Cysharp.Threading;
 using Cysharp.Threading.Tasks;
+using System.IO;
+
+/// <summary>
+/// 缃戠粶绫诲瀷鏋氫妇
+/// </summary>
+
 
 /// <summary>
 /// Main绫伙紝浣滀负鐑洿鏂扮▼搴忛泦鐨勫叆鍙g偣
 /// </summary>
 public class Main
 {
+    /// <summary>
+    /// 缃戠粶绫诲瀷閰嶇疆锛堝彲鍦ㄤ唬鐮佷腑淇敼鎴栭�氳繃 Inspector 閰嶇疆锛�
+    /// </summary>
+    // public static NetworkType CurrentNetworkType = NetworkType.WebSocket;
+
     public static List<IGameSystemManager> managers = new List<IGameSystemManager>();
 
     /// <summary>
@@ -50,7 +61,6 @@
         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);
@@ -65,7 +75,6 @@
         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);
@@ -84,6 +93,30 @@
         managers.Add(DayMissionManager.Instance);
         managers.Add(BattlePassManager.Instance);
         managers.Add(TianziBillboradManager.Instance);
+        managers.Add(ExpSecretCollectionManager.Instance);
+        managers.Add(SignManager.Instance);
+        managers.Add(RenameManager.Instance);
+        managers.Add(AchievementManager.Instance);
+        managers.Add(HorseManager.Instance);
+        managers.Add(PhantasmPavilionManager.Instance);
+        managers.Add(AttributeManager.Instance);
+        managers.Add(FuncNPCManager.Instance);
+        managers.Add(GuildBossManager.Instance);
+        managers.Add(LineupRecommendManager.Instance);
+        managers.Add(OSActivityManager.Instance);
+        managers.Add(HeroFatesManager.Instance);
+        managers.Add(BeautyMMManager.Instance);
+        managers.Add(DailySpecialsManager.Instance);
+        managers.Add(GubaoManager.Instance);
+        managers.Add(WarlordPavilionManager.Instance);
+        managers.Add(ViewNPCManager.Instance);
+        managers.Add(EquipRecordManager.Instance);
+        managers.Add(MinggeManager.Instance);
+        managers.Add(FuncPresetManager.Instance);
+        managers.Add(GMNotifyManager.Instance);
+        managers.Add(TimingGiftManager.Instance);
+        managers.Add(SettingDataManager.Instance);
+
         foreach (var manager in managers)
         {
             manager.Init();
@@ -111,6 +144,9 @@
         //  鍓嶉潰鏈夐噸鏂癐nitManagers浜� 杩欓噷灏变笉鍦ㄥ仛娓呴櫎
         // ReleaseMgrs();
         ClearGameData();
+        //閿�姣佹墍鏈夋垬鍦�
+        BattleManager.Instance.DestroyAllBattleField();
+
     }
 
     private static void ReleaseMgrs()

--
Gitblit v1.8.0