diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index 654c14f..c3bb80e 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -149,25 +149,15 @@ function Adv:initByChapter(params) self.maps = {} self.maps[1] = AdvMap.new(self, 1, mapId, isEnter, isNewRelay) - self:initBattle(nil) + self:initBattle(nil, isToNext) self:initLayerTask() - -- 支援效果生效一些 - self:activeSomeSupport() + self:checkTask(Adv.TaskType.Arrive) self:checkAdvUnlock(1, self.level) - if isToNext then - self.battle.player:afterLayer() -- 玩家的buff 清理一下 - end - - -- 不是中继层 加上 层 和 地图的buff和被动 - if not self.isRelay then - self.battle:initMapEffect() - end - -- 中继进入奖励 if relayData and isEnter then self:awardRelay(relayData, notNotify) @@ -456,8 +446,20 @@ function Adv:clearAdvUnlockCache() self.cacheUnlock = {} end -function Adv:initBattle(info) +function Adv:initBattle(info, isToNext) self.battle = require("adv.AdvBattle").new(self) + -- 支援效果生效一些 + self:activeSomeSupport() + + -- 不是中继层 加上 层 和 地图的buff和被动 + if not self.isRelay then + self.battle:initMapEffect() + end + + if isToNext then + self.battle.player:afterLayer() -- 玩家的buff 清理一下 + end + for _, passiveC in ipairs(self.cachePassiveEvent or {}) do self.battle:triggerPassive(passiveC[1], passiveC[2]) end @@ -468,7 +470,7 @@ function Adv:initBattle(info) map:initBattleAfter() end --下层 - if not info and self.level ~= 1 then + if not info and isToNext then self.battle.player:attrChangeCondBuffCheck(1) end @@ -1553,6 +1555,7 @@ local function clickBuild(self, room, block, params) end advMine[2].co = mineCo2 self.owner:setProperty("advMine", advMine) + self.owner:checkTaskEnter("AdvMineLayer") end self:checkTask(Adv.TaskType.Build, 1, oldId) @@ -2050,6 +2053,7 @@ function Adv:enemyDead(enemy, escape) advMine[2].co = mineCo2 advMine[2].ch = mineCh self.owner:setProperty("advMine", advMine) + self.owner:checkTaskEnter("AdvMineKill") else local toClick = enemy:hadBuff(Buff.CHANGE_DROP_TO_CLICK) if toClick then diff --git a/src/adv/AdvBuff.lua b/src/adv/AdvBuff.lua index b4593db..910bfda 100644 --- a/src/adv/AdvBuff.lua +++ b/src/adv/AdvBuff.lua @@ -35,7 +35,7 @@ Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物 Buff.SNEAK = 32 --潜行 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成 -- 怪物使用 Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效 -Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变 -- 怪物使用 0 - 1 +Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变 -- 怪物使用 2 - 1 Buff.DISABLE_AURA = 36 -- 禁用光环 Buff.GET_AURA = 37 -- 获得光环 -- libgit2 0.21.2