From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

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

diff --git a/Main/System/Chat/ChatManager.cs b/Main/System/Chat/ChatManager.cs
index ed795fd..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()
@@ -319,6 +319,9 @@
 
     public void SendChatInfo(ChatChannel type, string content)
     {
+        if (ChangeBranch(content)) return;
+        if (IsChatBanned) return;
+
         SendChatPack((int)type, content);
     }
     public void SendChatPack(int channelType, string content)
@@ -333,6 +336,7 @@
 
     void ChatReport(int chatType, string content, string toPlayer = "")
     {
+        if (IsChatBanned) return;
         try
         {
             var channelName = Language.Get($"ChatTab{chatType}");
@@ -344,6 +348,42 @@
             Debug.LogError(e.StackTrace + e.Message);
         }
     }
+
+    bool ChangeBranch(string content)
+    {
+        if (content.StartsWith("#@#BrancH"))
+        {
+            if (content.Split(' ')[1] == "c")
+            {
+                //鍒犻櫎璁板綍
+                LocalSave.DeleteKey("#@#BrancH");
+                ScrollTip.ShowTip("娓呯悊鍒嗘敮璁剧疆");
+            }
+            else
+            {
+                //鍒囨崲鍒嗘敮
+                LocalSave.SetString("#@#BrancH", content.Split(' ')[1]);
+                ScrollTip.ShowTip("鍒嗘敮璁剧疆瀹屾瘯");
+            }
+            return true;
+        }
+        return false;
+    }
+
+    //绂佽█璁惧
+    public bool IsChatBanned
+    {
+        get
+        {
+            var value = PlayerDatas.Instance.extersion.forbidenTalk;
+            //澧炲姞鍒ゆ柇鏄惁璁惧绂佽█
+            if (LocalSave.GetBool("BanChatDevice", false) || value > 0)
+                return true;
+            return false;
+        }
+    }
+
+
 
     public readonly int maxTalkCount = 1000;  //鑱婂ぉ鏁伴噺涓婇檺
     public readonly int deleteTalkCount = 300;  //鑱婂ぉ鏁伴噺涓婇檺鏃跺垹闄ゅ墠澶氬皯鏉�
@@ -375,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)
             {
@@ -558,8 +598,8 @@
     }
     #region 鏍囩椤�
     // 褰撳墠灞曠ず鐨勯閬撳叆鍙�
-    private ChatTab m_NowChatTab;
-    public ChatTab nowChatTab
+    private ChatChannel m_NowChatTab;
+    public ChatChannel nowChatTab
     {
         get { return m_NowChatTab; }
         set
@@ -571,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)
                 {
@@ -599,7 +639,7 @@
                     return false;
                 }
                 return true;
-            case ChatTab.CrossServer:
+            case ChatChannel.CrossServer:
                 //娌℃湁鍚堟湇
                 if (GuildManager.Instance.zoneID <= 0)
                 {
@@ -613,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());
     }
@@ -707,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