diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index b5dafeaf6b..a6de116ae3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -653,7 +653,12 @@ end -- 执行关卡战斗 function this.ExcuteBattle() if not FightPointPassManager.IsChapterClossState() then - fightMap.StopAction() + --fightMap.StopAction() + if hasMap then + LogGreen("关闭挂机") + fightMap:OnClose() + hasMap = false + end UIManager.OpenPanel(UIName.FightMiddleChoosePanel, FightPointPassManager.curOpenFight, true,function () --- 临时代码 --FightPointPassManager.SetChapterOpenState(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua index f38a5b348d..4212740d34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua @@ -66,6 +66,7 @@ local m_parent this.isClose = false --root FightPointPassMainPanel.gameObject FightPointPassMainPanel脚本 function this:InitComponent(root, parent) + LogGreen("初始化地图资源") m_orginLayer = 0 m_parent = parent -- 地图点击拖动 @@ -461,6 +462,7 @@ end --- ====================================================================== function this.OnGameOver() + LogGreen("OnGameOver") for i, v in pairs(this.playerViews) do if v then SubUIManager.Close(v) @@ -474,7 +476,7 @@ function this.OnGameOver() end end if this.mapRoot then -- 避免不是主动退出 - --Log("注销一次地图资源") + LogGreen("注销一次地图资源") poolManager:UnLoadAsset(mapCtrl, this.mapRoot, PoolManager.AssetType.GameObject) poolManager:UnLoadAsset(effectPath, this.moneyEffect, PoolManager.AssetType.GameObject) UIManager.camera.clearFlags = CameraClearFlags.Skybox @@ -487,6 +489,7 @@ function this.OnGameOver() end function this:OnClose() + LogGreen("关闭挂机:OnClose") if this.startTimer then this.startTimer:Stop() end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua index ca743255ba..99f7f815c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/UnlockCheckpointPopup.lua @@ -33,10 +33,13 @@ function UnlockCheckpointPopup:BindEvent() end) Util.AddClick(this.btnGo, function() self:ClosePanel() - --JumpManager.GoJump(26078) - UIManager.OpenPanel(UIName.FightPointPassMainPanel, function() - -- 章节解锁时添加对话 - StoryManager.EventTrigger(curChapterId) + if UIManager.IsOpen(UIName.FightPointPassMainPanel) then + UIManager.ClosePanel(UIName.FightPointPassMainPanel) + end + -- 章节解锁时添加对话 + StoryManager.EventTrigger(curChapterId, function() + LogGreen("打开挂机界面") + UIManager.OpenPanel(UIName.FightPointPassMainPanel) end) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua index fb5045aaab..98820b96bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua @@ -74,7 +74,7 @@ function StoryDialoguePanel:GoNext(optionID) end -- 点击下一步关闭配音音效关闭 SoundManager.StopSoundByChannel(10) - StoryManager.StoryJumpType(optionID, self) + StoryManager.StoryJumpType(optionID, self,static_callBack) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index 1dea2b7346..6a2f07e32c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -97,7 +97,7 @@ function this.DialogueTrigger(eventId, callback) end -- 剧情跳转 -function this.StoryJumpType(optionId, panel) +function this.StoryJumpType(optionId, panel,callBack) local jumpType = chapterOptionData[optionId].JumpType if jumpType then if jumpType == 4 then -- 关闭所有界面,结束对话 @@ -125,10 +125,10 @@ function this.StoryJumpType(optionId, panel) local nextEventId = chapterOptionData[optionId].JumpTypeValues local nextEventShowType = chapterDataConfig[nextEventId].ShowType if nextEventShowType ~= 13 then - this.EventTrigger(nextEventId, false) + this.EventTrigger(nextEventId, callBack) else - this.DialogueTrigger(nextEventId) + this.DialogueTrigger(nextEventId,callBack) end end end