diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua index 64b9c26..618105d 100644 --- a/src/models/RoleTask.lua +++ b/src/models/RoleTask.lua @@ -257,7 +257,7 @@ local CalendaTaskListener = { [TaskType.HeroStarCollect]= {{16, 3}}, [TaskType.FoodSell]= {{17, 1, f("count")}}, [TaskType.HangGet]= {{18, 3, f("reward")}}, - [TaskType.RuneQualityCollect]= {{19, 3, f("id")}}, + [TaskType.RuneQualityCollect]= {{19, 3}}, [TaskType.OpenBox]= {{20, 3, f("count"), f("quality")}}, } } @@ -648,7 +648,30 @@ function RoleTask.bind(Role) end end elseif cfg.type == 19 then -- x名英雄装备y品质以上符文套装 + local count = 0 + for _, hero in pairs(self.heros) do + local rcount = 0 + for _,uid in pairs(hero:getRunes()) do + if uid > 0 then + local runeData = self.owner.runeBag[uid] + if runeData then + local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")] + + if csvData and cfg.condition2 <= csvData.rarity then + rcount = rcount + 1 + end + end + end + end + if rcount == 6 then + count = count + 1 + end + end + calTask[id] = count elseif cfg.type == 20 then -- 开启x品质时钟箱子 + if cfg.condition2 <= (param2 or 0) then + calTask[id] = (calTask[id] or 0) + param2 + end end end end -- libgit2 0.21.2