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

liuzujun
2 parents 6cac3be8 a3b871c2
Showing 1 changed file with 3 additions and 6 deletions Show diff stats
src/actions/ActivityAction.lua
@@ -1276,12 +1276,9 @@ function _M.newSignRpc(agent, data)
 	if not open then return 1 end
 	local actData = role.activity:getActData("NewSign")
-	if (actData[0] or 0) < index then
+	if actData[actData[0] or 0] then
 		return 2
 	end
-	if (actData[index] or 0) == 1 then
-		return 3
-	end
 	local actCfg = csvdb["activity_signInCsv"][actId]
 	if not actCfg then return 4 end
@@ -1289,11 +1286,11 @@ function _M.newSignRpc(agent, data)
 	local sumDay = actData[0] or 0
 	local award = {}
 	for k, data in pairs(actCfg) do
-		if not actData[data.id] and data.id <= sumDay then
+		if not actData[data.day] and data.day <= sumDay then
 			for id, value in pairs(data.reward:toNumMap()) do
 				award[id] = (award[id] or 0) + value
 			end
-			actData[data.id] = 1
+			actData[data.day] = 1
 		end
 	end