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-08-27 20:54:01 +08:00
parent 8309062814
commit 3c7c289c79
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/app/module/battle/battle_const.lua
View File

@ -1013,8 +1013,7 @@ BattleConst.SKILL_LIGHT_POINT_SFX = "assets/prefabs/effects/battle/sfx_skill_b05
BattleConst.SKILL_LIGHT_LINE_SFX = "assets/prefabs/effects/battle/sfx_skill_b04.prefab"
BattleConst.LINE_SFX = "assets/prefabs/effects/battle/sfx_c1_ui_line_b0%s.prefab"
BattleConst.CHANGE_ELEMENT_SFX = "assets/prefabs/effects/battle/sfx_skill_b02.prefab"
BattleConst.LINK_SMOKE = "assets/prefabs/effects/battle/sfx_piece_smoke_b01.prefab"
BattleConst.LINK_SMOKE = "assets/prefabs/effects/battle/sfx_piece_smoke_b01.prefab"
BattleConst.LINK_SMOKE = "assets/prefabs/effects/battle/sfx_piece_smoke_b0%s.prefab"
BattleConst.GRID_KILL_SFX = {
[BattleConst.ELEMENT_TYPE.RED] = "assets/prefabs/effects/battle/sfx_piece_qizi_posui_b04.prefab",
[BattleConst.ELEMENT_TYPE.YELLOW] = "assets/prefabs/effects/battle/sfx_piece_qizi_posui_b05.prefab",

43
lua/app/ui/battle/battle_base_ui.lua
View File

@ -820,7 +820,8 @@ function BattleBaseUI:initUISfxs()
end
if self.root.lineSfxObjs then
for index, info in pairs(self.root.lineSfxObjs) do
for index, list in pairs(self.root.lineSfxObjs) do
for _, info in ipairs(list) do
if info.obj then
info.obj:setActive(true)
info.obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), BOARD_SFX_ORDER)
@ -828,9 +829,11 @@ function BattleBaseUI:initUISfxs()
end
end
end
end
if self.root.smokeSfxObjs then
for index, info in pairs(self.root.smokeSfxObjs) do
for index, list in pairs(self.root.smokeSfxObjs) do
for _, info in ipairs(list) do
if info.obj then
info.obj:setActive(true)
info.obj:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_EFFECT_HELPER):SetSortingOrder(self:getUIOrder(), BOARD_SFX_ORDER)
@ -838,6 +841,7 @@ function BattleBaseUI:initUISfxs()
end
end
end
end
if self.root.changeElementSfxs then
for index, info in pairs(self.root.changeElementSfxs) do
@ -882,20 +886,24 @@ function BattleBaseUI:hideAllBoardSfxs()
end
if self.root.lineSfxObjs then
for index, info in pairs(self.root.lineSfxObjs) do
for _, list in pairs(self.root.lineSfxObjs) do
for _, info in ipairs(list) do
if info.obj then
info.obj:setActive(false)
end
end
end
end
if self.root.smokeSfxObjs then
for index, info in pairs(self.root.smokeSfxObjs) do
for index, list in pairs(self.root.smokeSfxObjs) do
for _, info in ipairs(list) do
if info.obj then
info.obj:setActive(false)
end
end
end
end
end
function BattleBaseUI:hideCombo()
@ -1470,7 +1478,7 @@ function BattleBaseUI:eliminationAni(aniSequence, effectGridMap, callback, side)
end
self.eliminationAniSeq:Insert(time, baseObject:getTransform():DOScale(1.3, 0.1))
self.eliminationAniSeq:InsertCallback(time + 0.2, function()
self:getSfxSmoke(index, function(obj)
self:getSfxSmoke(entity:getElementType(), index, function(obj)
obj:setAnchoredPosition(pos.x, pos.y)
obj:play()
end)
@ -2191,7 +2199,6 @@ function BattleBaseUI:hideAllSfxLine()
info.obj:setActive(false)
end
end
end
end
@ -2337,24 +2344,24 @@ function BattleBaseUI:getSfxGridEffect(effectSfxPath, func)
end)
end
function BattleBaseUI:getSfxSmoke(index, func)
function BattleBaseUI:getSfxSmoke(elementType, index, func)
self.hidingAllSfxSmoke = false
if not self.root.smokeSfxObjs then
self.root.smokeSfxObjs = {}
end
if self.root.smokeSfxObjs[index] then
if self.root.smokeSfxObjs[index].obj and func then
local obj = self.root.smokeSfxObjs[index].obj
self.root.smokeSfxObjs = self.root.smokeSfxObjs or {}
self.root.smokeSfxObjs[elementType] = self.root.smokeSfxObjs[elementType] or {}
if self.root.smokeSfxObjs[elementType] and self.root.smokeSfxObjs[elementType][index] then
if self.root.smokeSfxObjs[elementType][index].obj and func then
local obj = self.root.smokeSfxObjs[elementType][index].obj
obj:setActive(true)
func(obj)
end
else
self.root.smokeSfxObjs[index] = {
self.root.smokeSfxObjs[elementType][index] = {
isLoaded = true
}
EffectManager:loadUIEffectAsync(GConst.BattleConst.LINK_SMOKE, self, self.gridNode, BOARD_SFX_ORDER, function(obj)
self.root.smokeSfxObjs[index].obj = obj
local str = string.format(GConst.BattleConst.LINK_SMOKE, elementType)
EffectManager:loadUIEffectAsync(str, self, self.gridNode, BOARD_SFX_ORDER, function(obj)
self.root.smokeSfxObjs[elementType][index].obj = obj
obj:setLocalScale(1.5, 1.5, 1.5)
if self.hidingAllSfxSmoke then
obj:setActive(false)
@ -2372,11 +2379,13 @@ function BattleBaseUI:hideAllSfxSmoke()
if not self.root.smokeSfxObjs then
return
end
for inde, info in pairs(self.root.smokeSfxObjs) do
for inde, list in pairs(self.root.smokeSfxObjs) do
for _, info in ipairs(list) do
if info.obj then
info.obj:setActive(false)
end
end
end
end
function BattleBaseUI:showSelectSkillComp(skillList, isCommon)