From 4b6578e957f77a969b3c57051d8e4b3cd7d13db3 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 23 Nov 2020 15:08:22 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=20=2091=20=20112=20115=20?= =?UTF-8?q?=20196=20=20256=20=E8=A2=AB=E5=8A=A8=E6=B7=BB=E5=8A=A0=E7=89=B9?= =?UTF-8?q?=E6=80=A7=E5=B1=8F=E8=94=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 7ad85a07c3..8aba1c6739 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -50,7 +50,6 @@ local passivityList = { local pro1 = args[2] local f2 = args[3] local pro2 = args[4] - local OnSkillCast = function(skill) BattleUtil.RandomAction(f1, function () local duration = 0 @@ -1532,12 +1531,12 @@ local passivityList = { -- 技能伤害增加[a]%,[b]改变 -- a[float]b[改变类型] - [91] = function(role, args) + [91] = function(role, args,id,judge) local f1 = args[1] local ct = args[2] local passivityDamaging = function(func, caster, damage,skill, dotType, bCrit) --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 then + if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end if func and skill and (skill.type == BattleSkillType.Special or skill.type == BattleSkillType.Extra) then @@ -1956,7 +1955,7 @@ local passivityList = { -- 战斗第[a]回合造成伤害必定暴击 -- a[int] - [112] = function(role, args) + [112] = function(role, args,id,judge) local i1 = args[1] local function onRoleDamageAfter(target) target.isFlagCrit = false @@ -1964,7 +1963,7 @@ local passivityList = { end local function onRoleDamageBefore(target, factorFunc, damageType, skill) --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 then + if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end if BattleLogic.GetCurRound() == i1 then @@ -2013,7 +2012,7 @@ local passivityList = { -- 战斗第[a]回合增加[c]%的自身伤害持续[e]回合,[f]改变 -- a[int]c[float]e[int]f[改变] - [115] = function(role, args) + [115] = function(role, args,id,judge) local i1 = args[1] local f1 = args[2] local i2 = args[3] or 1 @@ -2022,7 +2021,7 @@ local passivityList = { -- 如果是技能的伤害则判断加成 local onPassiveDamaging = function(func, target, damage, skill) --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 then + if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end if skill and skill.type==BattleSkillType.Special then @@ -2749,7 +2748,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd) end, - -- 受到攻击有[a]%概率使攻击者[b](每回合造成被击者自身20%攻击力的伤害)持续[c]回合 + -- 受到攻击有[a]%概率使攻击者[b](每回合造成被击者自身20%攻击力的伤害)持续[c]回合 -- a[float]b[持续伤害状态]c[int] [147] = function(role, args) local f1 = args[1] @@ -2765,8 +2764,6 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleBeHit, onRoleBeHit) end, - - -- 直接伤害击杀[a]目标回复[b]%的最大生命 -- a[持续伤害状态]b[float] [148] = function(role, args) @@ -3831,11 +3828,10 @@ local passivityList = { -- 对敌方造成伤害如被分摊其分摊比降低[a]% -- a[float] - [196] = function(role, args) + [196] = function(role, args,id,judge) local f1 = args[1] local type = args[2] - local onDamageBeShare = function(func,skill) - --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing + local onDamageBeShare = function(func,skill) --普攻不会被降低分摊 2020/11/17 wangzhenxing lihaiyang if type==1 and skill and skill.type~=BattleSkillType.Normal then return @@ -3843,8 +3839,8 @@ local passivityList = { if type==2 and skill and skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra then return end - - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 then + --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing + if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end if func then func(f1, CountTypeName.Sub) end @@ -4053,9 +4049,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.PassiveDamaging, passivityDamaging) end, - - - --技能治疗系数[a]改变[b]%(作用于主动技能效果103) + --技能治疗系数[a]改变[b]%(作用于主动技能效果103) --a[改变类型]b[float] [206] = function(role, args) local ct = args[1] @@ -4073,7 +4067,6 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillEffectBefore, onSkillEffectBefore) end, - -- 释放技能有[a]%几率对敌方后排造成[b]%[c]伤害 -- a[float]b[float]c[伤害类型] [207] = function(role, args) @@ -5125,7 +5118,7 @@ local passivityList = { return end --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing - if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 then + if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end if target:IsDead() and not BattleUtil.CheckIsNoDead(target) and not role:IsDead() then @@ -5714,5 +5707,6 @@ local passivityList = { role.isImmuneReduceRage=true LogError("角色免疫减怒") end, + } return passivityList \ No newline at end of file