Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 057afd89 21c09fa2
Showing 3 changed files with 39 additions and 7 deletions Show diff stats
src/actions/RadioAction.lua
src/models/Activity.lua
src/models/RolePlugin.lua
@@ -113,14 +113,35 @@ function _M.startQuestRpc(agent, data)
 	local msg = MsgPack.unpack(data)
 	local id = msg.id
 	local heros = msg.heros
-    local result = {}
-    local radioTask = role:getProperty("radioTask")
-    if table.numbers(radioTask) >= getQuestMax(role) then
-        return 1
-    end
+
     --  check id
     local config = csvdb["crusadeCsv"][id]
-    if not config then return 2 end
+    if not config then return 1 end
+
+    local radioTask = role:getProperty("radioTask")
+
+    local getActIDs = function ()
+        local actids = {}
+        for _, v in pairs(radioTask or {}) do
+            actids[v.actid] = (actids[v.actid] or 0) + 1
+        end
+        return actids
+    end
+
+    local actids = getActIDs()
+    if config.activity_ctrl_id == 0 then
+        --非活动 判断数量
+        if (actids[config.activity_ctrl_id] or 0) >= getQuestMax(role) then
+            return 2
+        end
+
+    else
+        --活动 同时只能有一个存在
+        if actids[config.activity_ctrl_id] >= 1 then
+            return 5
+        end
+    end
+
     if not role:checkHangPass(config.unlock) then return 3 end
     if radioTask[id] then return 4 end
     --  check hero
@@ -172,6 +193,7 @@ function _M.startQuestRpc(agent, data)
     local taskData = {}
     taskData["time"] = skynet.timex() + config.time + timeSub
     taskData["heros"] = heros
+    taskData["actid"] = config.activity_ctrl_id
     radioTask[id] = taskData
     role:updateProperty({field="radioTask", value=radioTask, notNotify=true})
@@ -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 {}