Commit a56602397c68d8f934c0b81e23363973a327b1d0
1 parent
161c50cc
冒险bug
Showing
2 changed files
with
19 additions
and
15 deletions
Show diff stats
src/adv/Adv.lua
| @@ -149,25 +149,15 @@ function Adv:initByChapter(params) | @@ -149,25 +149,15 @@ function Adv:initByChapter(params) | ||
| 149 | self.maps = {} | 149 | self.maps = {} |
| 150 | self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay) | 150 | self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay) |
| 151 | 151 | ||
| 152 | - self:initBattle(nil) | 152 | + self:initBattle(nil, isToNext) |
| 153 | 153 | ||
| 154 | self:initLayerTask() | 154 | self:initLayerTask() |
| 155 | 155 | ||
| 156 | - -- 支援效果生效一些 | ||
| 157 | - self:activeSomeSupport() | 156 | + |
| 158 | 157 | ||
| 159 | self:checkTask(Adv.TaskType.Arrive) | 158 | self:checkTask(Adv.TaskType.Arrive) |
| 160 | self:checkAdvUnlock(1, self.level) | 159 | self:checkAdvUnlock(1, self.level) |
| 161 | 160 | ||
| 162 | - if isToNext then | ||
| 163 | - self.battle.player:afterLayer() -- 玩家的buff 清理一下 | ||
| 164 | - end | ||
| 165 | - | ||
| 166 | - -- 不是中继层 加上 层 和 地图的buff和被动 | ||
| 167 | - if not self.isRelay then | ||
| 168 | - self.battle:initMapEffect() | ||
| 169 | - end | ||
| 170 | - | ||
| 171 | -- 中继进入奖励 | 161 | -- 中继进入奖励 |
| 172 | if relayData and isEnter then | 162 | if relayData and isEnter then |
| 173 | self:awardRelay(relayData, notNotify) | 163 | self:awardRelay(relayData, notNotify) |
| @@ -456,8 +446,20 @@ function Adv:clearAdvUnlockCache() | @@ -456,8 +446,20 @@ function Adv:clearAdvUnlockCache() | ||
| 456 | self.cacheUnlock = {} | 446 | self.cacheUnlock = {} |
| 457 | end | 447 | end |
| 458 | 448 | ||
| 459 | -function Adv:initBattle(info) | 449 | +function Adv:initBattle(info, isToNext) |
| 460 | self.battle = require("adv.AdvBattle").new(self) | 450 | self.battle = require("adv.AdvBattle").new(self) |
| 451 | + -- 支援效果生效一些 | ||
| 452 | + self:activeSomeSupport() | ||
| 453 | + | ||
| 454 | + -- 不是中继层 加上 层 和 地图的buff和被动 | ||
| 455 | + if not self.isRelay then | ||
| 456 | + self.battle:initMapEffect() | ||
| 457 | + end | ||
| 458 | + | ||
| 459 | + if isToNext then | ||
| 460 | + self.battle.player:afterLayer() -- 玩家的buff 清理一下 | ||
| 461 | + end | ||
| 462 | + | ||
| 461 | for _, passiveC in ipairs(self.cachePassiveEvent or {}) do | 463 | for _, passiveC in ipairs(self.cachePassiveEvent or {}) do |
| 462 | self.battle:triggerPassive(passiveC[1], passiveC[2]) | 464 | self.battle:triggerPassive(passiveC[1], passiveC[2]) |
| 463 | end | 465 | end |
| @@ -468,7 +470,7 @@ function Adv:initBattle(info) | @@ -468,7 +470,7 @@ function Adv:initBattle(info) | ||
| 468 | map:initBattleAfter() | 470 | map:initBattleAfter() |
| 469 | end | 471 | end |
| 470 | --下层 | 472 | --下层 |
| 471 | - if not info and self.level ~= 1 then | 473 | + if not info and isToNext then |
| 472 | self.battle.player:attrChangeCondBuffCheck(1) | 474 | self.battle.player:attrChangeCondBuffCheck(1) |
| 473 | end | 475 | end |
| 474 | 476 | ||
| @@ -1553,6 +1555,7 @@ local function clickBuild(self, room, block, params) | @@ -1553,6 +1555,7 @@ local function clickBuild(self, room, block, params) | ||
| 1553 | end | 1555 | end |
| 1554 | advMine[2].co = mineCo2 | 1556 | advMine[2].co = mineCo2 |
| 1555 | self.owner:setProperty("advMine", advMine) | 1557 | self.owner:setProperty("advMine", advMine) |
| 1558 | + self.owner:checkTaskEnter("AdvMineLayer") | ||
| 1556 | end | 1559 | end |
| 1557 | 1560 | ||
| 1558 | self:checkTask(Adv.TaskType.Build, 1, oldId) | 1561 | self:checkTask(Adv.TaskType.Build, 1, oldId) |
| @@ -2050,6 +2053,7 @@ function Adv:enemyDead(enemy, escape) | @@ -2050,6 +2053,7 @@ function Adv:enemyDead(enemy, escape) | ||
| 2050 | advMine[2].co = mineCo2 | 2053 | advMine[2].co = mineCo2 |
| 2051 | advMine[2].ch = mineCh | 2054 | advMine[2].ch = mineCh |
| 2052 | self.owner:setProperty("advMine", advMine) | 2055 | self.owner:setProperty("advMine", advMine) |
| 2056 | + self.owner:checkTaskEnter("AdvMineKill") | ||
| 2053 | else | 2057 | else |
| 2054 | local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK) | 2058 | local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK) |
| 2055 | if toClick then | 2059 | if toClick then |
src/adv/AdvBuff.lua
| @@ -35,7 +35,7 @@ Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物 | @@ -35,7 +35,7 @@ Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物 | ||
| 35 | Buff.SNEAK = 32 --潜行 | 35 | Buff.SNEAK = 32 --潜行 |
| 36 | Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成 -- 怪物使用 | 36 | Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成 -- 怪物使用 |
| 37 | Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效 | 37 | Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效 |
| 38 | -Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变 -- 怪物使用 0 - 1 | 38 | +Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变 -- 怪物使用 2 - 1 |
| 39 | Buff.DISABLE_AURA = 36 -- 禁用光环 | 39 | Buff.DISABLE_AURA = 36 -- 禁用光环 |
| 40 | Buff.GET_AURA = 37 -- 获得光环 | 40 | Buff.GET_AURA = 37 -- 获得光环 |
| 41 | 41 |