Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
29e279755e
|
@ -3224,6 +3224,7 @@ local passivityList = {
|
||||||
counter = counter + 1
|
counter = counter + 1
|
||||||
if counter <= i1 then
|
if counter <= i1 then
|
||||||
deadRole:SetRelive(f1,role)
|
deadRole:SetRelive(f1,role)
|
||||||
|
f1 = args[2]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
@ -4336,7 +4337,7 @@ local passivityList = {
|
||||||
damagingFunc(shareDamage)
|
damagingFunc(shareDamage)
|
||||||
end
|
end
|
||||||
-- 分担伤害
|
-- 分担伤害
|
||||||
BattleUtil.ApplyDamage(skill, atkRole, role, shareDamage,false,3,dotType,true)
|
BattleUtil.ApplyDamageNoPassive(skill, atkRole, role, shareDamage,false,3,dotType,true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.FinalDamage, onFinalDamage,nil,nil,role)
|
BattleLogic.Event:AddEvent(BattleEventName.FinalDamage, onFinalDamage,nil,nil,role)
|
||||||
|
@ -8647,7 +8648,7 @@ local passivityList = {
|
||||||
if skill.owner.job==job then
|
if skill.owner.job==job then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if skill.type == BattleSkillType.Special then
|
if (skill.type == BattleSkillType.Special or skill.type == BattleSkillType.Extra ) and not skill.isAdd then
|
||||||
BattleUtil.RandomAction(v1, function ()
|
BattleUtil.RandomAction(v1, function ()
|
||||||
role:AddSkill(BattleSkillType.Normal, false, true, nil)
|
role:AddSkill(BattleSkillType.Normal, false, true, nil)
|
||||||
time=time+1
|
time=time+1
|
||||||
|
|
Loading…
Reference in New Issue