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

lua/app/module/battle/controller/battle_controller.lua

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