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

combo

Browse Source
This commit is contained in:
chenxi 2023-04-27 19:14:25 +08:00
parent 549e285299
commit 212dfb79bd
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_1 = 123402348
BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_2 = -1638684202 BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_2 = -1638684202
BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_3 = -380331712 BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_3 = -380331712
BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_4 = 1999637731
BattleConst.UNLOCK_SKILL_ROGUE_TYPE = 6 BattleConst.UNLOCK_SKILL_ROGUE_TYPE = 6
BattleConst.RECOVER_HP_COUNT = 3 BattleConst.RECOVER_HP_COUNT = 3
BattleConst.RECOVER_HP_INTERVAL = 0.2 BattleConst.RECOVER_HP_INTERVAL = 0.2

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

@ -435,7 +435,7 @@ function BattleUI:showCombo(count)
end end
self.comboNodeVisible = true self.comboNodeVisible = true
self.comboNode:setVisible(true) self.comboNode:setVisible(true)
if count == 1 then if count <= 5 then
if self.comboFxVisible1 then if self.comboFxVisible1 then
self.comboFxVisible1 = false self.comboFxVisible1 = false
self.comboFx1:setActive(false) self.comboFx1:setActive(false)
@ -453,24 +453,6 @@ function BattleUI:showCombo(count)
self.comboTx1:setAnchoredPositionX(0) self.comboTx1:setAnchoredPositionX(0)
self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2) self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2)
self.comboAnimator:Play(GConst.BattleConst.ANIMATOR_HASH_NAME_BATTLE_COMBO_1, -1, 0) 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 elseif count <= 10 then
if self.comboFxVisible1 then if self.comboFxVisible1 then
self.comboFxVisible1 = false self.comboFxVisible1 = false
@ -492,7 +474,7 @@ function BattleUI:showCombo(count)
self.comboTx1:setAnchoredPositionX(0) self.comboTx1:setAnchoredPositionX(0)
end end
self.comboTx2:setText(GConst.EMPTY_STRING, self.comboTxComp2) 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 else
if not self.comboFxVisible1 then if not self.comboFxVisible1 then
self.comboFxVisible1 = true self.comboFxVisible1 = true
@ -509,7 +491,7 @@ function BattleUI:showCombo(count)
self.comboBg1:setVisible(true) self.comboBg1:setVisible(true)
self.comboTx1:setText(GConst.EMPTY_STRING, self.comboTxComp1) self.comboTx1:setText(GConst.EMPTY_STRING, self.comboTxComp1)
self.comboTx2:setText(GConst.INT_TO_STRING[count], self.comboTxComp2) 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
end end