From b1644d3b28b40b61d84663d6a8af27e53e6baaaa Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Tue, 3 Nov 2020 16:23:50 +0800
Subject: [PATCH] 付费签到天数bug

---
 src/actions/ActivityAction.lua | 1 +
 src/csvdata                    | 2 +-
 src/models/Role.lua            | 1 +
 src/utils/CommonFunc.lua       | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index af770e3..2e88101 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -195,6 +195,7 @@ function _M.actPaySignRpc(agent, data)
 	local diffDay = diffFromTs(ts) + 1
 
 	local curData = role.activity:getActData("PaySignIn")
+	if not curData then return 3 end
 	local reward, change = {}
 	for day, csvData in ipairs(csvdb["pay_signInCsv"]) do
 		if day <= diffDay and day == dayIndex then
diff --git a/src/csvdata b/src/csvdata
index fa67cf8..0e38227 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit fa67cf8b44c11ad75a4d67525fc906d91e17655b
+Subproject commit 0e38227a4444f21a0a9c1a7911b5e2af79c8ed0a
diff --git a/src/models/Role.lua b/src/models/Role.lua
index e520509..caddc08 100644
--- a/src/models/Role.lua
+++ b/src/models/Role.lua
@@ -112,6 +112,7 @@ Role.schema = {
 	hangBag				= {"table", {}},	-- 背包
 	hangBagLimit 		= {"number", globalCsv.idle_field_origin}, --背包上限
 	bTeam				= {"table", {}}, -- 奖励副本队伍
+	heroFormate			= {"table", {}},	-- 自选编队	 {adv={}, hang={}}
 
 	--引导相关
 	newerGuide 			= {"string","1=1"}, -- 新手引导 master=slave
diff --git a/src/utils/CommonFunc.lua b/src/utils/CommonFunc.lua
index 2688dae..4fcfc48 100644
--- a/src/utils/CommonFunc.lua
+++ b/src/utils/CommonFunc.lua
@@ -167,7 +167,7 @@ function diffFromTs(ts)
 
 	local time = os.time({year = tm.year, month = tm.month, day = tm.day, hour = RESET_TIME})
 	if now < time then
-		return -1
+		return 0
 	end
 
 	return math.floor((now - time) / DAY_SEC)
--
libgit2 0.21.2