diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index e0ad0760..e7b7ad0c 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -223,6 +223,7 @@ function BattleBaseController:onDefDead(callback) local monsterId = self.defTeam:getMainUnit().unitEntity:getDeathSummon() if monsterId > 0 then self:generateMonsterById(monsterId, function() + self.curWaveMonsterDead = false if callback then callback() end diff --git a/lua/app/module/battle/controller/battle_controller_pvp.lua b/lua/app/module/battle/controller/battle_controller_pvp.lua index 47ca8355..fc869273 100644 --- a/lua/app/module/battle/controller/battle_controller_pvp.lua +++ b/lua/app/module/battle/controller/battle_controller_pvp.lua @@ -306,7 +306,6 @@ function BattleControllerPVP:enterRoundBegin(...) self.needWaitingBoardOver = nil self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1 self.battleUI:enterShowBoardAni(function() - self:takeGridEffect() self:enterEliminationBegin() end, isFirstWaveFirstRound) self.battleTeamActionList = table.clearOrCreate(self.battleTeamActionList) diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua index 9114a954..af1dda09 100644 --- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua @@ -153,9 +153,17 @@ function ArenaGradingRewardCell:refresh(id) for idx, reward in ipairs(self.rewards) do if cfg.reward[idx] then + reward:addClickListener(nil) reward:setVisible(true) reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived) reward:showLight(canGet and not isReceived, self.uiRoot) + if canGet and not isReceived then + reward:addClickListener(function() + if DataManager.ArenaData:canGetGradingReward(self.id) and not DataManager.ArenaData:isReceivedGradingReward(self.id) then + ModuleManager.ArenaManager:reqGradingReward(self.id) + end + end) + end else reward:setVisible(false) end