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

liuzujun
2 parents 3d8468b2 18478207
Showing 6 changed files with 99 additions and 56 deletions Show diff stats
src/actions/SeaportAction.lua
src/actions/TowerAction.lua
src/models/Diner.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/services/globald.lua
@@ -26,25 +26,41 @@ function _M.donateRpc(agent, data)
 	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 DonateCsv[phase] or not DonateCsv[phase][id] then return 2 end
+	if not DonateCsv[phase] or not DonateCsv[phase][id] then return 2 end
-	local data = DonateCsv[phase][id]
-	local needs = data.need_item:toArray("=",true)
+	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 = data.award:toNumMap()
+	local rewards = ddata.award:toNumMap()
 	for id, value in pairs(rewards) do
 		rewards[id] = value * group
 	end
-	local rediskey = {SEAPORT_TRADE_TASK_1,SEAPORT_TRADE_TASK_2}
-	redisproxy:hincrby(rediskey[phase],id,itemCount)
+	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 = data.phase, int2 = data.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})
@@ -123,19 +139,27 @@ function _M.taskRpc(agent, data)
 	if not TaskCsv[taskId] or not TaskCsv[taskId][level] then return 1 end
 	local reward, change = {}, {}
+	local heroFaithMap = {}
 	local seaport = role:getProperty("seaport")
 	local data = TaskCsv[taskId][level]
+	if data.phase == 2 then
+		local openTime = tonumber(redisproxy:hget("autoincrement_set", "seaportTime0")) or 0
+		local nowTime = skynet.timex()
+		if nowTime < (openTime + 86400) or nowTime > (openTime + 172800) then return 9 end
+	end
+
 	if oper == 1 then -- 开始委托
 		if team == "" then return 3 end
 		local conditions = data.condition:toTableArray(true)
-		local heros = team:toNumMap()
+		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 end
+				if not hero then return 8 end
 				if conds[1] == 1 then
 					if hero:getProperty("level") >= conds[2] then
@@ -169,7 +193,7 @@ function _M.taskRpc(agent, data)
 		end
 		local quick = msg.quick
 		local endTime = data.time + collect.time
-		local remainT = skynet.timex() - endTime
+		local remainT = endTime - skynet.timex()
 		if not quick and remainT > 0 then return 6 end
 		if quick and remainT > 0 then
@@ -180,15 +204,15 @@ function _M.taskRpc(agent, data)
 		local carbonCsv = csvdb["idle_battleCsv"]
 		local expCarbonId = role:getProperty("hangInfo").expCarbonId
-		local coidCarbonId = role:getProperty("hangInfo").carbonId
-		if not carbonCsv[expCarbonId] or not expCarbonId[coidCarbonId] then return 7 end
+		if not carbonCsv[expCarbonId] then return 7 end
 		local totalCoef = 0
-	    for _, heroId in ipairs(collect.team:toNumMap()) do
+	    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)
+	            heroFaithMap[heroId] = hero:getProperty("faith")
 	        end
     	end
@@ -198,8 +222,8 @@ function _M.taskRpc(agent, data)
 	        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 money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
+		local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.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
@@ -219,7 +243,10 @@ function _M.taskRpc(agent, data)
 	role:updateProperty({field = "seaport", value = seaport})
-	SendPacket(actionCodes.Seaport_taskRpc, MsgPack.pack(role:packReward(reward, change)))
+	local result = role:packReward(reward, change)
+	result["heroFaith"] = heroFaithMap
+
+	SendPacket(actionCodes.Seaport_taskRpc, MsgPack.pack(result))
 	return true
 end
@@ -229,33 +256,40 @@ function _M.shopRpc(agent, data)
 	local id = msg.id or 0
 	local count = msg.count or 1
-	local seaport = role:getProperty{"seaport"}
-	local shop = seaport.shop or {}
-
-	if (shop[id] or 0) >= data.limit then return 1 end
-
 	local shopCsv = {}
 	local dataSet = csvdb["shop_normalCsv"]
-	for _, data in pairs(dataSet) do
-		if data.shop == 5 then
-			shopCsv[data.id] = data
+	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 {}
-	local data = shopCsv[id]
-	if not data then return 2 end
+	if (shop[id] or 0) >= sdata.limit then return 1 end
-	if role:getItemCount(data.icon) < data.cost * count then return 3 end
+	
+
+	
-	role:costItems({[data.icon] = data.cost * count}, {log = {desc = "seaportShop", int1 = id, int2 = count}})
+	if role:getItemCount(sdata.icon) < sdata.cost * count then return 3 end
-	local itemReward = data.gift:toNumMap()
+	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)))
@@ -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", {level = towerInfo.l})
+		end
 	end
 	if towerType == 0 then
@@ -193,10 +193,6 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	local addReward = {}
 	for key, value in pairs(dishData.item_normal:toNumMap()) do
 		addReward[key] = (addReward[key] or 0) + value * delta
-		if key == ItemId.Gold then
-			local goldPriceAdd = self.owner:getBnousDiner(4,value)
-			addReward[key] = addReward[key] + goldPriceAdd * delta
-		end
 	end
 	popular = dishData.famous_normal * delta
@@ -234,10 +230,16 @@ function Diner:calSellReward(sell, delta, dishData, isExpedite)
 	end
 	upValue[-1] = (upValue[-1] or 0) + collectAdd
+	-- 电波塔加成
+	local goldCount = self.owner:getBnousDiner(4,addReward[ItemId.Gold])
+
 	for id, count in pairs(addReward) do
 		addReward[id] = math.floor(count * (1 + (upValue[id] or 0) / 100))
 		reward = reward:incrv(id, addReward[id])
 	end
+
+	reward = reward:incrv(ItemId.Gold, goldCount)
+
 	popular = math.floor(popular * (1 + (upValue[-1] or 0) / 100))
 	return reward, popular
@@ -1351,8 +1351,8 @@ function RolePlugin.bind(Role)
 					end
 					if done then
 						update = true
-						self:award(data.phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
-						donate[id] = 1
+						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
@@ -1386,7 +1386,6 @@ function RolePlugin.bind(Role)
 				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
@@ -1397,10 +1396,10 @@ function RolePlugin.bind(Role)
 						local teams = collect[slot].team
 						local time = collect[slot].time
 						if time + data.time <= endTime then
-							if not carbonCsv[expCarbonId] or not expCarbonId[coidCarbonId] then return 7 end
+							if not carbonCsv[expCarbonId] then break end
 							local totalCoef = 0
-						    for _, heroId in ipairs(teams:toNumMap()) do
+						    for _, heroId in ipairs(teams:toArray(true,"=")) do
 						        local hero = self.heros[heroId]
 						        if hero then
 						            totalCoef = totalCoef + getHeroCoef(hero, data.success)
@@ -1414,8 +1413,8 @@ function RolePlugin.bind(Role)
 						        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 money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
+							local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.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
@@ -1441,7 +1440,7 @@ function RolePlugin.bind(Role)
 						donate = {}
 					}
 				end
-				self:setProperty("seaport",seaport)
+				self:updateProperty({field = "seaport", value = seaport})
 			end
 		end
@@ -1468,9 +1467,9 @@ function RolePlugin.bind(Role)
 				end
 			end)
 			result[idx] = {}
-			for i,v in ipairs(temp) do
+			for i,v in pairs(temp) do
 				if v then
-					result[idx][i] = v
+					result[idx][i] = tonumber(v)
 				end
 			end
 		end
@@ -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,
@@ -155,22 +155,27 @@ end
 -- @desc: 检查海港贸易开启、关闭
 local function check_trade_seaport_status()
-	local delta = 1615579200 + 1000
-	local nowTime = delta or skynet.timex()
+	local nowTime = skynet.timex()
 	local nextTime = dayLater(nowTime)
-	local interval = nextTime - nowTime + 1
+	local interval = 100 * (nextTime - nowTime + 1)
 	local curTm = os.date("*t", nowTime)
-	if curTm.wday == 7 and curTm.hour == 4 then
-		redisproxy:hset("autoincrement_set", "seaportTime0", nowTime)
-		redisproxy:hset("autoincrement_set", "seaportTime1", 1)
-		redisproxy:del(SEAPORT_TRADE_TASK_1)
-		redisproxy:del(SEAPORT_TRADE_TASK_2)
+	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
-		redisproxy:hset("autoincrement_set", "seaportTime2", 1)
+	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
+	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)