diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index 1e4c4d478e..e6beb833a6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -226,7 +226,7 @@ function this:CheckTrigger(data,go) this:RunMap(data.eventType) elseif data.eventType == 3 then this.eventIndex = 0 - --PopupTipPanel.ShowTip("进入一场假战斗") + PopupTipPanel.ShowTip("进入一场假战斗") this:EnterFight() elseif data.eventType == 4 then --符咒闪烁了一下 this.eventIndex = 0 @@ -400,6 +400,9 @@ function this:CheckTrigger(data,go) this.btnSkipBtnComp.enabled = false Timer.New(function() this.btnSkipBtnComp.enabled = true + if UIManager.IsOpen(UIName.BattlePanel) then + return + end this:StackPop() end,data.groups[1],1,false):Start() elseif data.eventType == 10 then --保持某方向移动 @@ -476,6 +479,8 @@ function this:EnterFight() maxRound = 20, } UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function() + LogGreen("战斗结束进入下一步") + PopupTipPanel.ShowTip("战斗结束进入下一步") this:StackPop() end,nil,true) end