From 56c7a1c5a054510ca04e3e42d3132a88ad003f30 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Fri, 28 Aug 2020 17:16:27 +0800
Subject: [PATCH] 修改报错，下载cv奖励记录字段

---
 src/actions/ActivityAction.lua | 2 +-
 src/csvdata                    | 2 +-
 src/models/Role.lua            | 2 ++
 src/models/RoleLog.lua         | 1 +
 src/models/RolePlugin.lua      | 2 +-
 src/models/Store.lua           | 3 ++-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/actions/ActivityAction.lua b/src/actions/ActivityAction.lua
index afaf766..11c2aa3 100644
--- a/src/actions/ActivityAction.lua
+++ b/src/actions/ActivityAction.lua
@@ -68,7 +68,7 @@ function _M.sudokuRpc(agent, data)
 	role:log("activity", {
 		activity_id = id, -- 活动ID（或活动指定任务的ID）
 		activity_type = 0, -- 活动类型，见活动类型枚举表
-		activity_reward = reward, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
+		activity_reward = reward or {}, -- 活动奖励，json格式记录,{'itemid1':123,'itemid2':456,………...}
 	})
 
 	SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
diff --git a/src/csvdata b/src/csvdata
index b026265..2de1748 160000
--- a/src/csvdata
+++ b/src/csvdata
@@ -1 +1 @@
-Subproject commit b026265df3a1755bad4a83630d7457b790232b3e
+Subproject commit 2de1748bed665c9220f68eeb23a8ce3d1f810bda
diff --git a/src/models/Role.lua b/src/models/Role.lua
index 5e05863..282a689 100644
--- a/src/models/Role.lua
+++ b/src/models/Role.lua
@@ -379,6 +379,8 @@ function Role:data()
 
 		redp = self:getProperty("redp"),
 		chatline = self:getProperty("chatline"),
+
+		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 	}
 end
 
diff --git a/src/models/RoleLog.lua b/src/models/RoleLog.lua
index b3e1ced..17ebd26 100644
--- a/src/models/RoleLog.lua
+++ b/src/models/RoleLog.lua
@@ -97,6 +97,7 @@ local ItemReason = {
 	createHeroRandom = 1206, -- 随机合成
 	resetHero = 1207, -- 重置养成
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
+	downloadCv = 1209, -- 下载 cv包奖励
 }
 
 
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index 53e4dc4..5cd0a58 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -229,7 +229,7 @@ function RolePlugin.bind(Role)
 				self:log("setLevel", {
 					level_before = oldLevel, 
 					level_changemain = log.desc,
-					level_changedetail = log.sub,
+					level_changedetail = log.sub or "",
 					level_reward = {},
 				})
 			else
diff --git a/src/models/Store.lua b/src/models/Store.lua
index 178e486..3a89254 100644
--- a/src/models/Store.lua
+++ b/src/models/Store.lua
@@ -270,11 +270,12 @@ end
 --触发限时礼包
 function Store:OnTriggerLimitTimePack(eventType, param)
     local limitPack = self:getProperty("limitTPack")
+    local payRecord = self:getProperty("payR")
     local timeNow = skynet.timex()
     local find = false
     -- 有未过期的限时礼包不再推送
     for k, v in pairs(limitPack) do
-        if v > timeNow then
+        if v > timeNow and not payRecord[k] then
             find = true
             break
         end
--
libgit2 0.21.2