| Fight/PreFightMission.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/Dungeon/DungeonStage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FindPrecious/DemonJarWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/RuneTower/RuneTowerWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/MultipleExpWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Welfare/OperationTimeHepler.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/PreFightMission.cs
@@ -102,22 +102,6 @@ UILoader.LoadPrefab(_actorShowConfig.cam); } public void CreateAllMissionNpc() { if (s_MissionDict.Count == 0) { return; } foreach (var _mission in s_MissionDict.Values) { if (_mission.status == 1) { HandlerMission(_mission.id); } } } public void HandleNewPlayerMission(H0820_tagMissionDict h0820) { if (h0820.MissionID == 1) @@ -190,6 +174,7 @@ public void Start() { mDestroy = false; NewGuideModel _model = ModelCenter.Instance.GetModel<NewGuideModel>(); _model.arrowScale = 1; @@ -445,13 +430,20 @@ GA_Hero _hero = PlayerDatas.Instance.hero; while (true) { if (mDestroy) { yield break; } if (_hero.IsIdle()) { break; } yield return null; } PlayerDatas.Instance.hero.MoveToPosition(pos); if (!mDestroy) { PlayerDatas.Instance.hero.MoveToPosition(pos); } } private void HandlerMission(uint missionId) @@ -468,7 +460,6 @@ if (s_MissionDict.ContainsKey(missionId)) { DesignDebug.LogFormat("已经创建过的任务ID: {0}", missionId); return; } @@ -1532,6 +1523,95 @@ DesignDebug.Log("前期结束..."); } private bool mDestroy = false; public void Destroy() { mDestroy = true; if (m_FuncNpc != null) { GAMgr.Instance.ServerDie(m_FuncNpc.ServerInstID); GAMgr.Instance.Release(m_FuncNpc); m_FuncNpc = null; } missionNpcDict.Clear(); s_MissionDict.Clear(); s_MissionImpasseDict.Clear(); refreshNpcHandlerList.Clear(); if (m_SimpleTransfer) { Object.Destroy(m_SimpleTransfer.gameObject); m_SimpleTransfer = null; } if (m_ObstacleEffect) { Object.Destroy(m_ObstacleEffect.gameObject); m_ObstacleEffect = null; } if (m_HuaShouEffect) { Object.Destroy(m_HuaShouEffect.gameObject); m_HuaShouEffect = null; } if (m_FabaoEffect) { SFXPlayUtility.Instance.Release(m_FabaoEffect); m_FabaoEffect = null; } // 资源卸载 if (!AssetSource.sceneFromEditor) { UnityEngine.SceneManagement.SceneManager.UnloadSceneAsync("Map000_Xsdt"); AssetBundleUtility.Instance.UnloadAssetBundle("maps/map000_xsdt", true, false); } List<GActor> _list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcClientFightNorm); if (_list != null) { for (int i = _list.Count - 1; i >= 0; --i) { GAMgr.Instance.ServerDie(_list[i].ServerInstID); GAMgr.Instance.Release(_list[i]); } } _list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcClientFightBoss); if (_list != null) { for (int i = _list.Count - 1; i >= 0; --i) { GAMgr.Instance.ServerDie(_list[i].ServerInstID); GAMgr.Instance.Release(_list[i]); } } _list = GAMgr.Instance.GetTypeList(E_ActorClassType.NpcClientFunc); if (_list != null) { for (int i = _list.Count - 1; i >= 0; --i) { GAMgr.Instance.ServerDie(_list[i].ServerInstID); GAMgr.Instance.Release(_list[i]); } } GameObjectPoolManager.Instance.UnLoadNPC(1000); GameObjectPoolManager.Instance.UnLoadNPC(1003); GameObjectPoolManager.Instance.UnLoadNPC(1006); GameObjectPoolManager.Instance.UnLoadNPC(1007); GameObjectPoolManager.Instance.UnLoadNPC(1008); GameObjectPoolManager.Instance.UnLoadNPC(1009); if (!AssetSource.mobFromEditor) { AssetBundleUtility.Instance.UnloadAssetBundle("mob/prefab_race_n017a", true, true); } } private SimpleMapTrasfer CreateTransfer() { Fight/Stage/Dungeon/DungeonStage.cs
@@ -122,7 +122,7 @@ CameraController.Instance.StopShake(); } PreFightMission.Instance.refreshNpcHandlerList.Clear(); PreFightMission.Instance.Destroy(); GAMgr.Instance.UnInit(); DropItemManager.ReleaseAll(); SFXPlayUtility.Instance.Unitialize(); System/DailyQuest/DailyQuestBehaviour.cs
@@ -125,9 +125,17 @@ { if (state == DailyQuestModel.DailyQuestState.CanBuyTimes) { var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(data.id); dungeonModel.currentDungeon = new Dungeon(config.RelatedID, 0); WindowCenter.Instance.Open<DungeonBuyTimesWin>(); switch ((DailyQuestType)data.id) { case DailyQuestType.RuneTowerSweep: dailyQuestWin.GotoDailyQuest(data.id); break; default: var config = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(data.id); dungeonModel.currentDungeon = new Dungeon(config.RelatedID, 0); WindowCenter.Instance.Open<DungeonBuyTimesWin>(); break; } } else { System/DailyQuest/DailyQuestModel.cs
@@ -246,7 +246,7 @@ switch (config.RelatedID) { case 11: return dailyQuestOpenTime.DayTimes + GeneralConfig.Instance.runeTowerSweepBuyTimes; return Math.Max(dailyQuestOpenTime.DayTimes, GetDailyQuestCompletedTimes(_dailyQuestId)); case 16: return ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit); default: @@ -831,7 +831,21 @@ switch (config.RelatedType) { case 1: return DailyQuestState.Completed; switch (config.RelatedID) { case 11: var dailyQuestOpenTime = ConfigManager.Instance.GetTemplate<DailyQuestOpenTimeConfig>(config.RelatedID); if (completedTimes >= dailyQuestOpenTime.DayTimes + GeneralConfig.Instance.runeTowerSweepBuyTimes) { return DailyQuestState.Completed; } else { return DailyQuestState.CanBuyTimes; } default: return DailyQuestState.Completed; } case 2: DungeonRecord record; dungeonModel.TryGetDungeonRecord(config.RelatedID, out record); System/DailyQuest/DailyQuestWin.cs
@@ -252,6 +252,7 @@ dungeonModel.SingleChallengeDungeon(config.RelatedID); break; case DailyQuestType.RuneTowerSweep: RuneTowerWin.guideSweep = true; WindowCenter.Instance.CloseImmediately<DailyQuestWin>(); WindowCenter.Instance.Open<RuneTowerWin>(); break; System/FindPrecious/DemonJarWin.cs
@@ -297,6 +297,9 @@ return; } totalTimes = dungeonModel.GetDungeonTotalTimes(DemonJarModel.DEMONJAR_MAPID); enterTimes = dungeonModel.GetDungeonEnterTimes(DemonJarModel.DEMONJAR_MAPID); m_Times.text = StringUtility.Contact(totalTimes - enterTimes, "/", DemonJarModel.TOTALTIME_LIMIT); if ((totalTimes - enterTimes) < DemonJarModel.TOTALTIME_LIMIT) System/RuneTower/RuneTowerWin.cs
@@ -17,6 +17,7 @@ public class RuneTowerWin : Window { public static bool guideChallenge = false; public static bool guideSweep = false; [SerializeField] RuneTowerBehaviour m_Tower; [SerializeField] Transform m_ContainerBossInfo; @@ -98,6 +99,7 @@ protected override void OnPreClose() { guideChallenge = false; guideSweep = false; WindowCenter.Instance.uiRoot.eventSystem.enabled = true; m_Tower.Dispose(); UI3DModelExhibition.Instance.StopShowNPC(); @@ -126,6 +128,7 @@ } CheckTaskGuide(); CheckSweepGuide(); CheckAchievementGuide(); } @@ -331,7 +334,6 @@ } } private void CheckTaskGuide() { if (guideChallenge) @@ -341,6 +343,15 @@ } } private void CheckSweepGuide() { if (guideSweep && m_Sweep.gameObject.activeInHierarchy) { var guideEffect = AchievementGuideEffectPool.Require(1); guideEffect.transform.SetParentEx(m_Sweep.transform, Vector3.zero, Vector3.zero, Vector3.one); } } private void CheckAchievementGuide() { if (AchievementGoto.guideAchievementId != 0) System/Welfare/MultipleExpWin.cs
@@ -15,6 +15,7 @@ public class MultipleExpWin : Window { [SerializeField] Text m_MultipleTime; [SerializeField] Text m_MultipleDate; [SerializeField] Text m_ActivityRule; [SerializeField] Image m_MultipleIcon1; [SerializeField] Image m_MultipleIcon2; @@ -64,6 +65,10 @@ { OperationMultiExp operation = operationBase as OperationMultiExp; m_MultipleTime.text = operation.ToDisplayTime(); m_MultipleDate.text = StringUtility.Contact(Language.Get("OperationDate"), operation.startDate.ToDisplay(), operation.startDate == operation.endDate ? string.Empty : "—", operation.startDate == operation.endDate ? string.Empty : operation.endDate.ToDisplay(operation.startDate.year != operation.endDate.year)); m_ActivityRule.text = Language.Get("MultipleExp_Rule_2", operation.GetMultipleCHS()); m_MultipleIcon1.SetSprite(StringUtility.Contact("MultipleExp_Icon_", operation.multiple / 10000)); m_MultipleIcon2.SetSprite(StringUtility.Contact("MultipleExp_Icon_", operation.multiple / 10000)); System/Welfare/OperationTimeHepler.cs
@@ -890,17 +890,12 @@ { var textBuilder = OperationTimeHepler.textBuilder; textBuilder.Length = 0; textBuilder.Append(startDate.ToDisplay()); if (startDate == endDate) { textBuilder.Append("，"); } else { textBuilder.Append("—"); textBuilder.Append(endDate.ToDisplay(startDate.year != endDate.year)); textBuilder.Append("，"); } //textBuilder.Append(startDate.ToDisplay()); //if (startDate != endDate) //{ // textBuilder.Append("—"); // textBuilder.Append(endDate.ToDisplay(startDate.year != endDate.year)); //} if (allDay) { textBuilder.Append(Language.Get("OpenAllDay"));
