Merge remote-tracking branch 'origin/cn/develop' into cn/develop

zhangqijia
2 parents c5fe43c2 5204a839
Showing 2 changed files with 11 additions and 1 deletions Show diff stats
src/models/Activity.lua
src/models/RolePlugin.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
@@ -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 {}