puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-04-19 15:50:09 +08:00
commit e07380e7e5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/battle/controller/battle_controller.lua
View File

@ -401,7 +401,6 @@ function BattleController:enterRefreshBoard()
end end
function BattleController:enterRoundEnd() function BattleController:enterRoundEnd()
DataManager.BattleData:resetTimeSpeed()
self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_END self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_END
local defTeam = self.battleData:getDefTeam() local defTeam = self.battleData:getDefTeam()
if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑 if not defTeam or defTeam:getIsDead() then -- 怪物死了， 直接进入刷新逻辑
@ -846,6 +845,7 @@ function BattleController:exeInstructions(callback)
local func = BattleController._doInstruction[instruction.name] local func = BattleController._doInstruction[instruction.name]
if func then if func then
func(self, instruction, function() func(self, instruction, function()
DataManager.BattleData:resetTimeSpeed()
self:exeInstructions(callback) self:exeInstructions(callback)
end) end)
else else