合并dev_bt分支

dev_chengFeng
wangzhenxing 2023-02-14 16:19:23 +08:00
commit 0a2f07e93d
3 changed files with 7 additions and 1 deletions

View File

@ -232,7 +232,7 @@ end
function BuffManager:HasBuff(target, type, checkFunc,caster,dotType) function BuffManager:HasBuff(target, type, checkFunc,caster,dotType)
--如果当前是判断燃烧buff and 当前目标是攻击的主目标则直接返回true --如果当前是判断燃烧buff and 当前目标是攻击的主目标则直接返回true
if type== BuffName.DOT and caster and dotType and dotType==1 and caster.curMainTarget==target then if type== BuffName.DOT and caster and dotType and dotType==1 and (caster.curMainTarget==target or caster.isAllBurn) then
return true return true
end end
if self.buffDic.kvList[type] then if self.buffDic.kvList[type] then

View File

@ -11898,5 +11898,10 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast) role.Event:AddEvent(BattleEventName.SkillCast, OnSkillCast)
role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd) role.Event:AddEvent(BattleEventName.SkillCastEnd, OnSkillCastEnd)
end, end,
--视敌方全体为燃烧
[454]=function(role, args,id,judge)
role.isAllBurn=true
end,
} }
return passivityList return passivityList

View File

@ -106,6 +106,7 @@ function RoleLogic:Init(uid, data, position)
self.addAttack=0 --添加的攻击 self.addAttack=0 --添加的攻击
self.isNormalAttackAddRage=true --普攻是否回复怒气 self.isNormalAttackAddRage=true --普攻是否回复怒气
self.curMainTarget=nil --当前主目标 self.curMainTarget=nil --当前主目标
self.isAllBurn = false --是否视敌方全体为燃烧
self.passiveList = {} self.passiveList = {}
if data.passivity and #data.passivity > 0 then if data.passivity and #data.passivity > 0 then
--排序363类型的排在前面 --排序363类型的排在前面