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

Merge branch 'master' into dev_20230919

Browse Source
This commit is contained in:
xiekaidong 2023-08-30 09:19:14 +08:00
commit 31f7d0c762
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/module/battle/controller/battle_base_controller.lua
View File

@ -223,6 +223,7 @@ function BattleBaseController:onDefDead(callback)
local monsterId = self.defTeam:getMainUnit().unitEntity:getDeathSummon() local monsterId = self.defTeam:getMainUnit().unitEntity:getDeathSummon()
if monsterId > 0 then if monsterId > 0 then
self:generateMonsterById(monsterId, function() self:generateMonsterById(monsterId, function()
self.curWaveMonsterDead = false
if callback then if callback then
callback() callback()
end end

1
lua/app/module/battle/controller/battle_controller_pvp.lua
View File

@ -306,7 +306,6 @@ function BattleControllerPVP:enterRoundBegin(...)
self.needWaitingBoardOver = nil self.needWaitingBoardOver = nil
self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1 self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1
self.battleUI:enterShowBoardAni(function() self.battleUI:enterShowBoardAni(function()
self:takeGridEffect()
self:enterEliminationBegin() self:enterEliminationBegin()
end, isFirstWaveFirstRound) end, isFirstWaveFirstRound)
self.battleTeamActionList = table.clearOrCreate(self.battleTeamActionList) self.battleTeamActionList = table.clearOrCreate(self.battleTeamActionList)

8
lua/app/ui/arena/cell/arena_grading_reward_cell.lua
View File

@ -153,9 +153,17 @@ function ArenaGradingRewardCell:refresh(id)
for idx, reward in ipairs(self.rewards) do for idx, reward in ipairs(self.rewards) do
if cfg.reward[idx] then if cfg.reward[idx] then
reward:addClickListener(nil)
reward:setVisible(true) reward:setVisible(true)
reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived) reward:refreshByConfig(cfg.reward[idx], isReceived, isReceived)
reward:showLight(canGet and not isReceived, self.uiRoot) 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 else
reward:setVisible(false) reward:setVisible(false)
end end