Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

测试
2 parents 81ca3a6f 4e68858c
Showing 3 changed files with 85 additions and 38 deletions Show diff stats
src/actions/RoleAction.lua
src/models/RolePlugin.lua
src/models/Rune.lua
@@ -890,25 +890,14 @@ function _M.unLockStoryBookRpc(agent, data)
 	return true
 end
-function _M.taskRpc(agent, data)
-	local role = agent.role
-	local msg = MsgPack.unpack(data)
-
-	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
-
-	local taskType = msg.type -- 1 日常 2 周常
-	local taskId = msg.id --任务id
-	local roleField = {"dTask", "wTask"}
-	if not roleField[taskType] then return 1 end
-
-	local taskData = csvdb["task_loopCsv"][taskType][taskId]
-	if not taskData then return 2 end
+local function getTaskReward(role, taskId, roleField, taskType, taskData)
+	if not taskData then return nil end
 	local taskStatus = role:getProperty(roleField[taskType])
 	local tStatus = taskStatus["t"] or {}
 	if (tStatus[taskId] or 0) < taskData.condition1 then
-		return 3
+		return nil
 	end
 	local reward, change = role:award(taskData.reward, {log = {desc = "finishTask", int1 = taskType, int2 = taskId}})
@@ -936,30 +925,49 @@ function _M.taskRpc(agent, data)
 		task_reward_type = taskType, --任务奖励类型，见 任务奖励类型枚举表
 		task_reward_detail = reward, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
-
-	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
-	return true
+	return reward, change
 end
-function _M.taskActiveRpc(agent, data)
+function _M.taskRpc(agent, data)
 	local role = agent.role
 	local msg = MsgPack.unpack(data)
 	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
-	local taskType = msg.type -- 1 日常 2 周长
+	local taskType = msg.type -- 1 日常 2 周常
 	local taskId = msg.id --任务id
 	local roleField = {"dTask", "wTask"}
-	if not roleField[taskType] then return end
+	if not roleField[taskType] then return 1 end
-	local taskData = csvdb["task_activeCsv"][taskType][taskId]
-	if not taskData then return end
+	local reward, change = {}, {}
+	if not taskId then
+
+		for id, taskData in pairs(csvdb["task_loopCsv"][taskType]) do
+			local tmpreward, tmpchange = getTaskReward(role, id, roleField, taskType, taskData)
+			if tmpreward then
+				for k, v in pairs(tmpreward) do
+					reward[k] = (reward[k] or 0) + v
+				end
+				if tmpchange then table.insert(change, tmpchange) end
+			end
+		end
+	else
+		local taskData = csvdb["task_loopCsv"][taskType][taskId]
+		if not taskData then return 2 end
+		reward, change= getTaskReward(role, taskId, roleField, taskType, taskData)
+	end
+	SendPacket(actionCodes.Role_taskRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+
+local function getTaskActiveReward(role, taskId, roleField, taskType, taskData)
 	local taskStatus = role:getProperty(roleField[taskType])
 	local tStatus = taskStatus["at"] or {}
 	if tStatus[taskId] == -1 or (taskStatus["a"] or 0) < taskData.active then
-		return
+		return nil
 	end
 	local needReward = taskData.reward:toNumMap()
@@ -974,12 +982,42 @@ function _M.taskActiveRpc(agent, data)
 	role:changeUpdates({
 		{ type = roleField[taskType], field = {"at", taskId}, value = -1 }
 	})
-	
+
 	role:log("task_reward", {
 		task_reward_id = taskId * 100 + taskType, --任务奖励ID
 		task_reward_type = 3, --任务奖励类型，见 任务奖励类型枚举表
 		task_reward_detail = reward, --任务奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
+    return reward, change
+end
+
+function _M.taskActiveRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	if not role:isFuncUnlock(FuncUnlock.TaskAchiv) then return end
+
+	local taskType = msg.type -- 1 日常 2 周长
+	local taskId = msg.id --任务id
+	local roleField = {"dTask", "wTask"}
+	if not roleField[taskType] then return end
+
+	local reward, change = {}, {}
+	if not taskId then
+		for id, taskData in pairs(csvdb["task_activeCsv"][taskType]) do
+			local tmpreward, tmpchange = getTaskActiveReward(role, id, roleField, taskType, taskData)
+			if tmpreward then
+				for k, v in pairs(tmpreward) do
+					reward[k] = (reward[k] or 0) + v
+				end
+				if tmpchange then table.insert(change, tmpchange) end
+			end
+		end
+	else
+		local taskData = csvdb["task_activeCsv"][taskType][taskId]
+		if not taskData then return end
+		reward, change= getTaskActiveReward(role, taskId, roleField, taskType, taskData)
+	end
 	SendPacket(actionCodes.Role_taskActiveRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
@@ -2787,23 +2787,33 @@ function RolePlugin.bind(Role)
 		return self:getDeltaValue(result, value) + self:getDeltaValue(levelReault, value)
 	end
-	local function appendBnous(dstBnous, srcBnous)
-		if not dstBnous or not srcBnous then return end
+	local function appendAdvBnous(dstBnous, srcBnous)
+		if not dstBnous and not srcBnous then return {} end
+		local result = clone(dstBnous or {})
 		for time, set in pairs(srcBnous) do
-			if not dstBnous[time] then
-				dstBnous[time] = {}
+			if not result[time] then
+				result[time] = {}
 			end
 			for key, value in pairs(set) do
-				dstBnous[time][key] = (dstBnous[time][key] or 0) + value
+				result[time][key] = (result[time][key] or 0) + value
 			end
 		end
+		return result
+	end
+
+	local function appendTableBnous(dstBnous, srcBnous)
+		if not dstBnous and not srcBnous then return {} end
+		local result = clone(dstBnous or {})
+		for k, v in pairs(srcBnous) do
+			result[k] = (result[k] or 0) + v
+		end
+        return result
 	end
 	function Role:getBnousAdv()
 		local towerBnous = self:getTowerBnousActive()
 		local levelBnous = self:getLevelBnous()
 		local adv = levelBnous[SystemBnousType.Adv] or {}
-		appendBnous(towerBnous[SystemBnousType.Adv], adv)
-		return towerBnous[SystemBnousType.Adv] or {}
+        return appendAdvBnous(towerBnous[SystemBnousType.Adv], adv)
 	end
 	function Role:getBnousHangTime()
@@ -2817,16 +2827,14 @@ function RolePlugin.bind(Role)
 		local towerBnous = self:getTowerBnousActive()
 		local levelBnous = self:getLevelBnous()
 		local pvpTicket = levelBnous[SystemBnousType.PvpTicket] or {}
-		appendBnous(towerBnous[SystemBnousType.PvpTicket], pvpTicket)
-		return towerBnous[SystemBnousType.PvpTicket] or {}
+		return appendTableBnous(towerBnous[SystemBnousType.PvpTicket], pvpTicket)
 	end
 	function Role:getBnousSweep()
 		local towerBnous = self:getTowerBnousActive()
 		local levelBnous = self:getLevelBnous()
 		local sweepReward = levelBnous[SystemBnousType.SweepReward] or {}
-		appendBnous(towerBnous[SystemBnousType.SweepReward], sweepReward)
-		return towerBnous[SystemBnousType.SweepReward] or {}
+		return appendTableBnous(towerBnous[SystemBnousType.SweepReward], sweepReward)
 	end
 	function Role:getBnousDismantlingMaximum()
@@ -2995,7 +3003,7 @@ function RolePlugin.bind(Role)
 	-- 把溢出的铭文奖励通过邮件发送
 	function Role:checkRuneCount(reward)
         local firstMore = false
-        local count = self:getRuneBatCount()
+        local count = self:getRuneBagCount()
 		local page = globalCsv.store_type[ItemType.Rune]
 		local limit = self:getProperty("bagLimit")[page]
 		if count >= limit then
@@ -92,8 +92,9 @@ function Rune:generateAttrs()
 	local attrs = ""
 	local typ, value = getRandomValue(runeData.attr1,runeData.range1)
 	attrs = attrs:setv(typ, value)
-	local typ, value = getRandomValue(runeData.attr2,runeData.range2) 
-	attrs = attrs:setv(typ, value)
+	local typ, value = getRandomValue(runeData.attr2,runeData.range2)
+    attrs = string.format("%s %d=%d", attrs, typ, value)
+	--attrs = attrs:setv(typ, value)
 	self:setProperty("attrs",attrs)
 end