Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-04-16 2f723e5320ef618985cc9ea8f71deafd3e4bec36

 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;

            }