Merge branch 'tr/develop' into tr/bugfix-qa

熊润斐
2 parents 15127116 18478207
Showing 3 changed files with 12 additions and 7 deletions Show diff stats
src/actions/SeaportAction.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
@@ -139,6 +139,7 @@ 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]
@@ -211,6 +212,7 @@ function _M.taskRpc(agent, data)
 	        if hero then
 	            totalCoef = totalCoef + getHeroCoef(hero, data.success)
 	            hero:addHeroFaith(data.trust)
+	            heroFaithMap[heroId] = hero:getProperty("faith")
 	        end
     	end
@@ -241,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
@@ -1268,7 +1268,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
@@ -1279,7 +1278,7 @@ 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 carbonCsv[coidCarbonId] then break end
+							if not carbonCsv[expCarbonId] then break end
 							local totalCoef = 0
 						    for _, heroId in ipairs(teams:toArray(true,"=")) do
@@ -1296,8 +1295,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
@@ -1350,7 +1349,7 @@ 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] = tonumber(v)
 				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,