| Core/GameEngine/Login/Launch.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_NpcCollect.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorNpcFight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorNpcNoFight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorPlayerBase.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/Dungeon/DungeonStage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/StageManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonInspireWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Login/Launch.cs
@@ -117,10 +117,10 @@ File.Copy(fromPath, toPath, true); } LocalSave.SetString("BuiltInAssetCopyCompleted_IOS", VersionConfig.Get().version); } } LocalSave.SetString("BuiltInAssetCopyCompleted_IOS", VersionConfig.Get().version); #endif if (!AssetSource.builtInFromEditor) Fight/GameActor/GA_NpcCollect.cs
@@ -118,7 +118,11 @@ { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE); } m_Animator.runtimeAnimatorController = _controller; if (_controller) { m_Animator.runtimeAnimatorController = _controller; } m_Animator.enabled = true; m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID); Fight/GameActor/GActorNpcFight.cs
@@ -144,7 +144,11 @@ _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE); } m_Animator.runtimeAnimatorController = _controller; if (_controller) { m_Animator.runtimeAnimatorController = _controller; } m_Animator.enabled = true; @@ -783,7 +787,10 @@ { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _npcConfig.MODE); } if (_controller) { _a.runtimeAnimatorController = _controller; } _a.enabled = true; _a.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID); m_Animator.enabled = false; Fight/GameActor/GActorNpcNoFight.cs
@@ -200,7 +200,10 @@ { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, NpcConfig.MODE); } m_Animator.runtimeAnimatorController = _controller; if (_controller) { m_Animator.runtimeAnimatorController = _controller; } m_Animator.enabled = true; m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID); } Fight/GameActor/GActorPlayerBase.cs
@@ -1267,8 +1267,10 @@ { _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _modelResConfig.ResourcesName); } m_HorseAnimator.runtimeAnimatorController = _controller; if (_controller) { m_HorseAnimator.runtimeAnimatorController = _controller; } m_HorseAnimator.enabled = true; // 先设置根节点 Fight/Stage/Dungeon/DungeonStage.cs
@@ -11,7 +11,8 @@ public static MapType CurrentMapType; HeavenBattleModel _heavenModel; HeavenBattleModel heavenModel { HeavenBattleModel heavenModel { get { return _heavenModel ?? (_heavenModel = ModelCenter.Instance.GetModel<HeavenBattleModel>()); } } @@ -33,10 +34,10 @@ SoundPlayer.Instance.PlayBackGroundMusic(mapResConfig.Music); // 做一些前期战斗的预加载 if (!PreFightMission.Instance.IsFinished()) { PreFightMission.Instance.PreLoad(); } // if (!PreFightMission.Instance.IsFinished()) // { // PreFightMission.Instance.PreLoad(); // } } protected override void OnStageLoadFinish() @@ -62,10 +63,10 @@ GA_Hero.s_MapSwitching = false; GA_Hero.forceAutoFight = false; if (PreFightMission.Instance.IsFinished() == false) { PreFightMission.Instance.Start(); } // if (PreFightMission.Instance.IsFinished() == false) // { // PreFightMission.Instance.Start(); // } WindowCenter.Instance.Open<MapNameHintWin>(); WindowCenter.Instance.Open<ExperienceGetWin>(); @@ -140,10 +141,10 @@ DropItemManager.Update(); if (PreFightMission.Instance.IsFinished() == false) { PreFightMission.Instance.Update(); } // if (PreFightMission.Instance.IsFinished() == false) // { // PreFightMission.Instance.Update(); // } } protected override void OnFixedUpdate() Fight/Stage/StageManager.cs
@@ -269,32 +269,32 @@ yield return null; } if (_stageId == 10010) { while (!PreFightMission.Instance.IsHandleMissionState) { yield return null; } // if (_stageId == 10010) // { // while (!PreFightMission.Instance.IsHandleMissionState) // { // yield return null; // } try { // 如果用户尚未完成前期战斗部分 if (!PreFightMission.Instance.IsFinished()) { if (!AssetSource.sceneFromEditor) { AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt"); } SceneManager.LoadScene("Map000_Xsdt", LoadSceneMode.Additive); } } catch (System.Exception ex) { ExceptionCatcher.ReportException("场景加载 Step5", ex); } } // try // { // // 如果用户尚未完成前期战斗部分 // if (!PreFightMission.Instance.IsFinished()) // { // if (!AssetSource.sceneFromEditor) // { // AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt"); // } // SceneManager.LoadScene("Map000_Xsdt", LoadSceneMode.Additive); // } // } // catch (System.Exception ex) // { // ExceptionCatcher.ReportException("场景加载 Step5", ex); // } // } yield return null; // yield return null; loadingProgress = loadingProgress + 0.1f; // 场景加载完就可以确定玩家位置了, 不需要等待具体场景的逻辑初始化 System/Dungeon/DungeonInspireWin.cs
@@ -79,7 +79,7 @@ m_CoinInspire.gameObject.SetActive(coinInspireConfig != null); coinInspire = coinInspireConfig == null ? false : true; coinInspire = IsCoinInspireLimit() ? false : true; fairyInspire = !coinInspire; Display(); @@ -120,36 +120,37 @@ CloseImmediately(); return; } if (IsCoinInspireLimit() && coinInspire) { coinInspire = false; fairyInspire = !coinInspire; } DisplayCost(); UpdateInspireType(); } private void CoinInspire() { if (!coinInspire) if (!coinInspire && IsCoinInspireLimit()) { if (model.GetDungeonInspireLevel(3) >= coinInspireConfig.InspireCount) { SysNotifyMgr.Instance.ShowTip("Xjmj_CopperInspireFull"); return; } coinInspire = true; fairyInspire = false; SysNotifyMgr.Instance.ShowTip("Xjmj_CopperInspireFull"); return; } else { coinInspire = false; } coinInspire = true; fairyInspire = !coinInspire; UpdateInspireType(); } private void FairyInspire() { if (coinInspireConfig == null) { return; } fairyInspire = true; coinInspire = false; fairyInspire = !fairyInspire; UpdateInspireType(); } @@ -260,11 +261,20 @@ return false; } bool IsCoinInspireLimit() { if (coinInspireConfig != null) { return model.GetDungeonInspireLevel(3) >= coinInspireConfig.InspireCount; } return true; } private void UpdateInspireType() { var level = model.GetDungeonInspireLevel(); m_InspireLevel.text = level == 0 ? Language.Get("FairyLand_Func4") : Language.Get("HaveInspired", StringUtility.Contact("<color=#109d06>", : Language.Get("HaveInspired", StringUtility.Contact("<color=#109d06>", level * model.GetDungeonInspireUpper(PlayerDatas.Instance.baseData.MapID), "%</color>")); m_CoinInspireCheck.gameObject.SetActive(coinInspire); m_FairyInspireCheck.gameObject.SetActive(fairyInspire);
