From 16cda7bbd7574cd9c4c94fa1dc97d639f51ca0cd Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 11 一月 2019 17:58:38 +0800
Subject: [PATCH] 5725 【1.5】跨服聊天界面不显示组队，队伍频道
---
System/Chat/ChatWin.cs | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/System/Chat/ChatWin.cs b/System/Chat/ChatWin.cs
index 7be4a67..8c127af 100644
--- a/System/Chat/ChatWin.cs
+++ b/System/Chat/ChatWin.cs
@@ -45,6 +45,11 @@
protected override void OnPreOpen()
{
+ if (!IsSatisfyShowChannel(ChatCtrl.Inst.presentChatType))
+ {
+ ChatCtrl.Inst.presentChatType = ChatInfoType.System;
+ }
+
m_ChatSend.parent = this;
ChatCtrl.Inst.lockUpdate = false;
ChatCtrl.Inst.OnPteChatChangeEvent += OnPteChatChangeEvent;
@@ -97,7 +102,10 @@
m_ChannelControl.Refresh();
for (int i = 0; i < chatCenter.chatChannels.Count; i++)
{
- m_ChannelControl.AddCell(ScrollerDataType.Normal, (int)chatCenter.chatChannels[i], OnChannelSelect);
+ if (IsSatisfyShowChannel(chatCenter.chatChannels[i]))
+ {
+ m_ChannelControl.AddCell(ScrollerDataType.Normal, (int)chatCenter.chatChannels[i], OnChannelSelect);
+ }
}
m_ChannelControl.Restart();
}
@@ -107,6 +115,18 @@
}
}
+ private bool IsSatisfyShowChannel(ChatInfoType channel)
+ {
+ if (CrossServerUtility.IsCrossServer())
+ {
+ if (channel == ChatInfoType.Team || channel == ChatInfoType.Invite)
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
private void OnPteChatChangeEvent()
{
if (ChatCtrl.Inst.presentChatType == ChatInfoType.Friend)
--
Gitblit v1.8.0