diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 0f1447f36b..f35ba525e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5187,6 +5187,9 @@ local passivityList = { if skill and skill.type== BattleSkillType.Extra and skill.owner.roleId==10015 and judge==1 then return end + if skill and skill.type== BattleSkillType.ChaosNormal and judge==1 then + return + end if target:IsDead() and not BattleUtil.CheckIsNoDead(target) and not role:IsDead() then -- local target = RoleManager.GetAliveAggro(role) --BattleUtil.CalDamage(nil, role, target, 1, f1) @@ -5881,6 +5884,33 @@ local passivityList = { end role.Event:AddEvent(BattleEventName.RoleBeHit,onRoleBeHit) end, + -- 直接伤害击杀目标释放对[a][b]%[c]技能伤害 神女庇佑魂印效果 播放佩戴者的技能动作和特效 + -- a[int 目标选择系数] b[flaot] c[int 伤害类型] + [292] = function(role, args,id,judge) + local targets = args[1] + local f1 = args[2] + local f2=args[3] + local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill) + --如果是技能并且这个被动已经被触发过 return + if skill and BattleUtil.ChecklistIsContainValue(skill.triggerPassivityId,id) then + return + end + --处理伏虎觉醒十星附加的额外技能,额外技能不触发这个特性 2020/11/17 wangzhenxing + 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 + --role:InsertExtraSkill(f1,f2) + local effectData={role.superSkill[1],role.superSkill[2],role.superSkill[3],role.superSkill[4],{targets,{1,f1,f2}}} + SkillManager.InsertSkill(role, effectData,BattleSkillType.Extra, nil, true, false) + if skill then + table.insert(skill.triggerPassivityId,id) + end + end + end + role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit) + end, --技能追加的普攻额外造成目标[a][b]%的伤害。技能每成功[c]1个目标,额外造成[d]%生命上限的伤害 --a[int 属性id] b[float] c[控制状态] d[flaot]