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

熊润斐
2 parents f84286c1 7fe1158c
Showing 8 changed files with 207 additions and 114 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/csvdata
src/models/Daily.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/Rune.lua
@@ -424,3 +424,14 @@ SystemBnousType = {
 	ChangeBaseCount = 16, -- 每日奖励关卡挑战卡基础数量增加
 	ChangeBuyCount = 17, -- 每日奖励关卡挑战卡可购买次数增加，
 }
+
+-- 开箱物品类型
+ItemOccupy = {
+	EquipBase = 1, --装备
+	Rune = 2, --铭文
+	Diner = 3, --食材
+	CommonPaster = 4, --贴纸
+	Spark = 5, --火花
+    Other = 6,
+	CanUsed = 7, --可使用
+}
 \ No newline at end of file
@@ -1029,9 +1029,9 @@ end
 table.insert(helpDes, {"清讨伐电台", "clear_radio", "id"})
 function _M.clear_radio(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local radioTask = role:getProperty("radioTask")
-    if id == 0 then
+    if id ~= 0 then
         radioTask[id] = nil
     else
         radioTask = {}
@@ -1044,9 +1044,9 @@ end
 table.insert(helpDes, {"清代理拾荒", "clear_adv_hang", "id"})
 function _M.clear_adv_hang(role, pms)
-	local id = pms.pm1
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("advHang")
-    if id == 0 then
+    if id ~= 0 then
         task[id] = nil
     else
         task = {}
@@ -1058,10 +1058,10 @@ function _M.clear_adv_hang(role, pms)
 end
 table.insert(helpDes, {"清海港贸易", "clear_sea", "id"})
-function _M.clear_radio(role, pms)
-	local id = pms.pm1
+function _M.clear_sea(role, pms)
+	local id = tonumber(pms.pm1)
 	local task = role:getProperty("seaport")
-    if id == 0 then
+    if id ~= 0 then
         task.collect[id] = nil
     else
         task.collect = {}
@@ -686,13 +686,17 @@ function _M.openTimeBoxRpc(agent, data)
 		local count, runeCount = 0, 0
 		for itemId, num in pairs(costs) do
 			local itemIdData = csvdb["itemCsv"][itemId]
-			if not itemIdData or not csvdb["item_randomCsv"][itemId] or costIdData.quality ~= itemIdData.quality then return 7 end
+			local itemRandomData =  csvdb["item_randomCsv"][itemId]
+			if not itemIdData or not itemRandomData or costIdData.quality ~= itemIdData.quality then return 7 end
-			if itemIdData.type == ItemType.Rune then runeCount = runeCount + num end
+            local itemRandomOccupy = role:getItemRandomOccupy(itemRandomData)
+			if next(itemRandomOccupy) then
+                runeCount = runeCount + (itemRandomOccupy[ItemOccupy.Rune] or 0) * num
+			end
 			count = count + num
 		end
-        if role:checkRuneFully(runeCount) then return 10 end --开箱子，如果铭文仓库已经满了则不让开箱
+        if role:checkRuneFully(runeCount) then return 10 end --开箱子，如果铭文仓库已经满了则不让开铭文箱
 		if role:getItemCount(costId) < count then return 8 end
 		if not role:checkItemEnough(costs) then return 9 end
@@ -886,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}})
@@ -932,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 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 taskData = csvdb["task_activeCsv"][taskType][taskId]
-	if not taskData then return 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()
@@ -970,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
@@ -1405,7 +1447,7 @@ function _M.goldBuyRpc(agent, data)
 	local maxCount = maxIdx + role:getBnousUpSpeedNum(UpSpeedType.GearUpSpeed)
 	if curT > maxCount then return end
 	if curT > maxIdx then
-		for idx = maxIdx+1, curCount do
+		for idx = maxIdx+1, curT do
 			costs[idx] = costs[maxIdx]
 		end
 	end
-Subproject commit 7e360667871839f748175e801bbb1ff39ba802ac
+Subproject commit 8f6460b1bc144989ece2f2caaf5c225ae434ac38
@@ -69,7 +69,7 @@ function Daily:refreshDailyData(notify)
 		elseif field == "id" then
             -- skip
 		elseif field == "treasureBase" then
-			dataMap[field] = globalCsv.idle_treasure_base
+			dataMap[field] = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
 		elseif field == "treasureList" then
 			dataMap[field] = self:getTreasrueList()
 		elseif field == "pvpBought" then
@@ -76,7 +76,6 @@ Role.schema = {
 	expireItem			= {"table", {}}, --物品过期检查
 	funcOpen			= {"table", {}}, --功能是否开放
 	funcLv				= {"table", {}}, --功能等级
-	levelBnous			= {"table", {}}, --等级奖励
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
 	crown				= {"number", 0},	-- 看伴娘
 	silent				= {"number", 0}, --禁言解禁时间
@@ -355,7 +354,6 @@ function Role:data()
 		items = self:getProperty("items"):toNumMap(),
 		funcOpen = self:getProperty("funcOpen"),
 		funcLv = self:getProperty("funcLv"),
-		levelBnous = self:getProperty("levelBnous"),
 		-- loveStatus = self:getProperty("loveStatus"):toNumMap(),
 		timeReset = self:getProperty("timeReset"),
 		diamond = self:getAllDiamond(),
@@ -284,7 +284,6 @@ function RolePlugin.bind(Role)
 				newExp = newExp - csvdb["player_expCsv"][level].exp
 				level = level + 1
 				self:checkTaskEnter("RoleLevelUp", {level = level})
-				self:getLevelBnous(level)
 			else
 				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
 			end
@@ -2760,146 +2759,161 @@ function RolePlugin.bind(Role)
 	function Role:getBnousCrusade(value)
 		local towerBnous = self:getTowerBnousActive()
-		local levelValue = self:getDeltaValue(self:getProperty("levelBnous")[SystemBnousType.CrusadeTask], value)
+		local levelBnous = self:getLevelBnous()
+
 		local towerValue = self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
+		local levelValue = self:getDeltaValue(levelBnous[SystemBnousType.CrusadeTask], value)
 		return levelValue + towerValue
 	end
 	function Role:getBnousDiner(type, value)
 		local towerBnous = self:getTowerBnousActive()
+		local levelBnous = self:getLevelBnous()
 		type = type or 1
 		local result, levelReault
 		if type == 1 then
 			result = towerBnous[SystemBnousType.DinerGet]
-			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerGet]
+			levelReault = levelBnous[SystemBnousType.DinerGet]
 		elseif type == 2 then
 			result = towerBnous[SystemBnousType.DinerLimit]
-			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerLimit]
+			levelReault = levelBnous[SystemBnousType.DinerLimit]
 		elseif type == 3 then
 			result = towerBnous[SystemBnousType.DinerSell]
-			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerSell]
+			levelReault = levelBnous[SystemBnousType.DinerSell]
 		elseif type == 4 then
 			result = towerBnous[SystemBnousType.DinerPrice]
-			levelReault = self:getProperty("levelBnous")[SystemBnousType.DinerPrice]
+			levelReault = levelBnous[SystemBnousType.DinerPrice]
 		end
 		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:getProperty("levelBnous")[SystemBnousType.Adv] or {}
-		appendBnous(towerBnous[SystemBnousType.Adv], levelBnous)
-		return towerBnous[SystemBnousType.Adv] or {}
+		local levelBnous = self:getLevelBnous()
+		local adv = levelBnous[SystemBnousType.Adv] or {}
+        return appendAdvBnous(towerBnous[SystemBnousType.Adv], adv)
 	end
 	function Role:getBnousHangTime()
 		local towerBnous = self:getTowerBnousActive()
-		local levelBnous = self:getProperty("levelBnous") or {}
-		local tmptime = 0
-		if next(levelBnous) then
-			tmptime = levelBnous[SystemBnousType.HangTime] or 0
-		end
+		local levelBnous = self:getLevelBnous()
+		local tmptime = levelBnous[SystemBnousType.HangTime] or 0
 		return towerBnous[SystemBnousType.HangTime] or 0 + tmptime
 	end
 	function Role:getBnousPvpTicket()
 		local towerBnous = self:getTowerBnousActive()
-		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.PvpTicket] or {}
-		appendBnous(towerBnous[SystemBnousType.PvpTicket], levelBnous)
-		return towerBnous[SystemBnousType.PvpTicket] or {}
+		local levelBnous = self:getLevelBnous()
+		local pvpTicket = levelBnous[SystemBnousType.PvpTicket] or {}
+		return appendTableBnous(towerBnous[SystemBnousType.PvpTicket], pvpTicket)
 	end
 	function Role:getBnousSweep()
 		local towerBnous = self:getTowerBnousActive()
-		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.SweepReward] or {}
-		appendBnous(towerBnous[SystemBnousType.SweepReward], levelBnous)
-		return towerBnous[SystemBnousType.SweepReward] or {}
+		local levelBnous = self:getLevelBnous()
+		local sweepReward = levelBnous[SystemBnousType.SweepReward] or {}
+		return appendTableBnous(towerBnous[SystemBnousType.SweepReward], sweepReward)
 	end
 	function Role:getBnousDismantlingMaximum()
-		return self:getProperty("levelBnous")[SystemBnousType.DismantlingMaximum] or 0
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.DismantlingMaximum] or 0
 	end
 	function Role:getBnousDismantlingImproved(value)
-		local result = self:getProperty("levelBnous")[SystemBnousType.DismantlingImproved] or {}
+		local levelBnous = self:getLevelBnous()
+		local result = levelBnous[SystemBnousType.DismantlingImproved] or {}
 		return self:getDeltaValue(result, value)
 	end
 	function Role:getBnousDaily()
+		local levelBnous = self:getLevelBnous()
+		local dailyReward =  levelBnous[SystemBnousType.DailyReward] or {}
 		local reward = {}
-		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.DailyReward] or {}
-		for k, v in pairs(levelBnous) do
+		for k, v in pairs(dailyReward) do
 			reward[k] = (reward[k] or 0) + v
 		end
 		return reward
 	end
 	function Role:getBnousTreasureBaseMaximum()
-		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.TreasureBaseMaximum] or 0
-		local treasureBase = self.dailyData:getProperty("treasureBase") + levelBnous
-		self.dailyData:updateProperty({field = "treasureBase", value = treasureBase})
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.TreasureBaseMaximum] or 0
 	end
 	--@upType 加速类型 1探索加速, 2齿轮加速, 3餐厅加速
 	function Role:getBnousUpSpeedNum(upType)
-		local levelBnous = self:getProperty("levelBnous")[SystemBnousType.UpSpeedNum] or {}
-		if next(levelBnous) then
-			return levelBnous[upType] or 0
-		end
-		return 0
+		local levelBnous = self:getLevelBnous()
+		local upSpeedNum =  levelBnous[SystemBnousType.UpSpeedNum] or {}
+		return upSpeedNum[upType] or 0
 	end
 	function Role:getBnousChangeBaseCount()
-		return self:getProperty("levelBnous")[SystemBnousType.ChangeBaseCount] or 0
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.ChangeBaseCount] or 0
 	end
 	function Role:getBnousChangeBuyCount()
-		return self:getProperty("levelBnous")[SystemBnousType.ChangeBuyCount] or 0
-	end
-
-	function Role:getLevelBnous(level)
-		local levelBnous = self:getProperty("levelBnous")
-		local additionData = csvdb["level_additionCsv"][level]
-		if additionData then
-			local effects = additionData.effect:toTableArraySec()
-			for _, effect in pairs(effects) do
-				local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
-				if not levelBnous[pm1] then
-					levelBnous[pm1] = {}
-				end
-				if pm1 == SystemBnousType.TowerBuff then
-
-				elseif pm1 == SystemBnousType.Adv then
-					if not levelBnous[pm1][pm4] then
-						levelBnous[pm1][pm4] = {}
+		local levelBnous = self:getLevelBnous()
+		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
+	end
+
+	function Role:getLevelBnous()
+		local levelBnous = {}
+        local curLevel = self:getProperty("level")
+		for  level, additionData in pairs(csvdb["level_additionCsv"]) do
+			if level > curLevel then return levelBnous end
+			if additionData then
+				local effects = additionData.effect:toTableArraySec()
+				for _, effect in pairs(effects) do
+					local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
+					if not levelBnous[pm1] then
+						levelBnous[pm1] = {}
 					end
-					levelBnous[pm1][pm4][pm2] = (levelBnous[pm1][pm4][pm2] or 0) + pm3
-				elseif pm1 == SystemBnousType.HangTime or
-						pm1 == SystemBnousType.DismantlingMaximum or
-						pm1 == SystemBnousType.TreasureBaseMaximum or
-						pm1 == SystemBnousType.ChangeBaseCount or
-						pm1 == SystemBnousType.ChangeBuyCount  then
-					if type(levelBnous[pm1]) == "table" then
-						levelBnous[pm1] = 0
+					if pm1 == SystemBnousType.TowerBuff then
+
+					elseif pm1 == SystemBnousType.Adv then
+						if not levelBnous[pm1][pm4] then
+							levelBnous[pm1][pm4] = {}
+						end
+						levelBnous[pm1][pm4][pm2] = (levelBnous[pm1][pm4][pm2] or 0) + pm3
+					elseif pm1 == SystemBnousType.HangTime or
+							pm1 == SystemBnousType.DismantlingMaximum or
+							pm1 == SystemBnousType.TreasureBaseMaximum or
+							pm1 == SystemBnousType.ChangeBaseCount or
+							pm1 == SystemBnousType.ChangeBuyCount  then
+						if type(levelBnous[pm1]) == "table" then
+							levelBnous[pm1] = 0
+						end
+						levelBnous[pm1] = levelBnous[pm1] + pm2
+					else
+						levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
 					end
-					levelBnous[pm1] = levelBnous[pm1] + pm2
-				else
-					levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
 				end
 			end
 		end
-		self:updateProperty({field = "levelBnous", value= levelBnous})
 		return levelBnous
 	end
@@ -2934,11 +2948,13 @@ function RolePlugin.bind(Role)
         self:mylog("hero_action", {desc = desc, int1 = heroType})
     end
-    function Role:getRuneBatCount()
+    function Role:getRuneBagCount()
 		local count = 0
         for _, rune in pairs(self.runeBag) do
 			if next(rune) then
-				count = count + 1
+				if rune:getProperty("refer") == 0 then
+					count = count + 1
+				end
 			end
         end
 		return count or 0
@@ -2947,13 +2963,28 @@ function RolePlugin.bind(Role)
 	-- 铭文仓库是否满仓
 	function Role:checkRuneFully(count)
 		count = count or 0
+		if count == 0 then return false end
+
 		local page = globalCsv.store_type[ItemType.Rune]
 		local limit = self:getProperty("bagLimit")[page]
-        return self:getRuneBatCount() + count > limit
+        return self:getRuneBagCount() + count > limit
+	end
+
+   local function checkHasRuneByReward(reward)
+		reward = reward or {}
+		for itemId, _ in pairs(reward) do
+			local itemData = csvdb["itemCsv"][itemId]
+			if itemData and itemData.type == ItemType.Rune then
+				return true
+			end
+		end
+		return false
 	end
 	function Role:checkRuneFullyByReward(reward)
-		local count = self:getRuneBatCount()
+		if not checkHasRuneByReward(reward) then return false end
+
+		local count = self:getRuneBagCount()
 		local page = globalCsv.store_type[ItemType.Rune]
 		local limit = self:getProperty("bagLimit")[page]
 		if count >= limit then
@@ -2972,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
@@ -3001,6 +3032,16 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:getItemRandomOccupy(itemRandomData)
+        local itemRandomOccupy = {}
+		if itemRandomData then
+			for typ, n in pairs(itemRandomData.ware:toNumMap() or {}) do
+				itemRandomOccupy[typ] = n
+			end
+		end
+		return itemRandomOccupy
+	end
+
 end
@@ -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