Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-09-27 17:35:48 +08:00
commit a2cd31dbd2
3 changed files with 16 additions and 2 deletions

View File

@ -205,7 +205,16 @@ function EffectCaster:GetDirectTargetsNoExile()
return list
end
-- 获取直接目标和没有被放逐的目标,不包含不灭可能为空
function EffectCaster:GetDirectTargetsNoNODead()
local list = {}
for _, role in ipairs(self.effectTargets[1]) do
if not BattleLogic.BuffMgr:HasBuff(role,BuffName.NoDead) then
table.insert(list, role)
end
end
return list
end
-- 获取技能目标最大人数
function EffectCaster:GetMaxTargetNum()

View File

@ -2720,7 +2720,7 @@ local passivityList = {
return
end
if skill.type == BattleSkillType.Special then
local list = skill:GetDirectTargets()
local list = skill:GetDirectTargetsNoNoDead()
if list then
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1))
for _, r in ipairs(list) do

View File

@ -125,6 +125,11 @@ end
function Skill:GetDirectTargetsNoExile()
return self.effectCaster:GetDirectTargetsNoExile()
end
-- 获取直接目标,不包含触发不灭的目标,可能为空
function Skill:GetDirectTargetsNoNoDead()
return self.effectCaster:GetDirectTargetsNoNODead()
end
-- 获取技能目标最大人数
function Skill:GetMaxTargetNum()
return self.effectCaster:GetMaxTargetNum()