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

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
CloudJ 2023-05-25 12:01:04 +08:00
commit 93d091c462
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ local HURT_STATE_CRIT = BattleConst.HURT_STATE_CRIT
local EFFECT_TYPE = BattleConst.EFFECT_TYPE local EFFECT_TYPE = BattleConst.EFFECT_TYPE
local TIME_FACTOR = BattleConst.TIME_FACTOR local TIME_FACTOR = BattleConst.TIME_FACTOR
local HURT_ANI_NAME_LIST = {SPINE_ANIMATION_NAME.HIT, SPINE_ANIMATION_NAME.HIT_2} local HURT_ANI_NAME_LIST = {SPINE_ANIMATION_NAME.HIT, SPINE_ANIMATION_NAME.HIT_2}
local HURT_ANI_NAME_LIST_COUNT = 2
function BattleUnitComp:ctor() function BattleUnitComp:ctor()
end end
@ -114,6 +113,19 @@ function BattleUnitComp:initWithEntity(modelId, entity, battleController, target
self:initPosition() self:initPosition()
self:initPassiveSkills() self:initPassiveSkills()
self:playBorn() self:playBorn()
self:initHitAniInfo()
end
function BattleUnitComp:initHitAniInfo()
self.hurtAniNameList = {}
self.hurtAniNameCount = 0
for _, name in ipairs(HURT_ANI_NAME_LIST) do
local duration = self:getAnimationDuration(name)
if duration > 0 then
table.insert(self.hurtAniNameList, name)
self.hurtAniNameCount = self.hurtAniNameCount + 1
end
end
end end
function BattleUnitComp:prepare() function BattleUnitComp:prepare()
@ -692,7 +704,10 @@ end
function BattleUnitComp:playHurt() function BattleUnitComp:playHurt()
if self.currState == UNIT_STATE.IDLE or if self.currState == UNIT_STATE.IDLE or
self.currState == UNIT_STATE.VERITGO then self.currState == UNIT_STATE.VERITGO then
local name = HURT_ANI_NAME_LIST[math.random(1, HURT_ANI_NAME_LIST_COUNT)] if self.hurtAniNameCount <= 0 then
return
end
local name = self.hurtAniNameList[math.random(1, self.hurtAniNameCount)]
self.playSubAniTime = 0 self.playSubAniTime = 0
self.curHurtName = name self.curHurtName = name
if self.playSubAniDuration[name] == nil then if self.playSubAniDuration[name] == nil then