From 366dcc548f297a60282e4457a8776acc37909ebe Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Mon, 19 Oct 2020 11:03:06 +0800
Subject: [PATCH] 日历活动bug

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

diff --git a/src/csvdata b/src/csvdata
index 7b6b522..dc9c77c 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit 7b6b5224c3c837d56ab0db3f8dc94221d13cae79
+Subproject commit dc9c77c295fa031753140e45dd2d793735c5bdfa
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 874df13..4203822 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -633,7 +633,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 16 then	-- 英雄星级收集进度
@@ -643,7 +643,7 @@ function RoleTask.bind(Role)
 										count = count + 1
 									end
 								end
-								if calTask[id] < count then
+								if (calTask[id] or 0) < count then
 									calTask[id] = count
 								end
 							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
--
libgit2 0.21.2