Commit a25b4535777f6328e4c9a9f68e1dda4d43a78573
fix conflict
Showing
4 changed files
with
15 additions
and
2 deletions
Show diff stats
src/GlobalVar.lua
| @@ -325,6 +325,7 @@ MailId = { | @@ -325,6 +325,7 @@ MailId = { | ||
| 325 | PayBackAward = 242, | 325 | PayBackAward = 242, |
| 326 | CBBackAward = 243, | 326 | CBBackAward = 243, |
| 327 | CBBackAward2 = 244, | 327 | CBBackAward2 = 244, |
| 328 | + ActivityPoolRet = 280, | ||
| 328 | } | 329 | } |
| 329 | 330 | ||
| 330 | TriggerEventType = { | 331 | TriggerEventType = { |
src/adv/Adv.lua
| @@ -1165,6 +1165,11 @@ local function clickOut(self, room, block, params, isExit) | @@ -1165,6 +1165,11 @@ local function clickOut(self, room, block, params, isExit) | ||
| 1165 | else | 1165 | else |
| 1166 | if self.level > (advPass[self.chapterId] or 0) then | 1166 | if self.level > (advPass[self.chapterId] or 0) then |
| 1167 | self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}}) | 1167 | self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}}) |
| 1168 | + | ||
| 1169 | + if (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束 | ||
| 1170 | + self.owner:checkTaskEnter("AdvPassFirst", {id = self.chapterId}) | ||
| 1171 | + end | ||
| 1172 | + | ||
| 1168 | end | 1173 | end |
| 1169 | end | 1174 | end |
| 1170 | 1175 |
src/models/Activity.lua
| @@ -539,6 +539,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = { | @@ -539,6 +539,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = { | ||
| 539 | local actData = self:getActData(actType) | 539 | local actData = self:getActData(actType) |
| 540 | local cfg = csvdb["activity_ctrlCsv"][actId] | 540 | local cfg = csvdb["activity_ctrlCsv"][actId] |
| 541 | if not cfg then return end | 541 | if not cfg then return end |
| 542 | + -- 保底次数转换成万能碎片 | ||
| 543 | + --local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60) | ||
| 544 | + --if count > 0 then | ||
| 545 | + -- local gift = {[723] = count} | ||
| 546 | + -- self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {}) | ||
| 547 | + --end | ||
| 542 | actData[cfg.condition] = nil | 548 | actData[cfg.condition] = nil |
| 543 | self:updateActData(actType, actData, not notify) | 549 | self:updateActData(actType, actData, not notify) |
| 544 | end, | 550 | end, |
src/models/RoleTask.lua
| @@ -53,6 +53,7 @@ local TaskType = { | @@ -53,6 +53,7 @@ local TaskType = { | ||
| 53 | AdvMineLayer = 414, -- 宝藏洞激活 | 53 | AdvMineLayer = 414, -- 宝藏洞激活 |
| 54 | AdvKillBoss = 415, -- 拾荒击杀boss | 54 | AdvKillBoss = 415, -- 拾荒击杀boss |
| 55 | AdvHangHeroCnt = 416, -- 拾荒人数 | 55 | AdvHangHeroCnt = 416, -- 拾荒人数 |
| 56 | + AdvPassFirst = 417, -- 冒险首次通关 - id | ||
| 56 | 57 | ||
| 57 | --爬塔相关 | 58 | --爬塔相关 |
| 58 | TowerPass = 501, -- 爬塔通关 - level | 59 | TowerPass = 501, -- 爬塔通关 - level |
| @@ -247,7 +248,7 @@ local StoreListener = { | @@ -247,7 +248,7 @@ local StoreListener = { | ||
| 247 | [TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}}, | 248 | [TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}}, |
| 248 | [TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}}, | 249 | [TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}}, |
| 249 | [TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}}, | 250 | [TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}}, |
| 250 | - [TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}}, | 251 | + [TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}}, |
| 251 | [TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}}, | 252 | [TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}}, |
| 252 | } | 253 | } |
| 253 | } | 254 | } |
| @@ -736,4 +737,4 @@ function RoleTask.bind(Role) | @@ -736,4 +737,4 @@ function RoleTask.bind(Role) | ||
| 736 | 737 | ||
| 737 | end | 738 | end |
| 738 | 739 | ||
| 739 | -return RoleTask | ||
| 740 | \ No newline at end of file | 740 | \ No newline at end of file |
| 741 | +return RoleTask |