From 4f43fbde4dd369e7133f325a938718430d9e6105 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:50:18 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Chat/ChatCenter.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index fb300b6..f619199 100644
--- a/System/Chat/ChatCenter.cs
+++ b/System/Chat/ChatCenter.cs
@@ -49,8 +49,10 @@
chatChannels.Add(ChatInfoType.System);
chatChannels.Add(ChatInfoType.World);
chatChannels.Add(ChatInfoType.Area);
+ chatChannels.Add(ChatInfoType.Team);
chatChannels.Add(ChatInfoType.Invite);
chatChannels.Add(ChatInfoType.Trumpet);
+ chatChannels.Add(ChatInfoType.Fairy);
chatChannels.Add(ChatInfoType.Friend);
}
@@ -768,11 +770,10 @@
return;
}
openChatAfterCollect = false;
- if (!WindowCenter.Instance.CheckOpen<SocialWin>())
+ if (!WindowCenter.Instance.CheckOpen<ChatWin>())
{
ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
- WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();
- WindowCenter.Instance.Open<SocialWin>();
+ WindowCenter.Instance.Open<ChatWin>();
}
}
#endregion
--
Gitblit v1.8.0