cccc9c70
zhouhaihai
商城
|
1
2
|
local _M = {}
|
b6ed652b
zhouhaihai
充值
|
3
|
local md5 = require "md5"
|
192b96d3
zhouhaihai
重置
|
4
|
|
b6ed652b
zhouhaihai
充值
|
5
6
|
-- 入口在正式服关闭 -- mock 充值
function _M.rechargeRpc(agent , data)
|
1ecdc048
zhouhaihai
屏蔽充值接口
|
7
|
if true then return end
|
cccc9c70
zhouhaihai
商城
|
8
9
10
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
11
|
local choose = msg.choose or ""
|
cccc9c70
zhouhaihai
商城
|
12
|
local dataSet = csvdb["shop_rechargeCsv"][id]
|
cccc9c70
zhouhaihai
商城
|
13
|
if not dataSet then return end
|
b6ed652b
zhouhaihai
充值
|
14
15
|
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
16
|
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
17
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
18
19
20
|
if partnerOrderId == "" then
return 1
end
|
b6ed652b
zhouhaihai
充值
|
21
|
SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
|
192b96d3
zhouhaihai
重置
|
22
|
|
b6ed652b
zhouhaihai
充值
|
23
24
25
26
|
-- 测试的 直接发奖励了
skynet.timeout(10, function ()
role:handlePurchase({
order = partnerOrderId,
|
c9c0150d
zhangqijia
fix: 月卡 购买不成功的bug
|
27
|
amount = dataSet.rmb * 100 / globalCsv.QArecharge,
|
b6ed652b
zhouhaihai
充值
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
game_money = dataSet.diamond,
product_id = dataSet.productId,
pay_time = skynet.timex(),
transactionId = "onlyTest",
})
end)
return true
end
local function table_keys( t )
local keys = {}
for k, _ in pairs( t ) do
keys[#keys + 1] = k
end
return keys
end
local function signPms(params, secret_key)
local keys = table_keys(params)
table.sort(keys)
local urlCode = ""
for index, key in ipairs(keys) do
urlCode = urlCode .. params[key]
end
return md5.sumhexa(urlCode .. secret_key):lower()
end
|
d742048c
saicom
ios充值前面改为东银河
|
56
57
58
59
60
61
62
63
64
65
66
67
68
|
local function signDyhPms(params, secret_key)
local keys = table_keys(params)
table.sort(keys)
local str2Sign = ""
for index, key in ipairs(keys) do
if str2Sign ~= "" then
str2Sign = str2Sign .. '&'
end
str2Sign = str2Sign .. string.format("%s=%s", key, params[key])
end
return md5.sumhexa(str2Sign .. secret_key):lower()
end
|
19c418d9
chenyueqi
bili-android渠道的充值...
|
69
70
71
72
73
74
75
76
77
78
79
|
-- bili android 充值 入口
function _M.biliAndroidRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
7a3a7fff
chenyueqi
支付协议号
|
80
|
local partnerOrderId = role:getPurchaseOrder(id)
|
19c418d9
chenyueqi
bili-android渠道的充值...
|
81
82
83
84
85
86
87
88
89
90
91
92
93
|
-- 签名
local secret_key = "8920e9dcf0cb4ebca87393ce48021ead"
local need = {
out_trade_no = partnerOrderId,
money = dataSet.rmb * 100,
game_money = dataSet.diamond,
notify_url = msg.notifyUrl
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_biliAndroidRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
b6ed652b
zhouhaihai
充值
|
94
|
|
7a3a7fff
chenyueqi
支付协议号
|
95
|
-- 享游sdk充值
|
f9b72d4f
chenyueqi
支付协议号
|
96
|
function _M.biliCpsRechargeRpc(agent, data)
|
7a3a7fff
chenyueqi
支付协议号
|
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
local partnerOrderId = role:getPurchaseOrder(id)
-- 签名
local secret_key = "d69365fe15144af990065443749f0f1b"
local need = {
out_trade_no = partnerOrderId,
money = dataSet.rmb * 100,
game_money = dataSet.diamond,
notify_url = msg.notifyUrl
}
local sign = signPms(need, secret_key)
|
f9b72d4f
chenyueqi
支付协议号
|
117
|
SendPacket(actionCodes.Store_biliCpsRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
7a3a7fff
chenyueqi
支付协议号
|
118
119
120
121
|
return true
end
-- 享游sdk充值
|
f9b72d4f
chenyueqi
支付协议号
|
122
|
function _M.biliUoRechargeRpc(agent, data)
|
7a3a7fff
chenyueqi
支付协议号
|
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
local partnerOrderId = role:getPurchaseOrder(id)
-- 签名
local secret_key = "4243b5fb44b64175a20a53dcfb1346eb"
local need = {
out_trade_no = partnerOrderId,
money = dataSet.rmb * 100,
game_money = dataSet.diamond,
notify_url = msg.notifyUrl
}
local sign = signPms(need, secret_key)
|
f9b72d4f
chenyueqi
支付协议号
|
143
|
SendPacket(actionCodes.Store_biliUoRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
7a3a7fff
chenyueqi
支付协议号
|
144
145
146
|
return true
end
|
8ba57e2c
chenyueqi
云游戏的充值消息
|
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
|
-- 云游戏sdk充值
function _M.biliCloudRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
local partnerOrderId = role:getPurchaseOrder(id)
-- 签名
local secret_key = "c97a19c2c00143d6b0f0da2bc52208e7"
local need = {
out_trade_no = partnerOrderId,
money = dataSet.rmb * 100,
game_money = dataSet.diamond,
notify_url = msg.notifyUrl
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_biliCloudRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
b6ed652b
zhouhaihai
充值
|
173
174
175
176
177
|
-- google 充值 入口
function _M.googleRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
178
|
local choose = msg.choose or ""
|
b6ed652b
zhouhaihai
充值
|
179
180
181
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
182
|
|
192b96d3
zhouhaihai
重置
|
183
|
role.ignoreHeartbeat = true
|
b6ed652b
zhouhaihai
充值
|
184
|
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
185
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
b6ed652b
zhouhaihai
充值
|
186
|
-- 签名
|
ebeefd34
chenyueqi
修改Google的充值参数
|
187
188
|
-- local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
local secret_key = "8920e9dcf0cb4ebca87393ce48021ead"
|
b6ed652b
zhouhaihai
充值
|
189
190
|
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
191
|
money = dataSet.rmb * 100,
|
b6ed652b
zhouhaihai
充值
|
192
|
game_money = dataSet.diamond,
|
ebeefd34
chenyueqi
修改Google的充值参数
|
193
|
-- product_id = dataSet.productId,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
194
|
notify_url = msg.notifyUrl
|
b6ed652b
zhouhaihai
充值
|
195
196
197
198
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
192b96d3
zhouhaihai
重置
|
199
200
201
|
return true
end
|
8ae04b5a
zhouhaihai
mycard
|
202
203
204
205
206
|
-- mycard 充值 入口
function _M.myCardRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
207
|
local choose = msg.choose or ""
|
8ae04b5a
zhouhaihai
mycard
|
208
209
210
211
212
213
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
214
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
8ae04b5a
zhouhaihai
mycard
|
215
216
217
218
|
-- 签名
local secret_key = "48759e07540f46d9af17ec82669b4272"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
219
|
money = dataSet.rmb * 100,
|
8ae04b5a
zhouhaihai
mycard
|
220
|
game_money = dataSet.diamond,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
221
|
notify_url = msg.notifyUrl
|
8ae04b5a
zhouhaihai
mycard
|
222
223
224
|
}
local sign = signPms(need, secret_key)
|
e629295d
zhouhaihai
协议
|
225
|
SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
8ae04b5a
zhouhaihai
mycard
|
226
227
|
return true
end
|
b6ed652b
zhouhaihai
充值
|
228
|
|
7a3a7fff
chenyueqi
支付协议号
|
229
|
-- bili ios 充值 入口
|
9e25c63d
zhouhaihai
iospay
|
230
231
232
233
|
function _M.iosRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
234
|
local choose = msg.choose or ""
|
9e25c63d
zhouhaihai
iospay
|
235
236
237
238
239
240
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
241
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
9e25c63d
zhouhaihai
iospay
|
242
|
-- 签名
|
d742048c
saicom
ios充值前面改为东银河
|
243
|
local secret_key = "2b2036e1f44640a59168c92462714870"
|
9e25c63d
zhouhaihai
iospay
|
244
245
|
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
246
|
money = dataSet.rmb * 100,
|
9e25c63d
zhouhaihai
iospay
|
247
|
game_money = dataSet.diamond,
|
775d0388
chenyueqi
ios支付订单签名参数错误
|
248
|
product_id = dataSet.iap_product_id,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
249
|
notify_url = msg.notifyUrl
|
9e25c63d
zhouhaihai
iospay
|
250
|
}
|
c0290d89
saicom
东银河订单加签
|
251
|
local sign = signDyhPms(need, secret_key)
|
9e25c63d
zhouhaihai
iospay
|
252
253
254
255
256
|
SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
e0d725cc
saicom
东银河安卓sdk
|
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
|
-- dyh android 充值 入口
function _M.dyhxAndroidRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local choose = msg.choose or ""
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
-- 签名
local secret_key = "51ba4398c69d4d229d5402295dc38b50"
local need = {
out_trade_no = partnerOrderId,
money = dataSet.rmb * 100,
game_money = dataSet.diamond,
notify_url = msg.notifyUrl
}
local sign = signDyhPms(need, secret_key)
SendPacket(actionCodes.Store_dyhxAndroidRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
7e61a962
liuzujun
新增通用生成订单协议,
|
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
local rechargeHandler = {
ali = function(cp_order_id, rechargeId, result)
end,
wx = function(cp_order_id, rechargeId, result)
end,
}
function _M.getCpOrderIdRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local type = msg.skd_type or ""
local choose = msg.choose or ""
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
local result = {}
result["order"] = partnerOrderId
local handler = rechargeHandler[type]
if handler then
handler(partnerOrderId, id, result)
end
SendPacket(actionCodes.Store_getCpOrderIdRpc, MsgPack.pack(result))
end
|
e0d725cc
saicom
东银河安卓sdk
|
315
|
|
192b96d3
zhouhaihai
重置
|
316
317
318
319
320
321
322
323
|
function _M.purchaseOrderResult(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
role.ignoreHeartbeat = false
|
d705a315
zhouhaihai
充值 整理
|
324
325
326
327
|
local status = {
fail = true,
success = true
}
|
192b96d3
zhouhaihai
重置
|
328
|
|
d705a315
zhouhaihai
充值 整理
|
329
330
331
|
local partnerOrderStr = msg.order
if partnerOrderStr then
role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
|
cccc9c70
zhouhaihai
商城
|
332
|
end
|
cccc9c70
zhouhaihai
商城
|
333
334
335
336
|
return true
end
|
c5825110
saicom
新增用户商城相关数据
|
337
338
339
340
341
342
|
function _M.shopBuyRpc(agent , data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local count = msg.count or 1
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
343
|
local dataSet = csvdb["shop_normalCsv"][id]
|
c5825110
saicom
新增用户商城相关数据
|
344
345
|
if not dataSet then return end
|
9ea0c502
liuzujun
限时礼包
|
346
|
if dataSet.unlock ~= "" then
|
c72853af
liuzujun
修改每日礼包检测开启bug
|
347
|
if not role:checkHangPass(tonumber(dataSet.unlock)) then
|
9ea0c502
liuzujun
限时礼包
|
348
349
350
351
352
|
skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
353
354
355
356
357
358
359
|
--判断是否是活动商品
if dataSet.activity_id and dataSet.activity_id ~= 0 then
local actCfg = csvdb["activity_ctrlCsv"][dataSet.activity_id]
if not actCfg then return 2 end
if not role.activity:isOpenById(dataSet.activity_id, "ActShopGoods") then return 3 end
end
|
3e20f499
saicom
完善商城相关协议
|
360
|
local buyRecord = role.storeData:getProperty("buyR")
|
265ee99f
liuzujun
商店购买刷购买上限bug 导致虹光玉溢出
|
361
|
if math.illegalNum(count, 1, (dataSet.limit == 0 and 10000 or dataSet.limit - (buyRecord[id] or 0))) then
|
3e20f499
saicom
完善商城相关协议
|
362
363
364
|
skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
return 1
end
|
c5825110
saicom
新增用户商城相关数据
|
365
|
|
34c8cf27
zhangqijia
fix: 商店不打折商品,售价为0的bu
|
366
367
368
369
370
371
|
local cost
if dataSet.disount == 0 then
cost = {[dataSet.icon] = math.ceil(dataSet.cost * count)}
else
cost = {[dataSet.icon] = math.ceil(dataSet.cost * count * ((dataSet.disount or 10) / 10))}
end
|
ff72d1eb
zhangqijia
fix: 商店商品购买折扣bug
|
372
|
|
c5825110
saicom
新增用户商城相关数据
|
373
|
|
c6a4c456
liuzujun
boss挑战门票购买可以超出上限
|
374
|
local desc = "unknowShop"
|
c5825110
saicom
新增用户商城相关数据
|
375
376
|
if dataSet.shop == 1 then -- 普通商店
desc = "dailyShop"
|
c5825110
saicom
新增用户商城相关数据
|
377
378
379
380
381
382
|
elseif dataSet.shop == 2 then -- 美食商店
desc = "dinerShop"
elseif dataSet.shop == 3 then -- 竞技场商店
desc = "pvpShop"
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
383
|
if not role:checkItemEnough(cost) then return 4 end
|
c5825110
saicom
新增用户商城相关数据
|
384
|
|
e84a1beb
liuzujun
gm后台查询日志,公告相关协议
|
385
|
local limitStr = ""
|
c5825110
saicom
新增用户商城相关数据
|
386
387
|
if dataSet.limit ~= 0 then
buyRecord[id] = (buyRecord[id] or 0) + count
|
3e20f499
saicom
完善商城相关协议
|
388
|
role.storeData:updateProperty({field = "buyR", value = buyRecord})
|
e84a1beb
liuzujun
gm后台查询日志,公告相关协议
|
389
|
limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
|
c5825110
saicom
新增用户商城相关数据
|
390
|
end
|
b92a81c9
liuzujun
CB2限时礼包
|
391
|
role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, long1= dataSet.shop}})
|
c5825110
saicom
新增用户商城相关数据
|
392
393
394
395
396
|
local gift = {}
for _id, _count in pairs(dataSet.gift:toNumMap()) do
gift[_id] = _count * count
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
397
|
local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count, short1=dataSet.shop}})
|
c5825110
saicom
新增用户商城相关数据
|
398
|
|
7f9f002d
liuzujun
循环周活动
|
399
400
401
|
if dataSet.shop == 1 then
role:checkTaskEnter("ShopAll", {count = count})
end
|
c59e058b
zhouhaihai
新一批日志记录
|
402
403
404
405
406
407
408
409
410
411
412
|
local costId, costCount = next(cost)
role:log("shop_purchase", {
item_id = id, -- 道具id
item_type = 0, -- 道具类型,具体见枚举表中道具类型枚举表
item_level = 0, -- 道具等级
item_cnt = count, -- 购买数量技术
currency_type = costId or 0, -- 购买道具消耗的货币类型,记录货币ID
shop_purchase_current = costCount or 0, -- 购买道具消耗的货币数量
shop_id = dataSet.shop, -- 商店ID
})
|
e84a1beb
liuzujun
gm后台查询日志,公告相关协议
|
413
|
role:mylog("role_action", {desc = "shopBuy", int1 = id, int2 = count, short1=dataSet.shop, key1 = limitStr})
|
c5825110
saicom
新增用户商城相关数据
|
414
415
416
417
|
SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
return true
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
418
|
function _M.getFreeChestRpc(agent, data)
|
3e20f499
saicom
完善商城相关协议
|
419
420
421
422
423
424
425
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["shop_rechargeCsv"][id]
if not config then return end
|
d19b2af3
liuzujun
活动免费礼包判断活动是否开启
|
426
427
428
429
430
431
432
|
--判断是否是活动商品
if config.activity_id ~= 0 then
local actCfg = csvdb["activity_ctrlCsv"][config.activity_id]
if not actCfg then return 2 end
if not role.activity:isOpenById(config.activity_id, "ActShopGoods") then return 3 end
end
|
3e20f499
saicom
完善商城相关协议
|
433
434
435
436
437
|
local rechargeRecord = role.storeData:getProperty("payR")
local getCount = (rechargeRecord[id] or 0)
if getCount >= config.limit then
return 1
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
438
|
local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
|
3e20f499
saicom
完善商城相关协议
|
439
440
441
442
|
rechargeRecord[id] = getCount + 1
role.storeData:updateProperty({field = "payR", value = rechargeRecord})
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
443
|
SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
444
|
return true
|
3e20f499
saicom
完善商城相关协议
|
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
|
end
function _M.getGrowFundRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["reward_newbeeCsv"][id]
if not config then return end
local growFundFlag = role.storeData:getProperty("growFund")
local growFundRecord = role.storeData:getProperty("growFundR")
if growFundFlag == 0 then
skynet.error("user do not buy grow fund")
return 1
end
if not role:checkHangPass(config.condition) then
skynet.error(string.format("user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
local b = string.getbit(growFundRecord, id)
if string.char(b) == "1" then
return 1
end
growFundRecord = string.setbit(growFundRecord, id)
role.storeData:updateProperty({field = "growFundR", value = growFundRecord})
local gift = config.giftFree .. " " .. config.giftLimit
local reward, _ = role:award(gift, {log = {desc = "grownFund", int1 = id}})
SendPacket(actionCodes.Store_getGrowFundRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
480
|
return true
|
3e20f499
saicom
完善商城相关协议
|
481
482
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
483
|
-- 赛季卡
|
3e20f499
saicom
完善商城相关协议
|
484
485
486
487
488
489
490
491
492
|
function _M.getBattlePassRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
local config = csvdb["reward_battlepassCsv"][id]
if not config then return end
local timeNow = skynet.timex()
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
493
|
local battleCardFlag = role.storeData:getProperty("battleCard")
|
3e20f499
saicom
完善商城相关协议
|
494
495
496
497
498
499
500
501
502
503
504
|
local battleCardFreeRecord = role.storeData:getProperty("battleFR")
local battleCardLimitRecord = role.storeData:getProperty("battleLR")
local freeFlag = string.char(string.getbit(battleCardFreeRecord, id))
local limitFlag = string.char(string.getbit(battleCardLimitRecord, id))
if freeFlag == "1" and limitFlag == "1" then
skynet.error("user already get battle pass reward")
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
505
|
if battleCardFlag == 1 and limitFlag == "1" then
|
3e20f499
saicom
完善商城相关协议
|
506
507
508
|
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
509
|
if role:getProperty("battlePoint") < config.point then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
510
511
512
513
|
skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
return 1
end
|
3e20f499
saicom
完善商城相关协议
|
514
515
516
517
518
519
520
521
|
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
522
|
if battleCardFlag == 1 and limitFlag == "0" then
|
3e20f499
saicom
完善商城相关协议
|
523
524
525
526
527
528
|
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
529
|
role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
|
3e20f499
saicom
完善商城相关协议
|
530
531
532
533
534
|
end
local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
535
|
return true
|
3e20f499
saicom
完善商城相关协议
|
536
537
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
538
539
540
541
542
543
544
|
-- 探索指令奖励
function _M.getExploreCommandRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id -- 探索id
local subId = msg.subId -- 领取的阶段id
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
545
|
local tab_name = "reward_levelpass" .. id .. "Csv"
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
546
|
local config = csvdb[tab_name][subId]
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
547
548
|
if not config then return end
|
c99f08df
liuzujun
探索指令调试完成
|
549
|
local bpInfo = role.storeData:getProperty("bpInfo") or {}
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
550
551
|
local info = bpInfo[id] or {}
local flag = info["flag"] or 0
|
c99f08df
liuzujun
探索指令调试完成
|
552
|
--if flag == 0 then return 1 end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
|
local freeRecord = info["fr"] or ""
local buyRecord = info["br"] or ""
local freeFlag = string.char(string.getbit(freeRecord, subId))
local limitFlag = string.char(string.getbit(buyRecord, subId))
if freeFlag == "1" and limitFlag == "1" then
skynet.error("user already get explore command reward")
return 2
end
if flag == 1 and limitFlag == "1" then
return 3
end
|
84cbc53e
zhangqijia
fix: 探索指令,奖励领取解锁条...
|
569
570
571
572
573
574
575
576
577
|
for k, level in pairs(config.level:toNumMap()) do
if k == 1 then
if not role:checkHangPass(level) then
return 4
end
elseif k == 2 then
if not role:checkAdvChapterPass(level) then
return 4
end
|
eb1f9a32
zhangqijia
fix: 探索指令,最终章的5个章...
|
578
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
579
580
581
582
583
584
|
end
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
|
c99f08df
liuzujun
探索指令调试完成
|
585
|
freeRecord = string.setbit(freeRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
586
587
588
589
590
591
592
593
594
|
info["fr"] = freeRecord
end
if flag == 1 and limitFlag == "0" then
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
|
c99f08df
liuzujun
探索指令调试完成
|
595
|
buyRecord = string.setbit(buyRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
596
597
598
|
info["br"] = buyRecord
end
|
c99f08df
liuzujun
探索指令调试完成
|
599
600
|
bpInfo[id] = info
role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
601
602
603
604
605
606
607
|
local reward, _ = role:award(gift, {log = {desc = "exploreCommand", int1 = id, int2 = subId}})
SendPacket(actionCodes.Store_getExploreCommandRewardRpc, MsgPack.pack({reward = reward}))
return true
end
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
608
609
610
611
612
|
-- 累充奖励
function _M.getTotalRechargeAwardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index -- 领取的索引id
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
613
|
local totalTwd = role:getProperty("twdC")
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
614
615
|
local totalRechargeRecord = role.storeData:getProperty("totalRR")
local flag = string.char(string.getbit(totalRechargeRecord, index))
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
616
|
if flag == "1" then return 1 end
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
617
|
local cfg = csvdb["activity_payRebateCsv"][index]
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
618
|
if not cfg then return 2 end
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
619
|
if cfg.twd > totalTwd then return 3 end
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
620
621
622
|
totalRechargeRecord = string.setbit(totalRechargeRecord, index)
role.storeData:updateProperty({field = "totalRR", value = totalRechargeRecord})
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
623
624
625
626
627
|
local main = cfg.main_reward:toNumMap()
local sub = cfg.sub_reward:toNumMap()
for k, v in pairs(sub) do
main[k] = (main[k] or 0) + v
end
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
628
|
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
629
630
|
local reward, change = role:award(main, {log = {desc = "totalRecharge", int1 = index}})
SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack(role:packReward(reward, change)))
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
631
632
633
|
return true
end
|
c40a6460
zhangqijia
feat: 月卡+特刊
|
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
|
function _M.monthCardRewardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local mcid = msg.mcid
local smcid = msg.smcid
local reward,change = {}, {}
--月卡奖励
local tmpreward, tmpchange = role.storeData:getMonthCardDailyReward(mcid)
if tmpreward then
for k, v in pairs(tmpreward) do
reward[k] = (reward[k] or 0) + v
end
if tmpchange then table.insert(change, tmpchange) end
end
--特刊奖励
tmpreward, tmpchange = role.storeData:getSMonthCardDailyReward(smcid)
if tmpreward then
for k, v in pairs(tmpreward) do
reward[k] = (reward[k] or 0) + v
end
if tmpchange then table.insert(change, tmpchange) end
end
SendPacket(actionCodes.Store_monthCardRewardRpc, MsgPack.pack(role:packReward(reward, change)))
return true
end
|
cccc9c70
zhouhaihai
商城
|
662
|
return _M
|