From b5dda1e81c24bdba6b412ba4d75f871911070df5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 5 Jun 2021 11:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=A7=E6=83=85=E8=B7=B3=E8=BF=87=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua index b24f3917a7..8b12869620 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryMapPanel.lua @@ -224,7 +224,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 @@ -398,6 +398,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 --保持某方向移动 @@ -474,6 +477,8 @@ function this:EnterFight() maxRound = 20, } UIManager.OpenPanel(UIName.BattlePanel, testFightData, BATTLE_TYPE.Test,function() + LogGreen("战斗结束进入下一步") + PopupTipPanel.ShowTip("战斗结束进入下一步") this:StackPop() end,nil,true) end