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/HeavenBattle/HeavenBattleModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/HeavenBattle/HeavenBattleModel.cs b/System/HeavenBattle/HeavenBattleModel.cs
index 837cd1c..4d61f7a 100644
--- a/System/HeavenBattle/HeavenBattleModel.cs
+++ b/System/HeavenBattle/HeavenBattleModel.cs
@@ -189,7 +189,7 @@
{
if(dailyQuestModel.GetQuestState(dailyConfig.ID) != DailyQuestModel.DailyQuestState.OutTime)
{
- if (!WindowCenter.Instance.CheckOpen<HeavenBattleWin>())
+ if (!WindowCenter.Instance.IsOpen<HeavenBattleWin>())
{
var config = Config.Instance.Get<DailyQuestConfig>(dailyConfig.ID);
dungeonModel.currentDungeon = new Dungeon(config.RelatedID, 0);
@@ -228,12 +228,12 @@
WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();
battlePrepareTime = 3;
IsBattlePrepare = true;
- if (WindowCenter.Instance.CheckOpen<DungeonEndCoolDownWin>())
+ if (WindowCenter.Instance.IsOpen<DungeonEndCoolDownWin>())
{
WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();
}
- if (!WindowCenter.Instance.CheckOpen<BattlePrepareCoolDownWin>())
+ if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>())
{
WindowCenter.Instance.Open<BattlePrepareCoolDownWin>();
}
--
Gitblit v1.8.0