[战斗]=====被动116 258 281 312 344修改
parent
24c77a0d7e
commit
4bd1047ccc
|
@ -2162,6 +2162,7 @@ local passivityList = {
|
||||||
-- a[float]
|
-- a[float]
|
||||||
[116] = function(role, args,id,judge)
|
[116] = function(role, args,id,judge)
|
||||||
local f1 = args[1]
|
local f1 = args[1]
|
||||||
|
|
||||||
-- 释放技能后
|
-- 释放技能后
|
||||||
local onRoleHit = function(target,damage,bCrit,finalDmg,damageType,skill)
|
local onRoleHit = function(target,damage,bCrit,finalDmg,damageType,skill)
|
||||||
if target:IsDead() and not BattleUtil.CheckIsNoDead(target) then
|
if target:IsDead() and not BattleUtil.CheckIsNoDead(target) then
|
||||||
|
@ -5662,9 +5663,15 @@ local passivityList = {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1])))
|
local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1])))
|
||||||
if func then
|
if f1==12 or f1==13 then
|
||||||
func(val)
|
BattleUtil.FinalDamage(nil,role,defRole,-val)
|
||||||
|
else
|
||||||
|
if func then
|
||||||
|
func(val)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role)
|
role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role)
|
||||||
|
@ -6307,7 +6314,7 @@ local passivityList = {
|
||||||
if num>=0 then
|
if num>=0 then
|
||||||
--精卫转移怒气不算减怒
|
--精卫转移怒气不算减怒
|
||||||
role.Rage=role.Rage-lessRage
|
role.Rage=role.Rage-lessRage
|
||||||
BattleUtil.CalRage(role,caster,lessRage,CountTypeName.Add)
|
BattleUtil.CalRage(role,caster,lessRage,CountTypeName.Add,true)
|
||||||
-- 用于记录统计
|
-- 用于记录统计
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.RecordTransRage, role, caster, lessRage)
|
BattleLogic.Event:DispatchEvent(BattleEventName.RecordTransRage, role, caster, lessRage)
|
||||||
end
|
end
|
||||||
|
@ -7172,7 +7179,11 @@ local passivityList = {
|
||||||
[312] = function(role, args)
|
[312] = function(role, args)
|
||||||
local n1 = args[1]
|
local n1 = args[1]
|
||||||
local curRoundAddValue = 0--当前回合加的所有怒气点数
|
local curRoundAddValue = 0--当前回合加的所有怒气点数
|
||||||
local onRecordRageChange = function(caster, target, deltaRage,countType,value)
|
local onRecordRageChange = function(caster, target, deltaRage,countType,value,lastRage,isBorrow)
|
||||||
|
--如果是精卫借的怒气 2021/10/09 wangzhenxing
|
||||||
|
if isBorrow then
|
||||||
|
return
|
||||||
|
end
|
||||||
-- LogYellow("312 1")
|
-- LogYellow("312 1")
|
||||||
if countType == CountTypeName.Add then
|
if countType == CountTypeName.Add then
|
||||||
-- LogYellow("312 2")
|
-- LogYellow("312 2")
|
||||||
|
@ -8132,7 +8143,7 @@ local passivityList = {
|
||||||
--添加技能额外伤害
|
--添加技能额外伤害
|
||||||
if curSkill then
|
if curSkill then
|
||||||
local finalDamage=floor(role.superSkillDamage*p1)
|
local finalDamage=floor(role.superSkillDamage*p1)
|
||||||
BattleUtil.FinalDamage(nil,role,buff.target,finalDamage)
|
BattleUtil.FinalDamage(curSkill,role,buff.target,finalDamage)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--添加buff失败
|
--添加buff失败
|
||||||
|
|
|
@ -644,7 +644,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
-- 怒气计算
|
-- 怒气计算
|
||||||
function BattleUtil.CalRage(caster, target, value, countType)
|
function BattleUtil.CalRage(caster, target, value, countType,isBorrow)
|
||||||
|
|
||||||
-- 角色身上有无敌盾,不扣除怒气 by:wangzhenxing 2020/08/10 14:56
|
-- 角色身上有无敌盾,不扣除怒气 by:wangzhenxing 2020/08/10 14:56
|
||||||
if (countType==3 or countType==4) -- 降怒
|
if (countType==3 or countType==4) -- 降怒
|
||||||
|
@ -668,7 +668,7 @@ function BattleUtil.CalRage(caster, target, value, countType)
|
||||||
target.AllSubRage=target.AllSubRage-deltaRage
|
target.AllSubRage=target.AllSubRage-deltaRage
|
||||||
end
|
end
|
||||||
|
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.RecordRageChange, caster, target, deltaRage,countType,value,lastRage)
|
BattleLogic.Event:DispatchEvent(BattleEventName.RecordRageChange, caster, target, deltaRage,countType,value,lastRage,isBorrow)
|
||||||
-- 用于记录统计
|
-- 用于记录统计
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.RecordRage, caster, target, deltaRage)
|
BattleLogic.Event:DispatchEvent(BattleEventName.RecordRage, caster, target, deltaRage)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue