From 9203f8bd22b3cf3fa9bfd537fd16b2e86d7223b1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 19 九月 2018 11:27:14 +0800
Subject: [PATCH] 3564【前端】队伍和仙盟频道移动至仙缘中
---
System/Chat/ChatTip.cs | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/System/Chat/ChatTip.cs b/System/Chat/ChatTip.cs
index 0cc5b43..98a8015 100644
--- a/System/Chat/ChatTip.cs
+++ b/System/Chat/ChatTip.cs
@@ -145,7 +145,7 @@
private void OnChatClick()
{
- if (WindowCenter.Instance.CheckOpen<ChatWin>())
+ if (WindowCenter.Instance.CheckOpen<ChatWin>() || WindowCenter.Instance.CheckOpen<SocialWin>())
{
return;
}
@@ -154,6 +154,8 @@
if (mapId == 31230)
{
ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
+ WindowCenter.Instance.Open<SocialWin>(false, 2);
+ return;
}
WindowCenter.Instance.Open<ChatWin>();
}
@@ -211,7 +213,7 @@
void OnChatDataClick(ChatData data)
{
- if (WindowCenter.Instance.CheckOpen<ChatWin>())
+ if (WindowCenter.Instance.CheckOpen<ChatWin>() || WindowCenter.Instance.CheckOpen<SocialWin>())
{
return;
}
@@ -221,7 +223,18 @@
{
ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
}
- WindowCenter.Instance.Open<ChatWin>();
+ switch (ChatCtrl.Inst.presentChatType)
+ {
+ case ChatInfoType.Team:
+ WindowCenter.Instance.Open<SocialWin>(false, 1);
+ break;
+ case ChatInfoType.Fairy:
+ WindowCenter.Instance.Open<SocialWin>(false, 2);
+ break;
+ default:
+ WindowCenter.Instance.Open<ChatWin>();
+ break;
+ }
}
void OnRefreshChatTip(ChatInfoType type)
--
Gitblit v1.8.0