From f2cd8cf71a54e251e5f507c7d69c6f91f90e5074 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Chat/ChatCenter.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index 38a14a3..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);
}
@@ -708,7 +710,7 @@
CheckChatFloatOpen();
if (win is MainInterfaceWin)
{
- CheckOpenChatAfterCollect();
+ SnxxzGame.Instance.StartCoroutine(Co_CheckAfterCollect());
}
}
@@ -744,6 +746,12 @@
CheckOpenChatAfterCollect();
}
+ IEnumerator Co_CheckAfterCollect()
+ {
+ yield return null;
+ CheckOpenChatAfterCollect();
+ }
+
void CheckOpenChatAfterCollect()
{
if (!openChatAfterCollect)
@@ -754,7 +762,7 @@
{
return;
}
- if (!WindowCenter.Instance.Open<MainInterfaceWin>()
+ if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>()
|| WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()
|| StageManager.Instance.isLoading
|| NewBieCenter.Instance.inGuiding)
@@ -762,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