Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
ZhangBiao 2021-01-27 17:06:27 +08:00
commit 15fd0a36cd
2 changed files with 13 additions and 10 deletions

View File

@ -2378,8 +2378,7 @@ local effectList = {
if f3 and f3==0 then
return
end
local isBoss=BattleUtil.CheckIsBoss(target)
if (p1==12 or p1==13) and isBoss then
if (p1==12 or p1==13) and BattleUtil.CheckIsBoss(target) then
return
end
local damage = floor(BattleUtil.ErrorCorrection(f3 * target:GetRoleData(BattlePropList[p1])))

View File

@ -2588,12 +2588,14 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillEnd)
end,
-- 释放普攻后给目标附加治疗效果每回合回复[a]的[b]%点生命持续[c]回合
-- a[属性]b[float]c[int]
-- 释放普攻后给目标附加治疗效果每回合回复[a]的[b]%点生命持续[c]回合(额外加目标[d][e]%生命 ,d e不填不会添加)
-- a[属性]b[float]c[int] d[int] e[float]
[138] = function(role, args)
local pro = args[1]
local f1 = args[2]
local i1 = args[3]
local pro2 = args[4]
local f2 = args[5]
-- 技能后后
local onSkillEnd = function(skill)
if skill.type == BattleSkillType.Normal then
@ -2601,6 +2603,9 @@ local passivityList = {
if list then
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[pro]) * f1))
for _, r in ipairs(list) do
if pro2 and f2 then
tv=tv+floor(BattleUtil.ErrorCorrection(r:GetRoleData(BattlePropList[pro2]) * f2))
end
local auraBuff = Buff.Create(role, BuffName.HOT, i1, 1, tv)
auraBuff.interval = 1
r:AddBuff(auraBuff)
@ -6310,14 +6315,13 @@ local passivityList = {
local onPassiveDamaging = function(func, defRole, damage,skill)
if skill and not skill.isTriggerJudge and judge==1 then
return
end
--如果是boss 并且额外伤害是根据最大生命则返回
local isBoss=BattleUtil.CheckIsBoss(defRole)
if isBoss and (f1==12 or f1==13) then
return
end
end
--观音,这个被动只有额外技能才能触发 by王振兴 2021/1/21 17:48
if skill and skill.type == BattleSkillType.Extra then
--如果是boss 并且额外伤害是根据最大生命则返回
if (f1==12 or f1==13) and BattleUtil.CheckIsBoss(defRole) then
return
end
local val = -floor(BattleUtil.FP_Mul(dt, defRole:GetRoleData(BattlePropList[f1])))
if func then
func(val)