From 1d7517e6a3fd91cb31d0925675afd69904300c57 Mon Sep 17 00:00:00 2001
From: chenyueqi <chenyueqi@qq.com>
Date: Mon, 8 Feb 2021 17:08:41 +0800
Subject: [PATCH] 新春签到代码优化，支持不同时开同类型的签到活动，方便后期复用

---
 src/models/Activity.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index dfa8e6d..3ee265d 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -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)
--
libgit2 0.21.2