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

liuzujun
2 parents 1a20d90b 1d7517e6
Showing 2 changed files with 6 additions and 4 deletions Show diff stats
src/actions/ActivityAction.lua
src/models/Activity.lua
@@ -1304,7 +1304,7 @@ function _M.newSignRpc(agent, data)
 	if not open then return 1 end
 	local actData = role.activity:getActData("NewSign")
-	if actData[actData["0"] or 0] then
+	if actData[tostring(actData["0"] or 0)] then
 		return 2
 	end
@@ -1097,9 +1097,11 @@ activityFunc[Activity.ActivityType.NewSign] = {
 	-- end,
 	["crossDay"] = function(self, actType, notify)
 		local curData = self:getActData(actType)
-		curData["0"] = (curData["0"] or 0) + 1
-		local actData = csvdb["activity_signInCsv"][48] or {}
-		if curData["0"] > #actData then return end -- 满了就忽略了
+		local isOpen, actId = self:isOpen(actType)
+		local actData = csvdb["activity_signInCsv"][actId] or {}
+		curData["0"] = curData["0"] or 0
+		if curData["0"] >= #actData then return end -- 满了就忽略了
+		curData["0"] = curData["0"] + 1
 		-- 没满更新一下
 		self:updateActData(actType, curData, not notify)