3335 缥缈仙域

client_linchunjie

2019-04-09 3725173d08030fe41db62577a24b6785cc053be5

3335 缥缈仙域

 Fight/Stage/Dungeon/AdventureStage.cs

@@ -2,13 +2,16 @@
using Snxxz.UI;
using UnityEngine.SceneManagement;
using UnityEngine;

using System;



public class AdventureStage : Singleton<AdventureStage>
{
    public bool IsInAdventureStage { get; private set; }

    private Vector3 m_CacheHeroPos;
    private GA_NpcClientFunc m_Npc;

    public event Action onLoadAdventureStageFinish;

    HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } }

@@ -46,6 +49,11 @@
        m_Npc.Pos = new Vector3(189.101f, 62.47324f, 26.147f);
        NPCInteractProcessor.s_NpcInteractEvent -= OnNpcTalkEvent;
        NPCInteractProcessor.s_NpcInteractEvent += OnNpcTalkEvent;

        if (onLoadAdventureStageFinish != null)

        {

            onLoadAdventureStageFinish();

        }
    }

    private IEnumerator _Exit()

 System/Activity/ActivityModel.cs

@@ -37,6 +37,7 @@
            PlayerDatas.Instance.fairyData.OnRefreshFairyBoss += CheckActivity;

            StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            AdventureStage.Instance.onLoadAdventureStageFinish += 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.onLoadAdventureStageFinish -= 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;

            }