From 0cfa0f146cdf71c802a63b1b854249f909372510 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 10 三月 2026 14:51:03 +0800
Subject: [PATCH] 0312 统一频道枚举

---
 Main/System/Chat/ChatManager.cs |   43 ++++++++++++++++++-------------------------
 1 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/Main/System/Chat/ChatManager.cs b/Main/System/Chat/ChatManager.cs
index a38099b..fd02c86 100644
--- a/Main/System/Chat/ChatManager.cs
+++ b/Main/System/Chat/ChatManager.cs
@@ -99,7 +99,7 @@
         if (!obj)
         {
             nowChatChannel = ChatChannel.World;
-            nowChatTab = ChatTab.World;
+            nowChatTab = ChatChannel.World;
             if (talkDict.ContainsKey(ChatChannel.Guild))
             {
                 talkDict[ChatChannel.Guild].Clear();
@@ -117,7 +117,7 @@
         lastTalkDataDict.Clear();
         currentDayDict.Clear();
         nowChatChannel = ChatChannel.World;
-        nowChatTab = ChatTab.World;
+        nowChatTab = ChatChannel.World;
     }
 
     private void OnBeforePlayerDataInitializeEventOnRelogin()
@@ -415,7 +415,7 @@
             bool isOpen = GetBulletSetting(channelType);
             if (!isOpen)
                 continue;
-            if (channelType == ChatChannel.Guild && !IsTabOpen(ChatTab.Guild, false))
+            if (channelType == ChatChannel.Guild && !IsTabOpen(ChatChannel.Guild, false))
                 continue;
             if (data == null || talkData.TalkTime > data.TalkTime)
             {
@@ -598,8 +598,8 @@
     }
     #region 鏍囩椤�
     // 褰撳墠灞曠ず鐨勯閬撳叆鍙�
-    private ChatTab m_NowChatTab;
-    public ChatTab nowChatTab
+    private ChatChannel m_NowChatTab;
+    public ChatChannel nowChatTab
     {
         get { return m_NowChatTab; }
         set
@@ -611,26 +611,26 @@
         }
     }
 
-    public event Action<ChatTab> OnChatTabChangeEvent;
+    public event Action<ChatChannel> OnChatTabChangeEvent;
 
     // 棰戦亾鍏ュ彛鐨勫睍绀洪『搴�
-    public readonly List<ChatTab> tabShowList = new List<ChatTab>()
+    public readonly List<ChatChannel> tabShowList = new List<ChatChannel>()
     {
-        ChatTab.World,
-        ChatTab.Guild,
-        ChatTab.CrossServer,
+        ChatChannel.World,
+        ChatChannel.Guild,
+        ChatChannel.CrossServer,
         // ChatTab.Person,
         // ChatTab.BlackList,
     };
 
-    public bool IsTabOpen(ChatTab chatTab, bool isTip = false)
+    public bool IsTabOpen(ChatChannel chatTab, bool isTip = false)
     {
         if (!tabShowList.Contains(chatTab))
             return false;
 
         switch (chatTab)
         {
-            case ChatTab.Guild:
+            case ChatChannel.Guild:
                 //娌℃湁鍏細
                 if (!PlayerDatas.Instance.fairyData.HasFairy)
                 {
@@ -639,7 +639,7 @@
                     return false;
                 }
                 return true;
-            case ChatTab.CrossServer:
+            case ChatChannel.CrossServer:
                 //娌℃湁鍚堟湇
                 if (GuildManager.Instance.zoneID <= 0)
                 {
@@ -653,22 +653,22 @@
         }
     }
 
-    public bool IsSelectChatTab(ChatTab chatTab)
+    public bool IsSelectChatTab(ChatChannel chatTab)
     {
         return nowChatTab == chatTab;
     }
 
     public bool IsValidChatTab(int chatTab)
     {
-        return Enum.IsDefined(typeof(ChatTab), chatTab);
+        return Enum.IsDefined(typeof(ChatChannel), chatTab);
     }
 
-    public string GetChatTabName(ChatTab chatTab)
+    public string GetChatTabName(ChatChannel chatTab)
     {
         return Language.Get(StringUtility.Concat("ChatTab", ((int)chatTab).ToString()));
     }
 
-    public string GetChatTabSelectIcon(ChatTab chatTab, bool isSelect)
+    public string GetChatTabSelectIcon(ChatChannel chatTab, bool isSelect)
     {
         return StringUtility.Concat(isSelect ? "ChatTabSelect" : "ChatTabUnSelect", ((int)chatTab).ToString());
     }
@@ -747,14 +747,7 @@
 
 }
 
-public enum ChatTab
-{
-    World = 0,      //涓栫晫
-    Guild = 1,      //鍏細      
-    CrossServer = 2,    //璺ㄦ湇
-    Person = 3,     //绉佽亰
-    BlackList = 4,  //榛戝悕鍗�
-}
+
 public enum ChatChannel
 {
     World = 0,          //涓栫晫

--
Gitblit v1.8.0