From e6db2d020798d5cd27aeb1fc7f5c822fba8fcb22 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 21 五月 2019 18:03:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/NewBieGuidance/NewBieTrigger.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/System/NewBieGuidance/NewBieTrigger.cs b/System/NewBieGuidance/NewBieTrigger.cs
index 583e97a..4cacc92 100644
--- a/System/NewBieGuidance/NewBieTrigger.cs
+++ b/System/NewBieGuidance/NewBieTrigger.cs
@@ -52,6 +52,7 @@
treasureModel.treasureStageUpEvent += OnTreasureStageChange;
achievementModel.achievementAwardableEvent += OnAchievementAwardAble;
prayerModel.freeCoinPrayerStateChange += OnFreeCoinPrayer;
+ BossShowModel.Instance.bossShowCompletedEvent += OnBossShowEnd;
}
}
@@ -71,6 +72,7 @@
treasureModel.treasureStageUpEvent -= OnTreasureStageChange;
achievementModel.achievementAwardableEvent -= OnAchievementAwardAble;
prayerModel.freeCoinPrayerStateChange -= OnFreeCoinPrayer;
+ BossShowModel.Instance.bossShowCompletedEvent -= OnBossShowEnd;
}
}
@@ -106,6 +108,7 @@
achievementModel.achievementAwardableEvent += OnAchievementAwardAble;
TreasureNewGotWin.CloseTreasureNewGotWinEvent += OnTreasureShowEnd;
prayerModel.freeCoinPrayerStateChange += OnFreeCoinPrayer;
+ BossShowModel.Instance.bossShowCompletedEvent += OnBossShowEnd;
}
private void OnWindowPreClose(Window _window)
@@ -129,6 +132,7 @@
achievementModel.achievementAwardableEvent -= OnAchievementAwardAble;
TreasureNewGotWin.CloseTreasureNewGotWinEvent -= OnTreasureShowEnd;
prayerModel.freeCoinPrayerStateChange -= OnFreeCoinPrayer;
+ BossShowModel.Instance.bossShowCompletedEvent -= OnBossShowEnd;
}
private void OnFunctionOpen(int _functionId)
@@ -201,6 +205,11 @@
CheckNewBieGuide();
}
+ private void OnBossShowEnd()
+ {
+ CheckNewBieGuide();
+ }
+
private void CheckNewBieGuide()
{
var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
@@ -214,6 +223,11 @@
return;
}
+ if (BossShowModel.Instance.BossShowing)
+ {
+ return;
+ }
+
if (guides != null)
{
NewBieCenter.Instance.CheckNewBieGuides(guides);
--
Gitblit v1.8.0