From cbe3d7c2cb4fbf96f3a2295351fa03ea14035499 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 26 九月 2018 20:28:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Chat/ChatCenter.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/Chat/ChatCenter.cs b/System/Chat/ChatCenter.cs
index f619199..ebaa716 100644
--- a/System/Chat/ChatCenter.cs
+++ b/System/Chat/ChatCenter.cs
@@ -605,7 +605,7 @@
private void AutoPlayVoice()
{
- if (voicePlaying || WindowCenter.Instance.CheckOpen<LoadingWin>()
+ if (voicePlaying || WindowCenter.Instance.IsOpen<LoadingWin>()
|| !(StageManager.Instance.CurrentStage is DungeonStage))
{
return;
@@ -716,17 +716,17 @@
private void CheckChatFloatOpen()
{
- if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.CheckOpen<LoadingWin>()
- && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+ if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.IsOpen<LoadingWin>()
+ && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())
{
- if (!WindowCenter.Instance.CheckOpen<ChatFloatWin>())
+ if (!WindowCenter.Instance.IsOpen<ChatFloatWin>())
{
WindowCenter.Instance.Open<ChatFloatWin>();
}
}
else
{
- if (WindowCenter.Instance.CheckOpen<ChatFloatWin>())
+ if (WindowCenter.Instance.IsOpen<ChatFloatWin>())
{
WindowCenter.Instance.CloseImmediately<ChatFloatWin>();
}
@@ -762,7 +762,7 @@
{
return;
}
- if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>()
+ if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()
|| WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()
|| StageManager.Instance.isLoading
|| NewBieCenter.Instance.inGuiding)
@@ -770,7 +770,7 @@
return;
}
openChatAfterCollect = false;
- if (!WindowCenter.Instance.CheckOpen<ChatWin>())
+ if (!WindowCenter.Instance.IsOpen<ChatWin>())
{
ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;
WindowCenter.Instance.Open<ChatWin>();
--
Gitblit v1.8.0