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/ChatPlayerOtherCell.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Main/System/Chat/ChatPlayerOtherCell.cs b/Main/System/Chat/ChatPlayerOtherCell.cs
index c15f2cd..f00372f 100644
--- a/Main/System/Chat/ChatPlayerOtherCell.cs
+++ b/Main/System/Chat/ChatPlayerOtherCell.cs
@@ -27,12 +27,12 @@
         int bubbleID = ChatBubbleHelper.GetOtherChatBubbleID(data.Job, (int)data.BubbleBox);
         m_ChatBubble.DisplayBubble(bubbleID, (int)data.PlayerID);
 
-        if (manager.nowChatTab == ChatTab.World)
+        if (manager.nowChatTab == ChatChannel.World)
         {
             string serverName = ServerListCenter.Instance.GetServerName((int)data.ServerID);
             m_PlayerName.text = Language.Get("Chat08", serverName, data.Name);
         }
-        else if (manager.nowChatTab == ChatTab.Guild)
+        else if (manager.nowChatTab == ChatChannel.Guild)
         {
             FairyMember fairyMember = PlayerDatas.Instance.fairyData.GetMember((int)data.PlayerID);
             int fmlv = 0;
@@ -42,7 +42,7 @@
             }
             m_PlayerName.text = Language.Get("Chat08", RichTextMsgReplaceConfig.GetRichReplace("FAMILY", fmlv), data.Name);
         }
-        else if (manager.nowChatTab == ChatTab.CrossServer)
+        else if (manager.nowChatTab == ChatChannel.CrossServer)
         {
             string serverName = ServerListCenter.Instance.GetServerName((int)data.ServerID);
             m_PlayerName.text = Language.Get("Chat08", serverName, data.Name);

--
Gitblit v1.8.0