| Fight/Stage/Dungeon/AdventureStage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Activity/ActivityModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentPanel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Stage/Dungeon/AdventureStage.cs
@@ -11,7 +11,8 @@ private Vector3 m_CacheHeroPos; private GA_NpcClientFunc m_Npc; public event Action onLoadAdventureStageFinish; public event Action onLoadAdventureStage; public event Action onExitAdventureStage; HazyRegionModel hazyRegionModel { get { return ModelCenter.Instance.GetModel<HazyRegionModel>(); } } @@ -50,9 +51,9 @@ NPCInteractProcessor.s_NpcInteractEvent -= OnNpcTalkEvent; NPCInteractProcessor.s_NpcInteractEvent += OnNpcTalkEvent; if (onLoadAdventureStageFinish != null) if (onLoadAdventureStage != null) { onLoadAdventureStageFinish(); onLoadAdventureStage(); } } @@ -77,6 +78,11 @@ CameraController.Instance.Apply(); yield return null; WindowCenter.Instance.Close<LoadingWin>(); if (onExitAdventureStage != null) { onExitAdventureStage(); } } private void OnNpcTalkEvent(E_NpcType type, int npcid, uint sid) System/Activity/ActivityModel.cs
@@ -37,7 +37,7 @@ PlayerDatas.Instance.fairyData.OnRefreshFairyBoss += CheckActivity; StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish; NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent; AdventureStage.Instance.onLoadAdventureStageFinish += OnLoadAdventureStageFinish; AdventureStage.Instance.onLoadAdventureStage += OnLoadAdventureStageFinish; var _funcCfg = FuncConfigConfig.Get("SpecialActivitys"); var _json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1); @@ -60,7 +60,7 @@ fairyLeagueModel.onFairyLeagueBattleEvent -= CheckActivity; fairyLeagueModel.OnRefreshFairyLeagueEvent -= CheckActivity; PlayerDatas.Instance.fairyData.OnRefreshFairyBoss -= CheckActivity; AdventureStage.Instance.onLoadAdventureStageFinish -= OnLoadAdventureStageFinish; AdventureStage.Instance.onLoadAdventureStage -= OnLoadAdventureStageFinish; } IEnumerator Co_GuideComplete() System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -60,6 +60,11 @@ private void OnBack() { if (model.IsIncidentDungeon()) { return; } ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get(""), (bool isOk) => { if (isOk) System/HazyRegion/HazyRegionModel.cs
@@ -48,6 +48,7 @@ ParseConfig(); StageLoad.Instance.onStageLoadFinish += OnStageLoadFinish; AdventureStage.Instance.onExitAdventureStage += OnExitAdventureStage; } public void OnBeforePlayerDataInitialize() @@ -67,6 +68,12 @@ public override void UnInit() { StageLoad.Instance.onStageLoadFinish -= OnStageLoadFinish; AdventureStage.Instance.onExitAdventureStage -= OnExitAdventureStage; } private void OnExitAdventureStage() { SnxxzGame.Instance.StartCoroutine(Co_TryOpenHazyRegionWin()); } private void OnStageLoadFinish() @@ -97,7 +104,10 @@ { yield break; } WindowCenter.Instance.Open<CrossServerWin>(false, 2); if (WindowCenter.Instance.IsOpen<MainInterfaceWin>()) { WindowCenter.Instance.Open<CrossServerWin>(false, 2); } } void ParseConfig() @@ -236,6 +246,19 @@ return false; } public bool IsIncidentDungeon() { if (AdventureStage.Instance.IsInAdventureStage) { return true; } if (IsIncidentDungeon(PlayerDatas.Instance.baseData.MapID)) { return true; } return false; } public void DisplayErrorRemind(int error) { switch (error)
