Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
5217d75b41
|
@ -1092,14 +1092,11 @@ function BattleUtil.CalDamage(skill, atkRole, defRole, damageType, baseFactor, i
|
|||
return buff.type==BuffName.AddAttack and buff.atkType==damageType
|
||||
end)
|
||||
for key, value in pairs(list) do
|
||||
LogError("value.value=="..value.value1.." value.ct=="..value.ct.." value.atkType=="..value.atkType)
|
||||
buffAddAttack=BattleUtil.CountValue(buffAddAttack,value.value1,value.ct)
|
||||
end
|
||||
LogError("damagetype=="..damageType.." buffAddAttack=="..buffAddAttack)
|
||||
baseFactor=baseFactor+buffAddAttack
|
||||
--处理神印追加技能伤害按比例减少
|
||||
if skill.AttactScale and skill.AttactScale~=0 then
|
||||
LogError("AttactScale=="..skill.AttactScale)
|
||||
if skill and skill.AttactScale and skill.AttactScale~=0 then
|
||||
baseFactor=baseFactor*skill.AttactScale
|
||||
end
|
||||
if ignoreDef==nil then
|
||||
|
@ -1325,7 +1322,7 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
|
|||
end
|
||||
baseFactor = baseFactor or 1
|
||||
--处理神印追加的技能
|
||||
if skill.AttactScale and skill.AttactScale~=0 then
|
||||
if skill and skill.AttactScale and skill.AttactScale~=0 then
|
||||
baseFactor=baseFactor*skill.AttactScale
|
||||
end
|
||||
critDamageFactor = critDamageFactor or 1
|
||||
|
|
Loading…
Reference in New Issue