diff --git a/src/GlobalVar.lua b/src/GlobalVar.lua index 92738b3..6b850c1 100644 --- a/src/GlobalVar.lua +++ b/src/GlobalVar.lua @@ -325,6 +325,7 @@ MailId = { PayBackAward = 242, CBBackAward = 243, CBBackAward2 = 244, + ActivityPoolRet = 280, } TriggerEventType = { diff --git a/src/adv/Adv.lua b/src/adv/Adv.lua index e41b0e7..3203414 100644 --- a/src/adv/Adv.lua +++ b/src/adv/Adv.lua @@ -1120,6 +1120,11 @@ local function clickOut(self, room, block, params, isExit) else if self.level > (advPass[self.chapterId] or 0) then self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}}) + + if (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束 + self.owner:checkTaskEnter("AdvPassFirst", {id = self.chapterId}) + end + end end diff --git a/src/csvdata b/src/csvdata index b86293f..6c280f1 160000 --- a/src/csvdata +++ b/src/csvdata @@ -1 +1 @@ -Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736 +Subproject commit 6c280f14faafd9be8f7a578bc270bdd2310aa930 diff --git a/src/models/Activity.lua b/src/models/Activity.lua index 3e28b6a..984f1d9 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -529,6 +529,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = { local actData = self:getActData(actType) local cfg = csvdb["activity_ctrlCsv"][actId] if not cfg then return end + -- 保底次数转换成万能碎片 + local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60) + if count > 0 then + local gift = {[723] = count} + self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {}) + end actData[cfg.condition] = nil self:updateActData(actType, actData, not notify) end, diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index 8d56b43..c7c4744 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -50,6 +50,7 @@ local TaskType = { AdvHang = 412, -- 代理拾荒次数 AdvMineKill = 413, -- 宝藏怪击杀 AdvMineLayer = 414, -- 宝藏洞激活 + AdvPassFirst = 415, -- 冒险首次通关 - id --爬塔相关 TowerPass = 501, -- 爬塔通关 - level @@ -240,7 +241,7 @@ local StoreListener = { [TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}}, [TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}}, [TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}}, - [TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}}, + [TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}}, [TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}}, } } -- libgit2 0.21.2