diff --git a/src/adv/AdvPassive.lua b/src/adv/AdvPassive.lua index 1f16a96..09793c3 100644 --- a/src/adv/AdvPassive.lua +++ b/src/adv/AdvPassive.lua @@ -427,9 +427,9 @@ end --6=给所有场上怪物增加buff function Passive:effect6(value) - local firends = self.owner.battle.player:getTeam(2) - for k , v in pairs(firends) do - self.owner:addBuff(value, self.owner) + local aims = self.owner.battle.player:getTeam(2) + for k , aim in pairs(aims) do + aim:addBuff(value, self.owner) end end diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua index 1b3b2f1..b5b7b4b 100644 --- a/src/adv/AdvPlayer.lua +++ b/src/adv/AdvPlayer.lua @@ -392,8 +392,6 @@ function BaseObject:hurt(value, releaser, params) end if self.hp == 0 then - self.isDead = true - self:triggerPassive(Passive.SELF_DEAD) for _, team in ipairs(self:getTeam(1, true)) do team:triggerPassive(Passive.TEAM_DEAD) @@ -402,6 +400,7 @@ function BaseObject:hurt(value, releaser, params) if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then self.battle.adv:checkAchievement(self.battle.adv.AchievType.KillByBuff, 1, params.buffId) end + self.isDead = true end self:triggerPassive(Passive.HURT_PERCENT_SELF, {value = value / self.hpMax}) for _, team in ipairs(self:getTeam(1, true)) do -- libgit2 0.21.2