Commit 4ae223df50b522ef8c9d83f8c6c466ad05f55833
1 parent
9cffb42b
Buff bug
Showing
3 changed files
with
7 additions
and
6 deletions
Show diff stats
src/adv/Adv.lua
| @@ -679,7 +679,7 @@ local function clickChoose(self, room, block, params) | @@ -679,7 +679,7 @@ local function clickChoose(self, room, block, params) | ||
| 679 | --消灭所有怪 | 679 | --消灭所有怪 |
| 680 | [3] = function() | 680 | [3] = function() |
| 681 | for _, room in pairs(self.rooms) do | 681 | for _, room in pairs(self.rooms) do |
| 682 | - for _, block in pairs(self.blocks) do | 682 | + for _, block in pairs(room.blocks) do |
| 683 | if block.event and (block.event.etype == AdvEventType.BOSS or block.event.etype == AdvEventType.Monster) then | 683 | if block.event and (block.event.etype == AdvEventType.BOSS or block.event.etype == AdvEventType.Monster) then |
| 684 | return | 684 | return |
| 685 | end | 685 | end |
src/adv/AdvBuff.lua
| @@ -41,7 +41,7 @@ local BuffFactory = { | @@ -41,7 +41,7 @@ local BuffFactory = { | ||
| 41 | elseif self.buffData.effectValue1 == 1 then | 41 | elseif self.buffData.effectValue1 == 1 then |
| 42 | local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release | 42 | local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release |
| 43 | local attrs = {[0] = "hp", [1] = "hpMax", [2] = "atk"} | 43 | local attrs = {[0] = "hp", [1] = "hpMax", [2] = "atk"} |
| 44 | - self._changeV = baseOwner[attrs[self.buffData.effectValue3]] * self.buffData.effectValue2 | 44 | + self._changeV = baseOwner[attrs[self.buffData.effectValue3]] * self.buffData.effectValue2 / 100 |
| 45 | end | 45 | end |
| 46 | if self._changeV < 0 then | 46 | if self._changeV < 0 then |
| 47 | self._changeV = -self.release:getHurtValue(-self._changeV) | 47 | self._changeV = -self.release:getHurtValue(-self._changeV) |
| @@ -70,7 +70,7 @@ local BuffFactory = { | @@ -70,7 +70,7 @@ local BuffFactory = { | ||
| 70 | elseif self.buffData.effectValue1 == 1 then | 70 | elseif self.buffData.effectValue1 == 1 then |
| 71 | local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release | 71 | local baseOwner = self.buffData.effectValue4 == 1 and self.owner or self.release |
| 72 | local attrs = {[0] = "hp", [1] = "hpMax", [2] = "atk"} | 72 | local attrs = {[0] = "hp", [1] = "hpMax", [2] = "atk"} |
| 73 | - self._changeV = baseOwner[attrs[self.buffData.effectValue3]] * self.buffData.effectValue2 | 73 | + self._changeV = baseOwner[attrs[self.buffData.effectValue3]] * self.buffData.effectValue2 / 100 |
| 74 | end | 74 | end |
| 75 | local old = self.owner.hpMax | 75 | local old = self.owner.hpMax |
| 76 | self.owner.hpMax = math.max(1, self.owner.hpMax + self._changeV) | 76 | self.owner.hpMax = math.max(1, self.owner.hpMax + self._changeV) |
src/adv/AdvPlayer.lua
| @@ -98,11 +98,12 @@ function BaseObject:getCommonBuffEffect(bType) | @@ -98,11 +98,12 @@ function BaseObject:getCommonBuffEffect(bType) | ||
| 98 | if not buff.isDel and buff:getType() == bType then | 98 | if not buff.isDel and buff:getType() == bType then |
| 99 | local cType, value = buff:effectValue() | 99 | local cType, value = buff:effectValue() |
| 100 | if cType then | 100 | if cType then |
| 101 | - change[cType] = change[cType] + value | 101 | + effect[cType] = effect[cType] + value |
| 102 | count = count + 1 | 102 | count = count + 1 |
| 103 | end | 103 | end |
| 104 | end | 104 | end |
| 105 | end | 105 | end |
| 106 | + effect[1] = effect[1] / 100 | ||
| 106 | return effect, count --效果 和生效的buff 个数 | 107 | return effect, count --效果 和生效的buff 个数 |
| 107 | end | 108 | end |
| 108 | --伤害反弹 | 109 | --伤害反弹 |
| @@ -113,7 +114,7 @@ function BaseObject:getBackHurtBuff(isAtk) | @@ -113,7 +114,7 @@ function BaseObject:getBackHurtBuff(isAtk) | ||
| 113 | local cType, value, aType = buff:effectValue() -- aType 0 全部 1 普通攻击 | 114 | local cType, value, aType = buff:effectValue() -- aType 0 全部 1 普通攻击 |
| 114 | if cType then | 115 | if cType then |
| 115 | if aType == 0 or isAtk then | 116 | if aType == 0 or isAtk then |
| 116 | - change[cType] = change[cType] + value | 117 | + effect[cType] = effect[cType] + value |
| 117 | end | 118 | end |
| 118 | end | 119 | end |
| 119 | end | 120 | end |
| @@ -370,7 +371,7 @@ function BaseObject:getDB() | @@ -370,7 +371,7 @@ function BaseObject:getDB() | ||
| 370 | for _, passive in ipairs(self.passives) do | 371 | for _, passive in ipairs(self.passives) do |
| 371 | table.insert(db.passives, passive:getDB()) | 372 | table.insert(db.passives, passive:getDB()) |
| 372 | end | 373 | end |
| 373 | - db.buff = {} | 374 | + db.buffs = {} |
| 374 | for _, buff in ipairs(self.buffs) do | 375 | for _, buff in ipairs(self.buffs) do |
| 375 | table.insert(db.buffs, buff:getDB()) | 376 | table.insert(db.buffs, buff:getDB()) |
| 376 | end | 377 | end |