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

dev_chengFeng
ZhangBiao 2021-11-04 15:45:13 +08:00
commit f3e9bed33f
1 changed files with 6 additions and 3 deletions

View File

@ -8638,13 +8638,16 @@ local passivityList = {
if skill and not skill.isTriggerJudge and judge==1 then
return
end
if skill.owner==role then
return
end
if time==num then
return
end
if role.element~=camp then
if skill.owner.element~=camp then
return
end
if role.job==job then
if skill.owner.job==job then
return
end
if skill.type == BattleSkillType.Special then
@ -8654,7 +8657,7 @@ local passivityList = {
end)
end
end
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd,nil,nil,role)
BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd,nil,nil,role)
local function onRoundChange()
time=0