From 86a873b9a16f8125fba3fc1f2964ed81331355bd Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Fri, 29 Jan 2021 15:28:26 +0800
Subject: [PATCH] 活动任务数据重置

---
 src/csvdata             | 2 +-
 src/models/Activity.lua | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/csvdata b/src/csvdata
index 3a1129d..887956f 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 3a1129db7ff72ddc39e74f565bcf3742af5ec87b
+Subproject commit 887956fe254c1ca6e855ec71179e203f9eeb8986
diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index 413c62f..b030c1c 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -473,6 +473,7 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		local calTask = self.owner:getProperty("calTask")
 		calTask = {}
+		self.owner:updateProperty({field="calTask", value=calTask})
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
 		local curLevel = buildL:getv(1, 1)
@@ -540,6 +541,7 @@ activityFunc[Activity.ActivityType.BattleCommandTask] = {
 	["init"] = function(self, actType, isCrossDay, notify)
 		local bcTask = self.owner:getProperty("bcTask")
 		bcTask = {}
+		self.owner:updateProperty({field="bcTask", value=bcTask})
 		local role = self.owner
 		local buildL = role.dinerData:getProperty("buildL")
 		local curLevel = buildL:getv(1, 1)
@@ -1003,7 +1005,7 @@ activityFunc[Activity.ActivityType.CommonSignIn] = {
 	["crossDay"] = function(self, actType, notify, actId)
 		local actCfg = csvdb["activity_ctrlCsv"][actId]
 		if not actCfg then return end
-		local conArr = actCfg.condition2:toArray("true", "=")
+		local conArr = actCfg.condition2:toArray(true, "=")
 		-- 0 登录即可， 1 达到指定活跃度
 		if conArr[1] ~= 0 then
 			return
--
libgit2 0.21.2