Merge branch 'cn/develop' into cn/player

熊润斐
2 parents 4a280a9c 3df6d602
Showing 4 changed files with 5 additions and 1 deletions Show diff stats
src/actions/ActivityAction.lua
src/csvdata
src/models/Activity.lua
src/models/Diner.lua
@@ -135,6 +135,8 @@ function _M.signRpc(agent, data)
 		return 2
 	end
 	signs[curDay] = yearMonth
+    -- 记录玩家签到天数
+    role.activity:incrProperty("signInDay", 1)
 	-- 达到一定等级，签到会有额外奖励
 	local reward = role:getBnousDaily()
-Subproject commit 8f6460b1bc144989ece2f2caaf5c225ae434ac38
+Subproject commit 8e6c36f6d7a90dbec06c5a28d8538b80a65ca910
@@ -68,6 +68,7 @@ Activity.schema = {
 	id 			= {"number", 0, "pri"},		-- 角色id
 	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
 	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
+    signInDay   = {"number", 0},    -- 签到天数
 	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
 	act6		= {"table", {}},  -- {0 = day, 1 = 1, 2 = 1} == 付费签到活动
 	act8		= {"number", 0},  -- 充值返利 
@@ -399,6 +399,7 @@ function Diner:updateRankRoleName(name)
 	local roleId = self.owner:getProperty("id")
     local redret = redisproxy:hget(RANK_DINER_INFO, roleId)
+    if not redret then return end
 	if redret:len() > 0 then
 		local player = MsgPack.unpack(redret)
         player.name = name