Commit bb89ada662d41e06389dc1598ef93a548a2d0994
Merge branch 'develop' into tr/cb
Showing
11 changed files
with
23 additions
and
15 deletions
Show diff stats
config/develop.lua
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/actions/RoleAction.lua
| ... | ... | @@ -308,6 +308,13 @@ function _M.createRpc(agent, data) |
| 308 | 308 | SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response)) |
| 309 | 309 | return true |
| 310 | 310 | end |
| 311 | + local stopcreate = tonumber(redisproxy:hget("autoincrement_set", "stopcreate")) | |
| 312 | + if stopcreate and stopcreate > 0 then | |
| 313 | + response.result = "STOP_CREATE" | |
| 314 | + SendPacket(actionCodes.Role_createRpc, MsgPack.pack(response)) | |
| 315 | + return true | |
| 316 | + end | |
| 317 | + | |
| 311 | 318 | |
| 312 | 319 | local roleId = getNextRoleId() |
| 313 | 320 | if not roleId then | ... | ... |
src/actions/StoreAction.lua
| ... | ... | @@ -2,7 +2,6 @@ local _M = {} |
| 2 | 2 | |
| 3 | 3 | local serverId = tonumber(skynet.getenv("servId")) |
| 4 | 4 | local md5 = require "md5" |
| 5 | -local pay_url = skynet.getenv("pay_url") or "" | |
| 6 | 5 | |
| 7 | 6 | local function makeOrder(roleId, rechargeId) |
| 8 | 7 | local orderId = redisproxy:hincrby("autoincrement_set", "order", 1) |
| ... | ... | @@ -86,7 +85,7 @@ function _M.googleRechargeRpc(agent, data) |
| 86 | 85 | money = dataSet.rmb * 100, |
| 87 | 86 | game_money = dataSet.diamond, |
| 88 | 87 | product_id = dataSet.productId, |
| 89 | - notify_url = pay_url .. "/pay/google" | |
| 88 | + notify_url = msg.notifyUrl | |
| 90 | 89 | } |
| 91 | 90 | local sign = signPms(need, secret_key) |
| 92 | 91 | |
| ... | ... | @@ -112,7 +111,7 @@ function _M.myCardRechargeRpc(agent, data) |
| 112 | 111 | out_trade_no = partnerOrderId, |
| 113 | 112 | money = dataSet.rmb * 100, |
| 114 | 113 | game_money = dataSet.diamond, |
| 115 | - notify_url = pay_url .. "/pay/mycard" | |
| 114 | + notify_url = msg.notifyUrl | |
| 116 | 115 | } |
| 117 | 116 | local sign = signPms(need, secret_key) |
| 118 | 117 | |
| ... | ... | @@ -139,7 +138,7 @@ function _M.iosRechargeRpc(agent, data) |
| 139 | 138 | money = dataSet.rmb * 100, |
| 140 | 139 | game_money = dataSet.diamond, |
| 141 | 140 | product_id = dataSet.iap_product_id, |
| 142 | - notify_url = pay_url .. "/pay/ios" | |
| 141 | + notify_url = msg.notifyUrl | |
| 143 | 142 | } |
| 144 | 143 | local sign = signPms(need, secret_key) |
| 145 | 144 | ... | ... |
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 | ... | ... |
src/services/globald.lua
| ... | ... | @@ -60,25 +60,25 @@ local function mailQuene() |
| 60 | 60 | if email.mid then |
| 61 | 61 | redisproxy:hmset(string_format("globalEmail:%s", gid), |
| 62 | 62 | "id", gid, |
| 63 | - "createtime", email.endTime, | |
| 63 | + "createtime", email.startTime, | |
| 64 | 64 | "title", email.title, |
| 65 | 65 | "stitle", email.stitle, |
| 66 | 66 | "content", email.content, |
| 67 | 67 | "attachments", email.attachments, |
| 68 | 68 | "endtime", email.endTime, |
| 69 | 69 | "mid", email.mid, |
| 70 | - "timestamp", email.startTime | |
| 70 | + "timestamp", now | |
| 71 | 71 | ) |
| 72 | 72 | else |
| 73 | 73 | redisproxy:hmset(string_format("globalEmail:%s", gid), |
| 74 | 74 | "id", gid, |
| 75 | - "createtime", email.endTime, | |
| 75 | + "createtime", email.startTime, | |
| 76 | 76 | "title", email.title, |
| 77 | 77 | "stitle", email.stitle, |
| 78 | 78 | "content", email.content, |
| 79 | 79 | "attachments", email.attachments, |
| 80 | 80 | "endtime", email.endTime, |
| 81 | - "timestamp", email.startTime | |
| 81 | + "timestamp", now | |
| 82 | 82 | ) |
| 83 | 83 | end |
| 84 | 84 | end | ... | ... |
src/services/logd.lua