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

fix bug

Browse Source
This commit is contained in:
puxuan 2025-10-28 15:36:00 +08:00
parent e3e87eefe0
commit e1e39a020c
6 changed files with 15 additions and 13 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

@ -917,6 +917,7 @@ function BattleBaseController:battleStart()
self.atkTeam:prepare()
self.defTeam:prepare()
self.isBattleStart = true
self.battleUI:refreshSkill(nil, nil, SIDE_ATK)
self.tickSid = BattleScheduler:scheduleGlobal(function(dt, originDt)
self:_tick(dt, originDt)
end, 0)

4
lua/app/module/battle/controller/battle_controller_dungeon_gold.lua
View File

@ -31,7 +31,7 @@ function BattleControllerDungeonGold:enterRoundBegin(...)
end
end
if self.battleUI then
self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount - nextWaveRound + 1, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount - nextWaveRound + 1, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
BattleController.enterRoundBegin(self, ...)
end
@ -41,7 +41,7 @@ function BattleControllerDungeonGold:initOther()
self.dungeonGoldMaxRoundCount = self:getChapterConfig()[self.chapterId].wave_limit or 1
if self.battleUI then
self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(self.dungeonGoldMaxRoundCount, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
end

10
lua/app/module/battle/controller/battle_controller_dungeon_rune.lua
View File

@ -28,7 +28,7 @@ function BattleControllerDungeonRune:initOther()
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
self.runeMaxLv = runeData:getBattleMaxlv() or 1
@ -177,7 +177,7 @@ function BattleControllerDungeonRune:enterRoundBegin()
self.dungeonRuneRemainRoundCount = self.dungeonRuneRemainRoundCount - 1
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount + 1
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
BattleController.enterRoundBegin(self)
end, function()
@ -199,7 +199,7 @@ function BattleControllerDungeonRune:enterRoundBegin()
end
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount + 1
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
BattleController.enterRoundBegin(self)
end
@ -254,7 +254,7 @@ function BattleControllerDungeonRune:refreshWave()
return
end
-- local desc = self.dungeonRuneRemainRoundCount + 1
-- self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
-- self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
function BattleControllerDungeonRune:getRandomGridInfo()
@ -371,7 +371,7 @@ function BattleControllerDungeonRune:tryShowRebirth(callback)
self.dungeonRuneMaxRoundCount = self.dungeonRuneMaxRoundCount + self.addRoundCount
if self.battleUI then
local desc = self.dungeonRuneRemainRoundCount + 1
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.COMMON, "common_dec_15")
self.battleUI:refreshWave(desc, GConst.ATLAS_PATH.BATTLE, "battle_dec_2")
end
if callback then
callback()

2
lua/app/ui/battle/battle_skill_select_comp.lua
View File

@ -172,7 +172,7 @@ function BattleSkillSelectComp:refreshRogueSkill()
self.selectSkillCells[i]:refresh(skillId, function(value)
if i == 4 then
SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.BATTLE_SKILL_DEITY, function()
ModuleManager.BattleManager:reqSkillRefresh(nil, i)
self:onClickSkill(skillId, value, SKILL_ICON_POS[i])
end)
else
self:onClickSkill(skillId, value, SKILL_ICON_POS[i])

4
lua/app/ui/battle/battle_ui.lua
View File

@ -491,8 +491,8 @@ function BattleUI:refreshWave(wave, iconAtlas, iconName)
desc:setText(wave)
GFunc.centerImgAndTx(icon, desc, 10)
iconAtlas = iconAtlas or GConst.ATLAS_PATH.COMMON
iconName = iconName or "common_dec_3"
iconAtlas = iconAtlas or GConst.ATLAS_PATH.BATTLE
iconName = iconName or "battle_dec_1"
icon:setSprite(iconAtlas, iconName)
end

7
lua/app/ui/battle/cell/grid_cell.lua
View File

@ -172,9 +172,10 @@ function GridCell:showHighLight(show, mainElementType)
local skillEntity = self:getSkillEntity()
local ignoreElementType = skillEntity:getIgnoreElementType()
local skillBg
if show and not mainElementType then
skillBg = GConst.BattleConst.SKILL_ELEMENT_BG_2.universal
elseif ignoreElementType and not mainElementType then
-- if show and not mainElementType then
-- skillBg = GConst.BattleConst.SKILL_ELEMENT_BG_2.universal
-- else
if ignoreElementType and not mainElementType then
skillBg = GConst.BattleConst.SKILL_ELEMENT_BG_2.skill
else
mainElementType = mainElementType or skillEntity:getPosition()