diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index 61dace56..e4a4a498 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -41,7 +41,6 @@ BattleConst.ANIMATOR_HASH_NAME_NUMBER_BUFF = 1364146828 BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_1 = 123402348 BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_2 = -1638684202 BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_3 = -380331712 -BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_4 = 1999637731 BattleConst.UNLOCK_SKILL_ROGUE_TYPE = 6 BattleConst.RECOVER_HP_COUNT = 3 BattleConst.RECOVER_HP_INTERVAL = 0.2 diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 91191dc6..4d6d2512 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -435,7 +435,7 @@ function BattleUI:showCombo(count) end self.comboNodeVisible = true self.comboNode:setVisible(true) - if count == 1 then + if count <= 5 then if self.comboFxVisible1 then self.comboFxVisible1 = false self.comboFx1:setActive(false) @@ -453,24 +453,6 @@ function BattleUI:showCombo(count) self.comboTx1:setAnchoredPositionX(0) self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2) self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_1, -1, 0) - elseif count <= 5 then - if self.comboFxVisible1 then - self.comboFxVisible1 = false - self.comboFx1:setActive(false) - end - if self.comboFxVisible2 then - self.comboFxVisible2 = false - self.comboFx2:setActive(false) - end - if self.comboFxVisible3 then - self.comboFxVisible3 = false - self.comboFx3:setActive(false) - end - self.comboBg1:setVisible(false) - self.comboTx1:setText(GConst.INT_TO_STRING[count], self.comboTxComp1) - self.comboTx1:setAnchoredPositionX(0) - self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2) - self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_2, -1, 0) elseif count <= 10 then if self.comboFxVisible1 then self.comboFxVisible1 = false @@ -492,7 +474,7 @@ function BattleUI:showCombo(count) self.comboTx1:setAnchoredPositionX(0) end self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2) - self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_3, -1, 0) + self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_2, -1, 0) else if not self.comboFxVisible1 then self.comboFxVisible1 = true @@ -509,7 +491,7 @@ function BattleUI:showCombo(count) self.comboBg1:setVisible(true) self.comboTx1:setText(GConst.EMPTY_STRING, self.comboTxComp1) self.comboTx2:setText(GConst.INT_TO_STRING[count], self.comboTxComp2) - self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_4, -1, 0) + self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_3, -1, 0) end end