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

dev_chengFeng
gaoxin 2021-08-31 14:29:46 +08:00
commit 4e8e552ca8
1 changed files with 21 additions and 0 deletions

View File

@ -2052,6 +2052,9 @@ local passivityList = {
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
end
local function onRoleDamageBefore(target, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -2914,6 +2917,9 @@ local passivityList = {
local index, tran
local OnRoleDamageBefore = function(target, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -2923,6 +2929,9 @@ local passivityList = {
end
end
local OnRoleDamageAfter = function(defRole,damageFunc,fixDamage,skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -5751,6 +5760,9 @@ local passivityList = {
local round=args[1]
local pro=args[2]
local onRoleDamageBefore=function(defRole, factorFunc, damageType, skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end
@ -5922,6 +5934,9 @@ local passivityList = {
local curBuff=nil
local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill)
if not skill then
return
end
if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then
--curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune)
-- role:AddBuff(curBuff)
@ -6065,6 +6080,9 @@ local passivityList = {
local curBuff=nil
local immuneState=false
local onRoleDamageBefore=function(atkRole, factorFunc, damageType, skill)
if not skill then
return
end
if atkRole.camp~= role.camp and BattleLogic.BuffMgr:HasBuff(skill.owner, BuffName.DOT, function (buff) return buff.damageType == sta1 end,role,sta1) then
--curBuff=Buff.Create(role, BuffName.Immune, 1,4,immune)
-- role:AddBuff(curBuff)
@ -7839,6 +7857,9 @@ local passivityList = {
end
end
local function onRoleDamageBefore(skill)
if not skill then
return
end
if skill and not skill.isTriggerJudge and judge==1 then
return
end