Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
69f0ebc6d0
|
|
@ -652,9 +652,14 @@ function BattleUtil.ApplyDamageNoPassive(skill, atkRole, defRole, damage, bCrit,
|
||||||
damage = BattleUtil.CalShield(atkRole, defRole, damage,skill)
|
damage = BattleUtil.CalShield(atkRole, defRole, damage,skill)
|
||||||
-- 造成的最终伤害
|
-- 造成的最终伤害
|
||||||
local damagingFunc = function(dmgDeduction)
|
local damagingFunc = function(dmgDeduction)
|
||||||
|
--不计算增伤只计算减伤
|
||||||
|
if dmgDeduction<0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
damage = damage - dmgDeduction
|
damage = damage - dmgDeduction
|
||||||
end
|
end
|
||||||
|
|
||||||
|
atkRole.Event:DispatchEvent(BattleEventName.PassiveDamaging, damagingFunc, defRole, damage, skill, dotType, bCrit,damageType, dotType,isDirect)
|
||||||
defRole.Event:DispatchEvent(BattleEventName.FinalBeDamageEnd, damagingFunc, atkRole, damage, skill, dotType, bCrit, damageType,isDirect)
|
defRole.Event:DispatchEvent(BattleEventName.FinalBeDamageEnd, damagingFunc, atkRole, damage, skill, dotType, bCrit, damageType,isDirect)
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.FinalDamage, damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType)
|
BattleLogic.Event:DispatchEvent(BattleEventName.FinalDamage, damagingFunc, atkRole, defRole, damage, skill, dotType, bCrit, damageType)
|
||||||
|
|
||||||
|
|
@ -814,8 +819,8 @@ function BattleUtil.FinalDamageCountShield(skill, atkRole, defRole, damage, bCri
|
||||||
if defRole.type == BattleUnitType.Monster or defRole.type == BattleUnitType.Player then
|
if defRole.type == BattleUnitType.Monster or defRole.type == BattleUnitType.Player then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
-- 计算护盾减伤
|
-- 计算无敌盾减伤
|
||||||
damage = BattleUtil.CalShield(atkRole, defRole, damage,skill)
|
damage = BattleUtil.CalAllReduceShield(atkRole, defRole, damage,skill)
|
||||||
|
|
||||||
if damage < 0 then damage = 0 end
|
if damage < 0 then damage = 0 end
|
||||||
if skill and skill.type==BattleSkillType.Special then
|
if skill and skill.type==BattleSkillType.Special then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue