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

熊润斐
2 parents d9d63fa0 39aebe0b
Showing 2 changed files with 6 additions and 7 deletions Show diff stats
src/actions/ActivityAction.lua
src/models/RoleTimeReset.lua
@@ -1398,6 +1398,9 @@ function _M.returnerTaskRpc(agent, data)
 	local status = returner.status or {}
 	if status[taskId] then return 3 end
+	status[taskId] = 1
+	returner.status = status
+
 	local done = true
 	for _, data in pairs(TaskCsv) do
 		if not status[data.id] then
@@ -1406,15 +1409,12 @@ function _M.returnerTaskRpc(agent, data)
 		end
 	end
-	status[taskId] = 1
-	returner.status = status
-
-	local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}})
-
 	if done then
 		returner = {}
 	end
+	local reward, change = role:award(taskData.reward, {log = {desc = "returner", int1 = taskData.day, int2 = taskId}})
+
 	local pack = globalCsv.returner_pack:toArray(true,"=")
 	if pack[1] == taskData.id then
 		role:checkTaskEnter("Appoint", {id = pack[2]})
@@ -29,8 +29,7 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	end
 	-- 检查回归者
-	if (now - ltime) >= 86400 * globalCsv.returner_time then
-	-- if true then
+	if ltime ~= 0 and (now - ltime) >= 86400 * globalCsv.returner_time then
 		self:checkReturner()
 	end