选择技能时机调整

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

@@ -371,7 +371,12 @@ function BattleController:enterRoundEnd()
     end
     self.atkTeam:onRoundEnd()
     self.defTeam:onRoundEnd()
-    self:enterRoundBegin()
+
+    if self.battleData:useAddlvCount() then
+        ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList())
+    else
+        self:enterRoundBegin()
+    end
 end
 
 ---- end回合步骤
@@ -648,10 +653,6 @@ function BattleController:fillBoard()
     self.battleUI:fallGrid(pathMap, function()
         self:onFillBoardOver()
         self.battleUI:enableUITouch()
-
-        if self.battleData:useAddlvCount() then
-            ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList())
-        end
     end)
 end
 
@@ -1158,7 +1159,10 @@ function BattleController:onSelectSkill(skillId)
 
     if self.battleData:useAddlvCount() then
         ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList())
+    else
+        self:enterRoundBegin()
     end
+
     if self.battleUI then
         self.battleUI:refreshBoard()
     end