From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Chat/ChatWin.cs |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Main/System/Chat/ChatWin.cs b/Main/System/Chat/ChatWin.cs
index 78fea13..dd55b49 100644
--- a/Main/System/Chat/ChatWin.cs
+++ b/Main/System/Chat/ChatWin.cs
@@ -1,5 +1,5 @@
 锘�//--------------------------------------------------------
-//    [Author]:           绗簩涓栫晫
+//    [Author]:           鐜╀釜娓告垙
 //    [  Date ]:           Monday, April 09, 2018
 //--------------------------------------------------------
 
@@ -109,13 +109,7 @@
 
         private bool IsSatisfyShowChannel(ChatInfoType channel)
         {
-            if (CrossServerUtility.IsCrossServer())
-            {
-                if (channel == ChatInfoType.Team || channel == ChatInfoType.Invite)
-                {
-                    return false;
-                }
-            }
+
             return true;
         }
 
@@ -224,7 +218,7 @@
             {
                 case ChatInfoType.Fairy:
                     {
-                        int limit = FuncOpenLVConfig.Get((int)FuncOpenEnum.Fairy).LimitLV;
+                        int limit = FuncOpenLVConfig.Get((int)FuncOpenEnum.Guild).LimitLV;
                         if (PlayerDatas.Instance.baseData.LV < limit)
                         {
                             ServerTipDetails.DisplayNormalTip(Language.Get("L1136", limit));

--
Gitblit v1.8.0