diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 8d424fae1c..664473e330 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -10106,10 +10106,10 @@ local passivityList = { local v2=args[4] local t1=args[5] local t2=args[6] - local OnBuffStart = function(buff1) + local OnBuffStart = function(buff) -- BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () - local buff={} - buff=buff1 + + -- buff=buff1 if buff.skill==nil or buff.skill.type~=BattleSkillType.Special then return end @@ -10127,16 +10127,11 @@ local passivityList = { local buffTarget={} buffTarget=buff.target if add>0 then - -- local buff = Buff.Create(caster, BuffName.DOT, i1, 1, dot, floor(damage)) - -- buff.skill=skill - -- buff.isRealDamage = true - local newBuff={} - newBuff=buff - newBuff.skill=nil - newBuff.caster=role for i = 1, add do - - buffTarget:AddBuff(newBuff) + local newBuff = Buff.Create(buff.caster, BuffName.DOT, buff.duration, 1,1,buff.damagePro) + newBuff.skill=nil + newBuff.isRealDamage=true + buff.target:AddBuff(newBuff) end end --end) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua index 449d7304f4..0dda95c7c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/DOT.lua @@ -16,7 +16,6 @@ function DOT:SetData(...) -- self.cover = false -- self.layer = nil --end - -- 刷新排序等级 self.sort = 2 -- if self.damageType == 3 then -- 流血buff在行动之后刷新 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index b8049d724c..dda8d259f8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -216,7 +216,7 @@ function BuffCtrl:AddBuffIcon(buff, icon) end --持续伤害类型,伤害系数 elseif buffType==BuffName.DOT then - if self.BuffIconList[key].buffDamageType==currBuff.damageType and self.BuffIconList[key].buffDamageFactor==currBuff.damageFactor then + if self.BuffIconList[key].buffDamageType==currBuff.damageType and self.BuffIconList[key].buffDamageFactor==currBuff.damagePro then self.BuffIconList[key]:SetCount(self.BuffIconList[key].count+1) return end @@ -291,7 +291,7 @@ function BuffCtrl:RemoveBuffIcon(buff) end --持续伤害类型,伤害系数 elseif buffType == BuffName.DOT then - if self.BuffIconList[key].buffDamageType==buff.damageType and self.BuffIconList[key].buffDamageFactor==buff.damageFactor then + if self.BuffIconList[key].buffDamageType==buff.damageType and self.BuffIconList[key].buffDamageFactor==buff.damagePro then if floor==1 then self.BuffIconList[key]:Dispose() self.BuffIconList[key] = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua index b6e7a84e62..37ccf9f3b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffView.lua @@ -11,7 +11,7 @@ function BuffView.New(go, buff, icon) instance.buffValue = buff.Value instance.buffCt = buff.changeType instance.buffDamageType = buff.damageType - instance.buffDamageFactor = buff.damageFactor + instance.buffDamageFactor = buff.damagePro instance.buffCtrlType = buff.ctrlType instance.healValue = buff.healValue instance.immuneType = buff.immuneType