Commit 59f2831d367055482a811e7251b9a57be87daae0

Authored by zhouhaihai
2 parents a22485f3 2d21f527

Merge branch 'develop' into tr/publish

src/actions/ActivityAction.lua
... ... @@ -68,7 +68,7 @@ function _M.sudokuRpc(agent, data)
68 68 role:log("activity", {
69 69 activity_id = id, -- 活动ID(或活动指定任务的ID)
70 70 activity_type = 0, -- 活动类型,见活动类型枚举表
71   - activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
  71 + activity_reward = reward or {}, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
72 72 })
73 73  
74 74 SendPacket(actionCodes.Activity_sudokuRpc, MsgPack.pack({task = role:packReward(task, tchange), reward = role:packReward(reward, rchange), rId = rId}))
... ...
1   -Subproject commit b026265df3a1755bad4a83630d7457b790232b3e
  1 +Subproject commit 2de1748bed665c9220f68eeb23a8ce3d1f810bda
... ...
src/models/Role.lua
... ... @@ -381,6 +381,8 @@ function Role:data()
381 381  
382 382 redp = self:getProperty("redp"),
383 383 chatline = self:getProperty("chatline"),
  384 +
  385 + downCvR = self:getProperty("downCvR"), -- 下载cv扩展包奖励
384 386 }
385 387 end
386 388  
... ...
src/models/RoleLog.lua
... ... @@ -97,6 +97,7 @@ local ItemReason = {
97 97 createHeroRandom = 1206, -- 随机合成
98 98 resetHero = 1207, -- 重置养成
99 99 unlockPool = 1208, -- 解锁英雄定向抽卡池
  100 + downloadCv = 1209, -- 下载 cv包奖励
100 101 }
101 102  
102 103  
... ...
src/models/RolePlugin.lua
... ... @@ -229,7 +229,7 @@ function RolePlugin.bind(Role)
229 229 self:log("setLevel", {
230 230 level_before = oldLevel,
231 231 level_changemain = log.desc,
232   - level_changedetail = log.sub,
  232 + level_changedetail = log.sub or "",
233 233 level_reward = {},
234 234 })
235 235 else
... ...
src/models/Store.lua
... ... @@ -270,11 +270,12 @@ end
270 270 --触发限时礼包
271 271 function Store:OnTriggerLimitTimePack(eventType, param)
272 272 local limitPack = self:getProperty("limitTPack")
  273 + local payRecord = self:getProperty("payR")
273 274 local timeNow = skynet.timex()
274 275 local find = false
275 276 -- 有未过期的限时礼包不再推送
276 277 for k, v in pairs(limitPack) do
277   - if v > timeNow then
  278 + if v > timeNow and not payRecord[k] then
278 279 find = true
279 280 break
280 281 end
... ...