From 7da5f5b780af330ecda645f5538e0917bd9eeb01 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 19:37:20 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/BossShow/BossShowModel.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/BossShow/BossShowModel.cs b/System/BossShow/BossShowModel.cs
index bbd0c45..451fa8a 100644
--- a/System/BossShow/BossShowModel.cs
+++ b/System/BossShow/BossShowModel.cs
@@ -75,7 +75,7 @@
ActiveBossShowCam(true);
CameraController.Instance.CameraObject.enabled = false;
- if (WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())
+ if (WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())
{
WindowJumpMgr.Instance.ClearJumpData();
WindowCenter.Instance.CloseImmediately<TreasureLevelUpWin>();
@@ -319,7 +319,7 @@
if (!_active)
{
CameraUtility.RemoveCullingMask(CameraManager.uiCamera, LayerUtility.UIEffectLayer);
- if (!WindowCenter.Instance.CheckOpen<BossShowWin>())
+ if (!WindowCenter.Instance.IsOpen<BossShowWin>())
{
WindowCenter.Instance.Open<BossShowWin>();
}
@@ -327,7 +327,7 @@
else
{
CameraUtility.AddCullingMask(CameraManager.uiCamera, LayerUtility.UIEffectLayer);
- if (WindowCenter.Instance.CheckOpen<BossShowWin>())
+ if (WindowCenter.Instance.IsOpen<BossShowWin>())
{
WindowCenter.Instance.Close<BossShowWin>();
}
@@ -345,13 +345,13 @@
private void ActiveDialogue(bool _show)
{
- if (_show && !WindowCenter.Instance.CheckOpen<BossShowDialogueWin>())
+ if (_show && !WindowCenter.Instance.IsOpen<BossShowDialogueWin>())
{
var _task = ModelCenter.Instance.GetModel<PlayerTaskDatas>();
_task._TaskNow = actorShowModel.Dialogue;
WindowCenter.Instance.Open<BossShowDialogueWin>();
}
- else if (!_show && WindowCenter.Instance.CheckOpen<BossShowDialogueWin>())
+ else if (!_show && WindowCenter.Instance.IsOpen<BossShowDialogueWin>())
{
WindowCenter.Instance.CloseImmediately<BossShowDialogueWin>();
}
--
Gitblit v1.8.0