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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	lua/app/module/battle/controller/battle_controller.lua
This commit is contained in:
xiekaidong 2023-07-07 17:17:01 +08:00
commit da664585a0
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1004,6 +1004,9 @@ function BattleUnitComp:updateSkillAttack(dt)
self:doNextNormalAttack() self:doNextNormalAttack()
end end
else else
if self.currAttackDuration <= 0 and self.currActiveSkill then -- 当前动画异常 没有进入onSkillTakeEffect，不会攻击次数减一，所以手动调用一次
self.currActiveSkill:endUse()
end
local currActiveSkill = nil local currActiveSkill = nil
local skillCanUseTimes = self.currActiveSkill:getSkillCanUseTimes() local skillCanUseTimes = self.currActiveSkill:getSkillCanUseTimes()
if skillCanUseTimes and skillCanUseTimes > 0 then -- 当前技能可以多次使用 if skillCanUseTimes and skillCanUseTimes > 0 then -- 当前技能可以多次使用