修改报错，下载cv奖励记录字段

liuzujun
1 parent d43246b0
Showing 6 changed files with 8 additions and 4 deletions Show diff stats
src/actions/ActivityAction.lua
src/csvdata
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/Store.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}))
-Subproject commit b026265df3a1755bad4a83630d7457b790232b3e
+Subproject commit 2de1748bed665c9220f68eeb23a8ce3d1f810bda
@@ -379,6 +379,8 @@ function Role:data()
 		redp = self:getProperty("redp"),
 		chatline = self:getProperty("chatline"),
+
+		downCvR	= self:getProperty("downCvR"), -- 下载cv扩展包奖励 
 	}
 end
@@ -97,6 +97,7 @@ local ItemReason = {
 	createHeroRandom = 1206, -- 随机合成
 	resetHero = 1207, -- 重置养成
 	unlockPool = 1208, -- 解锁英雄定向抽卡池
+	downloadCv = 1209, -- 下载 cv包奖励
 }
@@ -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
@@ -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