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

chenyueqi
2 parents 670e4d84 15127116
Showing 1 changed file with 9 additions and 4 deletions Show diff stats
src/actions/SeaportAction.lua
@@ -142,6 +142,12 @@ function _M.taskRpc(agent, data)
 	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)
@@ -197,8 +203,7 @@ 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 carbonCsv[coidCarbonId] then return 7 end
+		if not carbonCsv[expCarbonId] then return 7 end
  
 		local totalCoef = 0
 	    for _, heroId in ipairs(collect.team:toArray(true,"=")) do
@@ -215,8 +220,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