Commit 59f2831d367055482a811e7251b9a57be87daae0
Merge branch 'develop' into tr/publish
Showing
6 changed files
with
8 additions
and
4 deletions
Show diff stats
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})) | ... | ... |
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
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 | ... | ... |