Merge branch 'tr/bugfix' into tr/publish/preview

熊润斐
2 parents 0d8a89ca e084cd2b
Showing 10 changed files with 501 additions and 4 deletions Show diff stats
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/RoleAction.lua
src/actions/SeaportAction.lua
src/actions/TowerAction.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/services/globald.lua
@@ -241,6 +241,13 @@ actionCodes = {
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
 	Radio_cancelQuestRpc = 702,
+
+	Seaport_getServerProcessRpc = 750,
+	Seaport_donateRpc = 751,
+	Seaport_donateRewardRpc = 752,
+	Seaport_taskRpc = 753,
+	Seaport_shopRpc = 754,
+	Seaport_resetRpc = 755,
 }
 rpcResponseBegin = 10000
@@ -49,8 +49,8 @@ RANK_PVP_HIGHT 	= &quot;rank:pvph&quot;
 RANK_PVP_HIGHT_KEY 	= {"rank:pvph1", "rank:pvph2"}
 RECORD_PVP_HIGH = "record:pvph:%d"
-
-
+SEAPORT_TRADE_TASK_1 = "seaport:task1"
+SEAPORT_TRADE_TASK_2 = "seaport:task2"
 FRIEND_KEY = "role:%d:friend"	--哈希表 好友
 FRIEND_APPLY_KEY = "role:%d:apply"	-- sort set 申请列表
@@ -159,6 +159,7 @@ function _M.loginRpc( agent, data )
 	role:changeStructVersion() -- 数据结构 版本更新
 	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
+	role:checkSeaportTrade() -- 检查海港贸易季活动
 	-- 跨天登陆事件
 	local resetMode = role:updateTimeReset(now)
@@ -0,0 +1,296 @@
+local ipairs = ipairs
+local table = table
+local math = math
+local redisproxy = redisproxy
+local MsgPack = MsgPack
+
+local _M = {}
+
+function _M.getServerProcessRpc(agent, data)
+	local role = agent.role
+	local result = role:getSeaportServerProgress()
+
+	SendPacket(actionCodes.Seaport_getServerProcessRpc, MsgPack.pack(result))
+	return true
+end
+
+function _M.donateRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	
+	local phase = msg.phase or 0
+	local id = msg.id or 0
+	local itemId = msg.itemId or 0
+	local itemCount = msg.count or 0
+
+	if itemId == 0 or itemCount == 0 then return 0 end
+	if role:getItemCount(itemId) < itemCount then return 1 end
+	local DonateCsv = csvdb["seaport_purchaseCsv"]
+	if not DonateCsv[phase] or not DonateCsv[phase][id] then return 2 end
+
+	local ddata = DonateCsv[phase][id]
+	local needs = ddata.need_item:toArray(true,"=")
+	if itemId ~= needs[1] then return 3 end
+	if itemCount % needs[2] ~= 0 then return 4 end
+
+	local group = itemCount / needs[2]
+	local rewards = ddata.award:toNumMap()
+
+	for id, value in pairs(rewards) do
+		rewards[id] = value * group
+	end
+
+	if phase == 1 then
+		local old = tonumber(redisproxy:hget(SEAPORT_TRADE_TASK_1,id)) or 0
+		local need = ddata.need_num - old
+		if need >= itemCount then
+			redisproxy:hincrby(SEAPORT_TRADE_TASK_1,id,itemCount)
+		else
+			redisproxy:hincrby(SEAPORT_TRADE_TASK_1,id,need)
+			for _, temp in pairs(DonateCsv[2]) do
+				local items = temp.need_item:toArray(true,"=")
+				if items[1] == itemId then
+					redisproxy:hincrby(SEAPORT_TRADE_TASK_2,temp.id,itemCount - need)
+					break
+				end
+			end
+		end
+	else
+		redisproxy:hincrby(SEAPORT_TRADE_TASK_2,id,itemCount)
+	end
+
+	role:costItems({[itemId] = itemCount}, {log = {desc = "seaportDonate", int1 = phase, int2 = id}})
+	local reward, change = role:award(rewards, {log = {desc = "seaportDonate", int1 = ddata.phase, int2 = ddata.id}})
+
+	role:mylog("role_action", {desc = "seaportDonate", int1 = itemId, int2 = itemCount})
+
+	SendPacket(actionCodes.Seaport_donateRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.donateRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local id = msg.id
+	local dataCsv = csvdb["seaport_purchaseCsv"]
+	if not dataCsv[id] then return 0 end
+
+	local seaport = role:getProperty("seaport") or {}
+	local donate = seaport.donate or {}
+	if donate[id] then return 3 end
+
+	local data = dataCsv[id][1]
+
+	local result = role:getSeaportServerProgress()
+	if not result[id] then return 1 end
+
+	for _, tempData in ipairs(dataCsv[id]) do
+		if tempData.need_num > (result[id][tempData.id] or 0) then
+			return 2
+		end
+	end
+
+	donate[id] = 1
+	seaport.donate = donate
+
+	local reward, change = role:award(data.phase_award, {log = {desc = "seaportReward", int1 = data.phase, int2 = data.id}})
+
+	role:updateProperty({field = "seaport", value = seaport})
+	SendPacket(actionCodes.Seaport_donateRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+-- 获取英雄大成功率
+local function getHeroCoef(hero, condition)
+    -- 基础概率
+    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
+    local rare = hero:getRare()
+    local result = 0
+    for _, it in ipairs(condition:toTableArray(true)) do
+        local type = it[1]
+        local value = it[2]
+        local add = it[3]
+        if type == 1 then   -- 种族加成
+            if hero:getCamp() == value then
+                result = result + add
+            end
+        elseif type == 2 then   -- 定位加成
+            if hero:getPosition() == value then
+                result = result + add
+            end
+        end
+    end
+
+    return result + (rareMap[rare] or 0)
+end
+
+function _M.taskRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+
+	local oper = msg.oper or 0
+	local team = msg.team or ""
+	local taskId = msg.id or 0
+	local level = msg.level or 0
+
+	if oper == 0 then return 0 end
+	local TaskCsv = csvdb["seaport_taskCsv"]
+	if not TaskCsv[taskId] or not TaskCsv[taskId][level] then return 1 end
+
+	local reward, change = {}, {}
+	local seaport = role:getProperty("seaport")
+
+	local data = TaskCsv[taskId][level]
+	if oper == 1 then -- 开始委托
+		if team == "" then return 3 end
+		local conditions = data.condition:toTableArray(true)
+		local heros = team:toArray(true,"=")
+		if not next(heros) then return 8 end
+		local UnitCsv = csvdb["unitCsv"]
+		for _, conds in pairs(conditions) do
+			local count = 0
+			for _, heroId in pairs(heros) do
+				local hero = role.heros[heroId]
+				if not hero then return 8 end
+
+				if conds[1] == 1 then
+					if hero:getProperty("level") >= conds[2] then
+						count = count + 1
+					end
+				elseif conds[1] == 2 then
+					if UnitCsv[hero:getProperty("type")].rare >= conds[2] then
+						count = count + 1
+					end
+				elseif conds[1] == 3 then
+					count = count + 1
+				end
+			end
+			if count < conds[#conds] then
+				return 4
+			end
+		end
+
+		local collect = seaport.collect or {}
+		collect[taskId] = {}
+		collect[taskId].time = skynet.timex()
+		collect[taskId].level = level
+		collect[taskId].team = team
+
+		seaport.collect = collect
+	elseif oper == 2 then -- 领取委托奖励
+		local collects = seaport.collect or {}
+		local collect = collects[taskId] or {}
+		if not next(collects) or not next(collect) then
+			return 5
+		end
+		local quick = msg.quick
+		local endTime = data.time + collect.time
+		local remainT = endTime - skynet.timex()
+		if not quick and remainT > 0 then return 6 end
+
+		if quick and remainT > 0 then
+			local cost = math.ceil(remainT / 3600) * globalCsv.seaport_task_quick
+			if not role:checkItemEnough({[ItemId.Diamond] = cost}) then return 8 end
+			role:costItems({[ItemId.Diamond] = cost}, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
+		end
+
+		local carbonCsv = csvdb["idle_battleCsv"]
+		local expCarbonId = role:getProperty("hangInfo").expCarbonId
+		local coidCarbonId = role:getProperty("hangInfo").carbonId
+		if not carbonCsv[expCarbonId] or not carbonCsv[coidCarbonId] then return 7 end
+
+		local totalCoef = 0
+	    for _, heroId in ipairs(collect.team:toArray(true,"=")) do
+	        local hero = role.heros[heroId]
+	        if hero then
+	            totalCoef = totalCoef + getHeroCoef(hero, data.success)
+	            hero:addHeroFaith(data.trust)
+	        end
+    	end
+
+		local bigSuccess = false
+	    local result = math.randomInt(0, 100)
+	    if result < totalCoef then
+	        bigSuccess = true
+	    end
+
+		local money = math.ceil(carbonCsv[coidCarbonId].money / 5 * data.time * carbonCsv[coidCarbonId].money_clear)
+		local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * carbonCsv[expCarbonId].exp_clear)
+		local itemReward = data.item_clear_special:toNumMap()
+		itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+    
+		if bigSuccess then
+	        for key, value in pairs(itemReward) do
+	            itemReward[key] = math.ceil(1.5 * value)
+	        end
+	    end
+
+	    reward, change = role:award(itemReward, {log = {desc = "seaportTask", int1 = taskId, int2 = level}})
+
+		seaport.collect[taskId] = nil
+	else
+		return 0
+	end
+
+	role:updateProperty({field = "seaport", value = seaport})
+
+	SendPacket(actionCodes.Seaport_taskRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.shopRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local id = msg.id or 0
+	local count = msg.count or 1
+
+	local shopCsv = {}
+	local dataSet = csvdb["shop_normalCsv"]
+	for _, datat in pairs(dataSet) do
+		if datat.shop == 5 then
+			shopCsv[datat.id] = datat
+		end
+	end
+	local sdata = shopCsv[id]
+	
+	if not sdata then return 2 end
+
+	local seaport = role:getProperty("seaport")
+	local shop = seaport.shop or {}
+
+	if (shop[id] or 0) >= sdata.limit then return 1 end
+
+	
+
+	
+
+	if role:getItemCount(sdata.icon) < sdata.cost * count then return 3 end
+
+	role:costItems({[sdata.icon] = sdata.cost * count}, {log = {desc = "seaportShop", int1 = id, int2 = count}})
+
+	local itemReward = sdata.gift:toNumMap()
+	for itemId, value in pairs(itemReward) do
+		itemReward[itemId] = value * count
+	end
+
+	local reward, change = role:award(itemReward, {log = {desc = "seaportShop", int1 = id, int2 = count}})
+
+	shop[id] = (shop[id] or 0) + count
+	seaport.shop = shop
+
+	role:updateProperty({field = "seaport", value = seaport})
+
+	SendPacket(actionCodes.Seaport_shopRpc, MsgPack.pack(role:packReward(reward, change)))
+	return true
+end
+
+function _M.resetRpc(agent, data)
+	local role = agent.role
+	role:checkSeaportTrade()
+	SendPacket(actionCodes.Seaport_resetRpc, MsgPack.pack(""))
+	return true
+end
+
+return _M
@@ -109,7 +109,9 @@ function _M.endBattleRpc(agent, data)
 		curLevel = curLevel + 1
 		reward, change = role:award(curTower.reward, {log = {desc = "towerBattle", int1 = id}})
-		role:checkTaskEnter("TowerPass", {count = 1, type = towerType + 1})
+		if towerType == 0 then
+			role:checkTaskEnter("TowerPass", {count = towerInfo.l})
+		end
 	end
 	if towerType == 0 then
@@ -188,6 +188,8 @@ Role.schema = {
 	calTask				= {"table", {}}, -- 英雄令活动 日历任务活动
 	bcTask				= {"table", {}}, -- 英雄令活动 日历任务活动 临时使用
 	radioTask			= {"table", {}}, -- 电台任务 {id = {time=end_ts,heros=heros}}	表crusadeCsv
+
+	seaport 			= {"table", {}}, -- 海岛贸易季 {time = 1234567890, donate = {}, collect = {[1] = {team = "1=2=3", time = 1234567890}}, shop = {}}
 }
@@ -418,6 +420,8 @@ function Role:data()
 		calTask = self:getProperty("calTask"),
 		bcTask = self:getProperty("bcTask"),
 		radioTask = self:getProperty("radioTask"),
+
+		seaport = self:getProperty("seaport"),
 	}
 end
@@ -135,6 +135,11 @@ local ItemReason = {
 	--adv
 	chooseEvent = 1351, -- 冒险选择
 	clickTrader = 1352, -- 冒险商店
+
+	seaportDonate = 1400, -- 贸易港捐赠
+	seaportShop = 1401, -- 贸易港商店兑换
+	seaportReward = 1402, -- 贸易港阶段奖励
+	seaportTask = 1403, -- 贸易港任务奖励
 }
@@ -1208,6 +1208,157 @@ function RolePlugin.bind(Role)
 		end
 	end
+	-- 结算上期海港贸易季
+	function Role:checkSeaportTrade()
+		local openTime0 = tonum(redisproxy:hget("autoincrement_set", "seaportTime0") or 0)
+		local openTime1 = tonum(redisproxy:hget("autoincrement_set", "seaportTime1") or 0)
+		local openTime2 = tonum(redisproxy:hget("autoincrement_set", "seaportTime2") or 0)
+		local seaport = self:getProperty("seaport") or {}
+		local oldTime = seaport.time or 0
+		local update = false
+
+		local function getReward(reset)
+			-- 全服捐赠奖励
+			local donate = seaport.donate or {}
+			if not reset and (not donate[1] or not donate[2]) then
+				local result = self:getSeaportServerProgress()
+				local seaportCsv = csvdb["seaport_purchaseCsv"]
+				for idx, set in ipairs(seaportCsv) do
+					local done = true
+					for id, data in ipairs(set) do
+						if donate[id] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
+							done = false
+							break
+						end
+					end
+					if done then
+						update = true
+						self:award(set[1].phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
+						donate[idx] = 1
+					end
+				end
+				seaport.donate = donate
+			end
+
+			-- 委托任务的奖励
+			local collect = seaport.collect or {}
+			if next(collect) then
+				local function getHeroCoef(hero, condition)
+				    -- 基础概率
+				    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
+				    local rare = hero:getRare()
+				    local result = 0
+				    for _, it in ipairs(condition:toTableArray(true)) do
+				        local type = it[1]
+				        local value = it[2]
+				        local add = it[3]
+				        if type == 1 then   -- 种族加成
+				            if hero:getCamp() == value then
+				                result = result + add
+				            end
+				        elseif type == 2 then   -- 定位加成
+				            if hero:getPosition() == value then
+				                result = result + add
+				            end
+				        end
+				    end
+
+				    return result + (rareMap[rare] or 0)
+				end
+
+				local carbonCsv = csvdb["idle_battleCsv"]
+				local expCarbonId = self:getProperty("hangInfo").expCarbonId
+				local coidCarbonId = self:getProperty("hangInfo").carbonId
+				local taskCsv = csvdb["seaport_taskCsv"]
+				local endTime = openTime0 + 86400 * 2
+				for slot, set in pairs(taskCsv) do
+					if collect[slot] then
+						update = true
+						local level = collect[slot].level
+						local data = set[level]
+						local teams = collect[slot].team
+						local time = collect[slot].time
+						if time + data.time <= endTime then
+							if not carbonCsv[expCarbonId] or not carbonCsv[coidCarbonId] then break end
+
+							local totalCoef = 0
+						    for _, heroId in ipairs(teams:toArray(true,"=")) do
+						        local hero = self.heros[heroId]
+						        if hero then
+						            totalCoef = totalCoef + getHeroCoef(hero, data.success)
+						            hero:addHeroFaith(data.trust)
+						        end
+					    	end
+
+							local bigSuccess = false
+						    local result = math.randomInt(0, 100)
+						    if result < totalCoef then
+						        bigSuccess = true
+						    end
+
+							local money = math.ceil(carbonCsv[coidCarbonId].money / 5 * data.time * carbonCsv[coidCarbonId].money_clear)
+							local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * carbonCsv[expCarbonId].exp_clear)
+							local itemReward = data.item_clear_special:toNumMap()
+							itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
+					    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
+					    
+							if bigSuccess then
+						        for key, value in pairs(itemReward) do
+						            itemReward[key] = math.ceil(1.5 * value)
+						        end
+						    end
+							self:award(itemReward, {log = {desc = "seaportTask", int1 = slot, int2 = level}})
+						end
+					end
+				end
+			end
+			seaport.collect = {}
+
+			if update or reset then
+				if reset then
+					seaport = {
+						time = openTime0,
+						shop = {},
+						collect = {},
+						donate = {}
+					}
+				end
+				self:updateProperty({field = "seaport", value = seaport})
+			end
+		end
+		
+		if oldTime == openTime0 then
+			if openTime1 == 1 or openTime2 == 1 then
+				return
+			end
+			getReward()
+		else
+			getReward(true)
+		end
+	end
+
+	function Role:getSeaportServerProgress()
+		local result = {}
+
+		local dataCsv = csvdb["seaport_purchaseCsv"]
+		local rediskey = {SEAPORT_TRADE_TASK_1,SEAPORT_TRADE_TASK_2}
+		for idx, set in ipairs(dataCsv) do
+			local temp = {}
+			temp = redisproxy:pipelining(function (red)
+				for id, data in ipairs(set) do
+					red:hget(rediskey[idx], id)
+				end
+			end)
+			result[idx] = {}
+			for i,v in ipairs(temp) do
+				if v then
+					result[idx][i] = tonumber(v)
+				end
+			end
+		end
+		return result
+	end
+
 	-- 获得激活的冒险效果
 	function Role:getAdvActiveSupportEffect()
 		local effect = {}
@@ -191,7 +191,7 @@ local AchievListener = {
 		[TaskType.OverOderTask] = {{14}},
 		[TaskType.FoodSellGold] = {{15, f("count")}},
 		[TaskType.DinerPopular] = {{16, f("count")}},
-		[TaskType.TowerPass] = {{17, f("count"), f("type")}},
+		[TaskType.TowerPass] = {{17, f("level")}},
 		[TaskType.OpenBox] = {{18, f("count")}},
 		[TaskType.DinerLevelUp] = {{19, f("level"), f("type")}},
 		[TaskType.DinerTalentUp] = {{20, 1, f("type")}},
@@ -493,6 +493,7 @@ function RoleTask.bind(Role)
 			[6] = true,
 			[7] = true,
 			[16] = true,
+			[17] = true,
 			[19] = true,
 			[22] = true,
 			[23] = true,
@@ -153,7 +153,36 @@ local function check_battle_act_close()
 	skynet.timeout(CHECK_BATTLE_ACT_CLOSE_INTERVAL, check_battle_act_close)
 end
+-- @desc: 检查海港贸易开启、关闭
+local function check_trade_seaport_status()
+	local nowTime = skynet.timex()
+	local nextTime = dayLater(nowTime)
+	local interval = 100 * (nextTime - nowTime + 1)
+
+	local curTm = os.date("*t", nowTime)
+	if curTm.wday == 7 and curTm.hour >= 4 then -- 周六
+		local oldTime = tonumber(redisproxy:hget("autoincrement_set", "seaportTime0")) or 0
+		local cur4Time = specTime({hour = 4},nowTime)
+		if cur4Time ~= oldTime then
+			redisproxy:hset("autoincrement_set", "seaportTime0", cur4Time)
+			redisproxy:hset("autoincrement_set", "seaportTime1", 1)
+			redisproxy:del(SEAPORT_TRADE_TASK_1)
+			redisproxy:del(SEAPORT_TRADE_TASK_2)
+		end
+	end
+	if curTm.wday == 1 and curTm.hour >= 4 then -- 周日
+		if (tonumber(redisproxy:hget("autoincrement_set", "seaportTime1")) or 0) == 1 then
+			redisproxy:hset("autoincrement_set", "seaportTime2", 1)
+		end
+	end
+	if curTm.wday == 2 and curTm.hour >= 4 then -- 周一
+		-- redisproxy:hset("autoincrement_set", "seaportTime0", 0)
+		redisproxy:hset("autoincrement_set", "seaportTime1", 0)
+		redisproxy:hset("autoincrement_set", "seaportTime2", 0)
+	end
+	skynet.timeout(interval, check_trade_seaport_status)
+end
 local CMD = {}
@@ -178,6 +207,7 @@ end
 function CMD.start()
 	check_mail_queue()
 	--check_battle_act_close()
+	check_trade_seaport_status()
 end
 local function __init__()