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/ChatCtrl.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/System/Chat/ChatCtrl.cs b/System/Chat/ChatCtrl.cs
index b8eca6c..f71eee7 100644
--- a/System/Chat/ChatCtrl.cs
+++ b/System/Chat/ChatCtrl.cs
@@ -1029,13 +1029,15 @@
switch (type)
{
case ChatInfoType.Team:
- if (!WindowCenter.Instance.CheckOpen<TeamChatWin>())
+ if (!WindowCenter.Instance.CheckOpen<TeamChatWin>()
+ && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Team))
{
unReadChatCounts[ChatInfoType.Team] = Mathf.Min(unReadChatCounts[ChatInfoType.Team] + 1, 99);
}
break;
case ChatInfoType.Fairy:
- if (!WindowCenter.Instance.CheckOpen<FairyChatWin>())
+ if (!WindowCenter.Instance.CheckOpen<FairyChatWin>()
+ && (!WindowCenter.Instance.CheckOpen<ChatWin>() || presentChatType != ChatInfoType.Fairy))
{
unReadChatCounts[ChatInfoType.Fairy] = Mathf.Min(unReadChatCounts[ChatInfoType.Fairy] + 1, 99);
}
--
Gitblit v1.8.0