| Fight/Stage/Dungeon/AdventureStage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonFightWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyDemonKingModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyGrassModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/HazyRegion/HazyRegionIncidentPanel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/FunctionForecastTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/FunctionForecastWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainInterfaceWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MainPositionTween.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/MapSwitchingBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Message/RichMoveEvent.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Stage/Dungeon/AdventureStage.cs
@@ -11,6 +11,8 @@ private Vector3 m_CacheHeroPos; private GA_NpcClientFunc m_Npc; private bool dungeonFightWinOpenRecord = false; public event Action onLoadAdventureStage; public event Action onExitAdventureStage; @@ -52,6 +54,11 @@ yield return null; WindowCenter.Instance.Close<LoadingWin>(); WindowCenter.Instance.Open<MainInterfaceWin>(); dungeonFightWinOpenRecord = WindowCenter.Instance.IsOpen<DungeonFightWin>(); if (!dungeonFightWinOpenRecord) { WindowCenter.Instance.Open<DungeonFightWin>(); } BossShowModel.Instance.bossShowCompletedEvent -= BossShowCompletedEvent; BossShowModel.Instance.bossShowCompletedEvent += BossShowCompletedEvent; @@ -94,6 +101,10 @@ yield return null; WindowCenter.Instance.Open<MainInterfaceWin>(); WindowCenter.Instance.Close<LoadingWin>(); if (!dungeonFightWinOpenRecord) { WindowCenter.Instance.Close<DungeonFightWin>(); } if (onExitAdventureStage != null) { System/Dungeon/DungeonFightWin.cs
@@ -217,6 +217,18 @@ private void ExitDungeon() { if (AdventureStage.Instance.IsInAdventureStage) { ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("HazyExitAdventureConfirm"), (bool isOk) => { if (isOk) { AdventureStage.Instance.Exit(); } }); return; } var dataMapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); var config = DungeonOpenTimeConfig.Get(dataMapId); string language = string.Empty; @@ -362,6 +374,10 @@ { if (immedidately) { m_ContainerFuncBtn.localPosition = MainPositionTween.isDefaultState ? m_ContainerFuncBottom.localPosition : m_ContainerFuncUp.localPosition; } else { if (MainPositionTween.isDefaultState) { m_Tweener = m_ContainerFuncBtn.DOLocalMoveY(m_ContainerFuncBottom.localPosition.y, 1); @@ -370,10 +386,6 @@ { m_Tweener = m_ContainerFuncBtn.DOLocalMoveY(m_ContainerFuncUp.localPosition.y, 1); } } else { m_ContainerFuncBtn.localPosition = MainPositionTween.isDefaultState ? m_ContainerFuncBottom.localPosition : m_ContainerFuncUp.localPosition; } }
@@ -96,6 +96,11 @@ private void PerSecond() { if (!(StageLoad.Instance.currentStage is DungeonStage)) { return; } if (IsInDungeon) { var requireRefreshPlayer = false; @@ -203,6 +208,11 @@ public bool IsInDemonKingDungeon(int mapId) { if (!(StageLoad.Instance.currentStage is DungeonStage)) { return false; } if (mapId == Client_MapID) { return true; System/HazyRegion/HazyGrassModel.cs
@@ -116,6 +116,11 @@ public bool IsInGrassDungeon(int mapId) { if (!(StageLoad.Instance.currentStage is DungeonStage)) { return false; } if (mapId == Client_ReikiGrassMapID || mapId == Client_FairyGrassMapID) { System/HazyRegion/HazyRegionIncidentPanel.cs
@@ -14,6 +14,7 @@ [SerializeField] Text m_Point; [SerializeField] Button m_Back; [SerializeField] Button m_Goto; [SerializeField] Text m_GotoLabel; List<int> incidents = new List<int>(); @@ -21,6 +22,7 @@ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } } DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } DateTime requestTime = DateTime.Now; int requestCount = 0; @@ -38,10 +40,14 @@ DisplayPoint(); DisplayIncidents(); DisplayBackButton(); DisplayGotoState(); requestCount = 0; model.incidentDirty = false; SendRequestPlayerCount(); DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState; DailyQuestActionTimer.Instance.RefreshDailyQuestState += RefreshDailyQuestState; } void DisplayIncidents() @@ -165,8 +171,31 @@ } } private void DisplayGotoState() { var questState = dailyQuestModel.GetQuestState((int)DailyQuestType.HazyRegion); m_Goto.SetColorful(m_GotoLabel, questState != DailyQuestModel.DailyQuestState.OutTime); } private void Goto() { var questState = dailyQuestModel.GetQuestState((int)DailyQuestType.HazyRegion); if (questState == DailyQuestModel.DailyQuestState.OutTime) { DailyQuestOpenTime dailyQuestOpenTime; if (dailyQuestModel.TryGetOpenTime((int)DailyQuestType.HazyRegion, out dailyQuestOpenTime)) { HourMinute hourMinute; if (dailyQuestOpenTime.TryGetTodayNearestOpenTime(out hourMinute)) { SysNotifyMgr.Instance.ShowTip("OpenHazyRegionError_1", hourMinute.hourBegin.ToString("D2"), hourMinute.hourEnd.ToString("D2")); } } return; } var error = 0; if (!model.TryGotoIncident(model.selectIncident, out error)) { @@ -273,9 +302,15 @@ } } private void RefreshDailyQuestState() { DisplayGotoState(); } public void Dispose() { m_CyclicScroll.Dispose(); DailyQuestActionTimer.Instance.RefreshDailyQuestState -= RefreshDailyQuestState; } #if UNITY_EDITOR System/MainInterfacePanel/FunctionForecastTip.cs
@@ -120,26 +120,7 @@ _Information.gameObject.SetActive(true); _FunctionIcon.SetSprite(FunctionForecastConfig.Get(ID).FuncIconKey); _NameText.text = FunctionForecastConfig.Get(ID).Describe; FuncOpenLVConfig funcoPenConfig = FuncOpenLVConfig.Get(ID); if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0) { if (funcoPenConfig.LimitMagicWeapon != 0) { int faBaoID = funcoPenConfig.LimitMagicWeapon / 100; TreasureConfig treasure = TreasureConfig.Get(faBaoID); _Information.text = string.Format(Language.Get("FuncFBOpen"), treasure.Name); return; } if (funcoPenConfig.LimitMissionID != 0) { _Information.text = string.Format(Language.Get("TaskFuncOpen"), funcoPenConfig.LimitLV); return; } } else { _Information.text = string.Format(Language.Get("FuncLevelOpen"), funcoPenConfig.LimitLV); } _Information.text= FunctionForecastConfig.Get(ID).OpenDescribe; }
@@ -58,25 +58,7 @@ FunctionImage.SetSprite(functionForcecastConfig.FuncIconKey); IconText.text = functionForcecastConfig.FuncName; ContentText.text = functionForcecastConfig.DetailDescribe; if (openLvConfig.LimitMagicWeapon != 0 || openLvConfig.LimitMissionID != 0) { if (openLvConfig.LimitMagicWeapon != 0) { int faBaoID = openLvConfig.LimitMagicWeapon / 100; TreasureConfig treasure = TreasureConfig.Get(faBaoID); ContentText1.text = string.Format(Language.Get("FuncFBOpen"), treasure.Name); return; } if (openLvConfig.LimitMissionID != 0) { ContentText1.text = string.Format(Language.Get("TaskFuncOpen"), openLvConfig.LimitLV); return; } } else { ContentText1.text = string.Format(Language.Get("FuncLevelOpen"), openLvConfig.LimitLV); } ContentText1.text = functionForcecastConfig.OpenDescribe; } protected override void OnPreClose() System/MainInterfacePanel/MainInterfaceWin.cs
@@ -145,7 +145,7 @@ } var isNeutralMap = GeneralDefine.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID); if (isNeutralMap) if (isNeutralMap && !AdventureStage.Instance.IsInAdventureStage) { m_BossBriefInfos.gameObject.SetActive(true); if (PlayerDatas.Instance.baseData.MapID == DogzDungeonModel.DATA_MAPID) System/MainInterfacePanel/MainPositionTween.cs
@@ -109,7 +109,8 @@ m_ContainerBossList.gameObject.SetActive(isNeutralMap); rightTopState = RightTopState.Function; if ((isDungeon || isNeutralMap || isBossArea) && !isGuiding && switchParams.showDefault) if ((isDungeon || isNeutralMap || isBossArea || AdventureStage.Instance.IsInAdventureStage) && !isGuiding && switchParams.showDefault) { rightTopState = RightTopState.Boss; } System/MainInterfacePanel/MapSwitchingBehaviour.cs
@@ -29,7 +29,7 @@ public void Init() { int MapID = PlayerDatas.Instance.baseData.MapID; if (MapIdList.Contains(MapID)) if (MapIdList.Contains(MapID) && !AdventureStage.Instance.IsInAdventureStage) { m_Btn_MapSwitch.gameObject.SetActive(true); } System/Message/RichMoveEvent.cs
@@ -45,6 +45,11 @@ case RichTextEventEnum.MOVENPC: { int id = int.Parse(href.mSplits["movenpc"]); var movetype = 2; if (href.mSplits.ContainsKey("movetype")) { movetype = int.Parse(href.mSplits["movetype"]); } var error = 0; if (!TestMoveNpc(id, out error)) { @@ -55,7 +60,7 @@ if (hero != null) { PlayerDatas.Instance.hero.Behaviour.StopHandupAI(); SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id)); SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(id, movetype)); } } break; @@ -202,7 +207,7 @@ SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(new Vector3(m_Posx / 2, 0, m_Posy / 2))); } private IEnumerator WaitForSkillFinished(int id) private IEnumerator WaitForSkillFinished(int id, int movetype) { GA_Hero _hero = PlayerDatas.Instance.hero; @@ -227,7 +232,7 @@ yield break; } MapTransferUtility.Instance.MoveToNPC(id); MapTransferUtility.Instance.MoveToNPC(id, 0, movetype == 1); } private IEnumerator WaitForSkillFinished(Vector3 pos)
