diff --git a/src/models/Activity.lua b/src/models/Activity.lua index e5cd21c..a117f81 100644 --- a/src/models/Activity.lua +++ b/src/models/Activity.lua @@ -1484,7 +1484,7 @@ activityFunc[Activity.ActivityType.RadioTask] = { -- check id local config = csvdb["crusadeCsv"][id] if config then - if config.actid == actid then + if config.activity_ctrl_id == actid then radioTask[id] = nil if not task then return 4 end diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index b54d034..f1bf53b 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -2177,6 +2177,16 @@ function RolePlugin.bind(Role) return (hangPass[diff] or 0) >= carbonId end + function Role:checkActivityBattlePass(battleId) + local isOpen, actId = self.activity:isOpen("ChallengeLevel") + if not isOpen then return end + + local actData = self.activity:getActData("ChallengeLevel") or {} + local battleInfo = actData[battleId] or {} + + return battleInfo["star"] ~= nil + end + function Role:checkAdvChapterPass(chapterId) local chapterData = csvdb["adv_chapterCsv"][chapterId] local advPass = self:getProperty("advPass") or {} -- libgit2 0.21.2