From 2f723e5320ef618985cc9ea8f71deafd3e4bec36 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 16 四月 2019 11:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Activity/ActivityModel.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index d33b367..9174569 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -37,6 +37,7 @@
PlayerDatas.Instance.fairyData.OnRefreshFairyBoss += CheckActivity;
StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;
NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;
+ AdventureStage.Instance.onLoadAdventureStage += OnLoadAdventureStageFinish;
var _funcCfg = FuncConfigConfig.Get("SpecialActivitys");
var _json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1);
@@ -59,6 +60,7 @@
fairyLeagueModel.onFairyLeagueBattleEvent -= CheckActivity;
fairyLeagueModel.OnRefreshFairyLeagueEvent -= CheckActivity;
PlayerDatas.Instance.fairyData.OnRefreshFairyBoss -= CheckActivity;
+ AdventureStage.Instance.onLoadAdventureStage -= OnLoadAdventureStageFinish;
}
IEnumerator Co_GuideComplete()
@@ -151,6 +153,19 @@
}
}
+ private void OnLoadAdventureStageFinish()
+ {
+ if (AdventureStage.Instance.IsInAdventureStage)
+ {
+ mainStage = false;
+ activityNotifies.Clear();
+ if (WindowCenter.Instance.IsOpen<ActivityNotifyWin>())
+ {
+ WindowCenter.Instance.Close<ActivityNotifyWin>();
+ }
+ }
+ }
+
IEnumerator Co_StageLoad()
{
yield return null;
@@ -160,7 +175,8 @@
private void CheckActivity()
{
- if (!mainStage || !(StageLoad.Instance.currentStage is DungeonStage))
+ if (!mainStage || !(StageLoad.Instance.currentStage is DungeonStage)
+ || AdventureStage.Instance.IsInAdventureStage)
{
return;
}
--
Gitblit v1.8.0