diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 42817a6e..a1584d11 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -1272,11 +1272,8 @@ function BattleUnitComp:getEffectAndPlay(skill, fxInfo) end effectObj:setLocalScale(fxScale, fxScale, fxScale) end - -- if fxInfo.is_floor then - -- effectObj:setSortingOrder(0, 0) - -- else - -- effectObj:changeSortingOrderToFudge(BattleConst.BATTLE_BASE_ORDER, BattleConst.FX_SORTING_FUDGE_COEFFICIENT) - -- end + local baseOrder = BattleHelper:getBaseOrder() + effectObj:setSortingOrder(baseOrder, 10) effectObj:play() local sid sid = BattleHelper:performDurationDelay(effectObj:getDuration(), function() diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 12c9bab7..3d7bf4c6 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -256,6 +256,7 @@ function BattleController:prepareFight() self:initAtkUnits(onPreloadFinished) self:initDefUnits(onPreloadFinished) end) + BattleHelper:setBaseOrder(self.battleUI:getUIOrder()) self:loadOtherRes(onPreloadFinished) end diff --git a/lua/app/module/battle/helper/battle_helper.lua b/lua/app/module/battle/helper/battle_helper.lua index 125f11a2..4d6655c2 100644 --- a/lua/app/module/battle/helper/battle_helper.lua +++ b/lua/app/module/battle/helper/battle_helper.lua @@ -17,6 +17,15 @@ function BattleHelper:init() self.effectPools = BattlePool:getEffectPool() self.effectMap = {} self.seed = tonumber(tostring(os.time()):reverse():sub(1,6)) + self.baseOrder = 0 +end + +function BattleHelper:setBaseOrder(baseOrder) + self.baseOrder = baseOrder +end + +function BattleHelper:getBaseOrder() + return self.baseOrder end function BattleHelper:getFxConfig()