From 5cb450e0d35fe040399ec5fbcd339d0953cd80f0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 11:06:40 +0800
Subject: [PATCH] 1571 【前端】Boss秀期间屏蔽境界助战
---
Core/GameEngine/Model/Player/Realm/RealmModel.cs | 17 +++++++++++++++--
Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs b/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
index 01a81d9..b5fd4a1 100644
--- a/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
+++ b/Core/GameEngine/Model/Player/Realm/PlayerRealmData.cs
@@ -50,7 +50,7 @@
{
return;
}
- if (!WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding)
+ if (!WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)
{
WindowCenter.Instance.Open<RealmUpHoldWin>();
}
diff --git a/Core/GameEngine/Model/Player/Realm/RealmModel.cs b/Core/GameEngine/Model/Player/Realm/RealmModel.cs
index 93a82e7..c08fcc7 100644
--- a/Core/GameEngine/Model/Player/Realm/RealmModel.cs
+++ b/Core/GameEngine/Model/Player/Realm/RealmModel.cs
@@ -36,6 +36,7 @@
PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshInfo;
StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;
+ BossShowModel.Instance.bossShowCompletedEvent += BossShowCompletedEvent;
}
private int cacheMapId = 0;
@@ -69,7 +70,7 @@
if (StageManager.Instance.CurrentStage is DungeonStage)
{
if (PlayerDatas.Instance.realm.holdDataList.Count > 0
- && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding)
+ && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)
{
WindowCenter.Instance.Open<RealmUpHoldWin>();
}
@@ -88,7 +89,7 @@
cacheRealmLv = PlayerDatas.Instance.baseData.realmLevel;
}
if (PlayerDatas.Instance.realm.holdDataList.Count > 0
- && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding)
+ && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)
{
WindowCenter.Instance.Open<RealmUpHoldWin>();
}
@@ -106,6 +107,18 @@
cacheMapId = PlayerDatas.Instance.baseData.MapID;
}
+ private void BossShowCompletedEvent()
+ {
+ if (StageManager.Instance.CurrentStage is DungeonStage)
+ {
+ if (PlayerDatas.Instance.realm.holdDataList.Count > 0
+ && !WindowCenter.Instance.CheckOpen<RealmUpHoldWin>() && !NewBieCenter.Instance.inGuiding && !BossShowModel.Instance.BossShowing)
+ {
+ WindowCenter.Instance.Open<RealmUpHoldWin>();
+ }
+ }
+ }
+
private void RefreshInfo(PlayerDataRefresh refreshType)
{
if (refreshType == PlayerDataRefresh.OfficialRank)
--
Gitblit v1.8.0