Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
aa90cae885
|
@ -10821,7 +10821,7 @@ local passivityList = {
|
||||||
if skill and not skill.isTriggerJudge and judge==1 then
|
if skill and not skill.isTriggerJudge and judge==1 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if target.Rage>0 and not BattleLogic.BuffMgr:HasBuff(target, BuffName.Shield, function (buff) return buff.shieldType == ShieldTypeName.AllReduce end) then
|
if target.Rage>0 and not target.isImmuneReduceRage and not BattleLogic.BuffMgr:HasBuff(target, BuffName.Shield, function (buff) return buff.shieldType == ShieldTypeName.AllReduce end) then
|
||||||
BattleUtil.RandomAction(p1,function()
|
BattleUtil.RandomAction(p1,function()
|
||||||
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function ()
|
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function ()
|
||||||
BattleUtil.CalRage(role,target,num,CountTypeName.Sub)
|
BattleUtil.CalRage(role,target,num,CountTypeName.Sub)
|
||||||
|
|
Loading…
Reference in New Issue