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

jiyue
2 parents b7d38179 27acaa11
Showing 6 changed files with 61 additions and 7 deletions Show diff stats
src/ProtocolCode.lua
src/actions/RadioAction.lua
src/actions/RoleAction.lua
src/models/Activity.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
@@ -64,6 +64,7 @@ actionCodes = {
 	Role_itemConvertSpecialRpc = 145, -- 兑换月卡/战令探索指令等 特殊道具
 	Role_worldLineRouletteRpc = 146, --世界线抽轮盘
 	Role_worldLineRewardRpc = 147, -- 世界线一键领取奖励
+	Role_itemConvertDevilTicketRpc = 148, -- 兑换魔鬼训练营门票
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -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] or 0) >= 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})
@@ -1820,4 +1820,24 @@ function _M.worldLineRewardRpc(agent, data)
 	return true
 end
+function _M.itemConvertDevilTicketRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local itemId = msg.itemId    --道具id
+	local count = msg.count or 1 --兑换生成的数量
+	local itemData = csvdb["itemCsv"][itemId]
+	if itemData.use_type ~= 11 then return 2 end
+
+	local createCost = globalCsv.moguixunlianying_create_cost[itemId]:toArray(true, "=")
+	if not next(createCost) then return 3 end
+
+    local cost = {[itemId] = createCost[1] * count}
+	if not role:checkItemEnough(cost) then return 4 end
+	role:costItems({cost}, {log = {desc = "itemConvertDevilTicket"}})
+	local reward, change = role:award({[createCost[2]] = count}, {log = {desc = "itemConvertDevilTicket", int1 = itemId, int2 = cost[itemId]}})
+
+	SendPacket(actionCodes.Role_itemConvertDevilTicketRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -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
@@ -73,6 +73,7 @@ local ItemReason = {
 	regularWorldBossReward = 157,	-- 常规世界boss
 	regularWorldBossMilestone = 158,	-- 常规世界boss伤害里程碑
 	regularWorldBossBattle = 159, -- 常规世界boss战斗奖励
+	itemConvertDevilTicket = 160, -- 兑换魔鬼训练营门票
@@ -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 {}