diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 5a779e56..8b7375cf 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -635,11 +635,9 @@ function BattleController:fillBoard() self:onFillBoardOver() self.battleUI:enableUITouch() - ---- 临时 - -- local list = {BattleConst.GRID_TYPE.SNOW_BOX, BattleConst.GRID_TYPE.SOLID_SNOW, BattleConst.GRID_TYPE.VINES, BattleConst.GRID_TYPE.ICE} - -- local gridType = list[math.random(1, 4)] - -- self:generateGridType(gridType) - -- ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList()) + if self.battleData:useAddlvCount() then + ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList()) + end end) end @@ -1097,6 +1095,10 @@ end function BattleController:onSelectSkill(skillId) self.battleData:addSkillCount(skillId) BATTLE_ROGUE_SKILL_HANDLE.takeEffect(skillId, self.battleData, self) + + if self.battleData:useAddlvCount() then + ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList()) + end end function BattleController:changeElementType(count, elementType) @@ -1220,10 +1222,12 @@ local function _addCurRoundAttr(self, instruction, callback) end local function _assisting(self, instruction, callback) + self:addBattleExp(instruction.count) callback() end local function _generalAttack(self, instruction, callback) + self:addBattleExp(instruction.count) -- 先直接加 self.atkTeam:useNormalSkill(instruction.skillMatch, instruction.count, callback) end diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 9fcdefb9..fad43cc4 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -16,6 +16,7 @@ end function BattleUI:onLoadRootComplete() self:_display() self:_addListeners() + self:_bind() end function BattleUI:_display() diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 30735319..0980e16f 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -340,6 +340,7 @@ function BattleData:useAddlvCount() return false end self.addLvCount = self.addLvCount - 1 + return true end function BattleData:initTeam(side)