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)
|
cccc9c70
zhouhaihai
商城
|
7
8
9
|
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
10
|
local choose = msg.choose or ""
|
cccc9c70
zhouhaihai
商城
|
11
|
local dataSet = csvdb["shop_rechargeCsv"][id]
|
cccc9c70
zhouhaihai
商城
|
12
|
if not dataSet then return end
|
b6ed652b
zhouhaihai
充值
|
13
14
|
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
15
|
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
16
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
17
18
19
|
if partnerOrderId == "" then
return 1
end
|
b6ed652b
zhouhaihai
充值
|
20
|
SendPacket(actionCodes.Store_rechargeRpc, MsgPack.pack({ order = partnerOrderId }))
|
192b96d3
zhouhaihai
重置
|
21
|
|
b6ed652b
zhouhaihai
充值
|
22
23
24
25
|
-- 测试的 直接发奖励了
skynet.timeout(10, function ()
role:handlePurchase({
order = partnerOrderId,
|
c9c0150d
zhangqijia
fix: 月卡 购买不成功的bug
|
26
|
amount = dataSet.rmb * 100 / globalCsv.QArecharge,
|
b6ed652b
zhouhaihai
充值
|
27
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
|
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充值前面改为东银河
|
55
56
57
58
59
60
61
62
63
64
65
66
67
|
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渠道的充值...
|
68
69
70
71
72
73
74
75
76
77
78
|
-- 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
支付协议号
|
79
|
local partnerOrderId = role:getPurchaseOrder(id)
|
19c418d9
chenyueqi
bili-android渠道的充值...
|
80
81
82
83
84
85
86
87
88
89
90
91
92
|
-- 签名
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
充值
|
93
|
|
7a3a7fff
chenyueqi
支付协议号
|
94
|
-- 享游sdk充值
|
f9b72d4f
chenyueqi
支付协议号
|
95
|
function _M.biliCpsRechargeRpc(agent, data)
|
7a3a7fff
chenyueqi
支付协议号
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
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
支付协议号
|
116
|
SendPacket(actionCodes.Store_biliCpsRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
7a3a7fff
chenyueqi
支付协议号
|
117
118
119
120
|
return true
end
-- 享游sdk充值
|
f9b72d4f
chenyueqi
支付协议号
|
121
|
function _M.biliUoRechargeRpc(agent, data)
|
7a3a7fff
chenyueqi
支付协议号
|
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
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
支付协议号
|
142
|
SendPacket(actionCodes.Store_biliUoRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
7a3a7fff
chenyueqi
支付协议号
|
143
144
145
|
return true
end
|
8ba57e2c
chenyueqi
云游戏的充值消息
|
146
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
|
-- 云游戏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
充值
|
172
173
174
175
176
|
-- google 充值 入口
function _M.googleRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
177
|
local choose = msg.choose or ""
|
b6ed652b
zhouhaihai
充值
|
178
179
180
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
|
192b96d3
zhouhaihai
重置
|
181
|
|
192b96d3
zhouhaihai
重置
|
182
|
role.ignoreHeartbeat = true
|
b6ed652b
zhouhaihai
充值
|
183
|
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
184
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
b6ed652b
zhouhaihai
充值
|
185
|
-- 签名
|
ebeefd34
chenyueqi
修改Google的充值参数
|
186
187
|
-- local secret_key = "b7657fa7ccd44c16a35e3f454ac7a075"
local secret_key = "8920e9dcf0cb4ebca87393ce48021ead"
|
b6ed652b
zhouhaihai
充值
|
188
189
|
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
190
|
money = dataSet.rmb * 100,
|
b6ed652b
zhouhaihai
充值
|
191
|
game_money = dataSet.diamond,
|
ebeefd34
chenyueqi
修改Google的充值参数
|
192
|
-- product_id = dataSet.productId,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
193
|
notify_url = msg.notifyUrl
|
b6ed652b
zhouhaihai
充值
|
194
195
196
197
|
}
local sign = signPms(need, secret_key)
SendPacket(actionCodes.Store_googleRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
192b96d3
zhouhaihai
重置
|
198
199
200
|
return true
end
|
8ae04b5a
zhouhaihai
mycard
|
201
202
203
204
205
|
-- mycard 充值 入口
function _M.myCardRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
206
|
local choose = msg.choose or ""
|
8ae04b5a
zhouhaihai
mycard
|
207
208
209
210
211
212
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
213
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
8ae04b5a
zhouhaihai
mycard
|
214
215
216
217
|
-- 签名
local secret_key = "48759e07540f46d9af17ec82669b4272"
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
218
|
money = dataSet.rmb * 100,
|
8ae04b5a
zhouhaihai
mycard
|
219
|
game_money = dataSet.diamond,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
220
|
notify_url = msg.notifyUrl
|
8ae04b5a
zhouhaihai
mycard
|
221
222
223
|
}
local sign = signPms(need, secret_key)
|
e629295d
zhouhaihai
协议
|
224
|
SendPacket(actionCodes.Store_myCardRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
|
8ae04b5a
zhouhaihai
mycard
|
225
226
|
return true
end
|
b6ed652b
zhouhaihai
充值
|
227
|
|
7a3a7fff
chenyueqi
支付协议号
|
228
|
-- bili ios 充值 入口
|
9e25c63d
zhouhaihai
iospay
|
229
230
231
232
|
function _M.iosRechargeRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local id = msg.id
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
233
|
local choose = msg.choose or ""
|
9e25c63d
zhouhaihai
iospay
|
234
235
236
237
238
239
|
local dataSet = csvdb["shop_rechargeCsv"][id]
if not dataSet then return end
local roleId = role:getProperty("id")
role.ignoreHeartbeat = true
--创建订单号
|
2dbe4fb9
chenyueqi
充值礼包自选部分逻辑
|
240
|
local partnerOrderId = role:getPurchaseOrder(id,nil,choose)
|
9e25c63d
zhouhaihai
iospay
|
241
|
-- 签名
|
d742048c
saicom
ios充值前面改为东银河
|
242
|
local secret_key = "2b2036e1f44640a59168c92462714870"
|
9e25c63d
zhouhaihai
iospay
|
243
244
|
local need = {
out_trade_no = partnerOrderId,
|
f9f877b1
zhouhaihai
商店
|
245
|
money = dataSet.rmb * 100,
|
9e25c63d
zhouhaihai
iospay
|
246
|
game_money = dataSet.diamond,
|
775d0388
chenyueqi
ios支付订单签名参数错误
|
247
|
product_id = dataSet.iap_product_id,
|
ba84f3c7
zhouhaihai
签名回调地址由客户端上传
|
248
|
notify_url = msg.notifyUrl
|
9e25c63d
zhouhaihai
iospay
|
249
|
}
|
c0290d89
saicom
东银河订单加签
|
250
|
local sign = signDyhPms(need, secret_key)
|
9e25c63d
zhouhaihai
iospay
|
251
252
253
254
255
|
SendPacket(actionCodes.Store_iosRechargeRpc, MsgPack.pack({ order = partnerOrderId, sign = sign}))
return true
end
|
e0d725cc
saicom
东银河安卓sdk
|
256
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
|
192b96d3
zhouhaihai
重置
|
284
285
286
287
288
289
290
291
|
function _M.purchaseOrderResult(agent, data)
local role = agent.role
local roleId = role:getProperty("id")
local msg = MsgPack.unpack(data)
role.ignoreHeartbeat = false
|
d705a315
zhouhaihai
充值 整理
|
292
293
294
295
|
local status = {
fail = true,
success = true
}
|
192b96d3
zhouhaihai
重置
|
296
|
|
d705a315
zhouhaihai
充值 整理
|
297
298
299
|
local partnerOrderStr = msg.order
if partnerOrderStr then
role:updatePurchaseOrder(partnerOrderStr, msg.platformOrder, status[msg.status] and msg.status or "unknown")
|
cccc9c70
zhouhaihai
商城
|
300
|
end
|
cccc9c70
zhouhaihai
商城
|
301
302
303
304
|
return true
end
|
c5825110
saicom
新增用户商城相关数据
|
305
306
307
308
309
310
|
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礼包改钻石礼包
|
311
|
local dataSet = csvdb["shop_normalCsv"][id]
|
c5825110
saicom
新增用户商城相关数据
|
312
313
|
if not dataSet then return end
|
9ea0c502
liuzujun
限时礼包
|
314
|
if dataSet.unlock ~= "" then
|
c72853af
liuzujun
修改每日礼包检测开启bug
|
315
|
if not role:checkHangPass(tonumber(dataSet.unlock)) then
|
9ea0c502
liuzujun
限时礼包
|
316
317
318
319
320
|
skynet.error(string.format("shopBuyRpc,user do not finish hang pass, user_id:%d", role:getProperty("id")))
return 1
end
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
321
322
323
324
325
326
327
|
--判断是否是活动商品
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
完善商城相关协议
|
328
329
330
331
332
|
local buyRecord = role.storeData:getProperty("buyR")
if math.illegalNum(count, 1, (dataSet.limit == 0 and math.huge or dataSet.limit - (buyRecord[id] or 0))) then
skynet.error(string.format("shop buy over limit, user_id:%d, goods_id:%d", role:getProperty("id"), id))
return 1
end
|
c5825110
saicom
新增用户商城相关数据
|
333
|
|
34c8cf27
zhangqijia
fix: 商店不打折商品,售价为0的bu
|
334
335
336
337
338
339
|
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
|
340
|
|
c5825110
saicom
新增用户商城相关数据
|
341
|
|
c6a4c456
liuzujun
boss挑战门票购买可以超出上限
|
342
|
local desc = "unknowShop"
|
c5825110
saicom
新增用户商城相关数据
|
343
344
|
if dataSet.shop == 1 then -- 普通商店
desc = "dailyShop"
|
c5825110
saicom
新增用户商城相关数据
|
345
346
347
348
349
350
|
elseif dataSet.shop == 2 then -- 美食商店
desc = "dinerShop"
elseif dataSet.shop == 3 then -- 竞技场商店
desc = "pvpShop"
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
351
|
if not role:checkItemEnough(cost) then return 4 end
|
c5825110
saicom
新增用户商城相关数据
|
352
|
|
e84a1beb
liuzujun
gm后台查询日志,公告相关协议
|
353
|
local limitStr = ""
|
c5825110
saicom
新增用户商城相关数据
|
354
355
|
if dataSet.limit ~= 0 then
buyRecord[id] = (buyRecord[id] or 0) + count
|
3e20f499
saicom
完善商城相关协议
|
356
|
role.storeData:updateProperty({field = "buyR", value = buyRecord})
|
e84a1beb
liuzujun
gm后台查询日志,公告相关协议
|
357
|
limitStr = string.format("%s/%s", buyRecord[id], dataSet.limit)
|
c5825110
saicom
新增用户商城相关数据
|
358
|
end
|
b92a81c9
liuzujun
CB2限时礼包
|
359
|
role:costItems(cost, {log = {desc = desc, int1 = id, int2 = count, long1= dataSet.shop}})
|
c5825110
saicom
新增用户商城相关数据
|
360
361
362
363
364
|
local gift = {}
for _id, _count in pairs(dataSet.gift:toNumMap()) do
gift[_id] = _count * count
end
|
a33ade6c
liuzujun
rmb礼包改钻石礼包
|
365
|
local reward = role:award(gift, {log = {desc = desc, int1 = id, int2 = count, short1=dataSet.shop}})
|
c5825110
saicom
新增用户商城相关数据
|
366
|
|
7f9f002d
liuzujun
循环周活动
|
367
368
369
|
if dataSet.shop == 1 then
role:checkTaskEnter("ShopAll", {count = count})
end
|
c59e058b
zhouhaihai
新一批日志记录
|
370
371
372
373
374
375
376
377
378
379
380
|
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后台查询日志,公告相关协议
|
381
|
role:mylog("role_action", {desc = "shopBuy", int1 = id, int2 = count, short1=dataSet.shop, key1 = limitStr})
|
c5825110
saicom
新增用户商城相关数据
|
382
383
384
385
|
SendPacket(actionCodes.Store_shopBuyRpc, MsgPack.pack({reward = reward}))
return true
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
386
|
function _M.getFreeChestRpc(agent, data)
|
3e20f499
saicom
完善商城相关协议
|
387
388
389
390
391
392
393
|
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
活动免费礼包判断活动是否开启
|
394
395
396
397
398
399
400
|
--判断是否是活动商品
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
完善商城相关协议
|
401
402
403
404
405
|
local rechargeRecord = role.storeData:getProperty("payR")
local getCount = (rechargeRecord[id] or 0)
if getCount >= config.limit then
return 1
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
406
|
local reward, _ = role:award(config.itemFirst, {log = {desc = "freeGift", int1 = id}})
|
3e20f499
saicom
完善商城相关协议
|
407
408
409
410
|
rechargeRecord[id] = getCount + 1
role.storeData:updateProperty({field = "payR", value = rechargeRecord})
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
411
|
SendPacket(actionCodes.Store_getFreeChestRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
412
|
return true
|
3e20f499
saicom
完善商城相关协议
|
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
|
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
添加特权卡
|
448
|
return true
|
3e20f499
saicom
完善商城相关协议
|
449
450
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
451
|
-- 赛季卡
|
3e20f499
saicom
完善商城相关协议
|
452
453
454
455
456
457
458
459
460
|
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
月卡赛季卡发送邮件奖励
|
461
|
local battleCardFlag = role.storeData:getProperty("battleCard")
|
3e20f499
saicom
完善商城相关协议
|
462
463
464
465
466
467
468
469
470
471
472
|
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
月卡赛季卡发送邮件奖励
|
473
|
if battleCardFlag == 1 and limitFlag == "1" then
|
3e20f499
saicom
完善商城相关协议
|
474
475
476
|
return 1
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
477
|
if role:getProperty("battlePoint") < config.point then
|
1a0b3c56
liuzujun
抽卡保底,切换定向卡池
|
478
479
480
481
|
skynet.error(string.format("user do not have enough battle point, user_id:%d", role:getProperty("id")))
return 1
end
|
3e20f499
saicom
完善商城相关协议
|
482
483
484
485
486
487
488
489
|
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
battleCardFreeRecord = string.setbit(battleCardFreeRecord, id)
role.storeData:updateProperty({field = "battleFR", value = battleCardFreeRecord})
end
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
490
|
if battleCardFlag == 1 and limitFlag == "0" then
|
3e20f499
saicom
完善商城相关协议
|
491
492
493
494
495
496
|
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
battleCardLimitRecord = string.setbit(battleCardLimitRecord, id)
|
fb3d084d
liuzujun
月卡赛季卡发送邮件奖励
|
497
|
role.storeData:updateProperty({field = "battleLR", value = battleCardLimitRecord})
|
3e20f499
saicom
完善商城相关协议
|
498
499
500
501
502
|
end
local reward, _ = role:award(gift, {log = {desc = "battleCard", int1 = id}})
SendPacket(actionCodes.Store_getBattlePassRewardRpc, MsgPack.pack({reward = reward}))
|
317a46a9
liuzujun
添加特权卡
|
503
|
return true
|
3e20f499
saicom
完善商城相关协议
|
504
505
|
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
506
507
508
509
510
511
512
|
-- 探索指令奖励
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
付费签到,抽卡阶段奖励,探索指令
|
513
|
local tab_name = "reward_levelpass" .. id .. "Csv"
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
514
|
local config = csvdb[tab_name][subId]
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
515
516
|
if not config then return end
|
c99f08df
liuzujun
探索指令调试完成
|
517
|
local bpInfo = role.storeData:getProperty("bpInfo") or {}
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
518
519
|
local info = bpInfo[id] or {}
local flag = info["flag"] or 0
|
c99f08df
liuzujun
探索指令调试完成
|
520
|
--if flag == 0 then return 1 end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
|
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
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
537
|
if not role:checkHangPass(config.level) then
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
538
539
540
541
542
543
544
|
return 4
end
local gift = ""
if freeFlag == "0" then
gift = config.giftFree
|
c99f08df
liuzujun
探索指令调试完成
|
545
|
freeRecord = string.setbit(freeRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
546
547
548
549
550
551
552
553
554
|
info["fr"] = freeRecord
end
if flag == 1 and limitFlag == "0" then
if gift ~= "" then
gift = gift .. " "
end
gift = gift .. config.giftLimit
|
c99f08df
liuzujun
探索指令调试完成
|
555
|
buyRecord = string.setbit(buyRecord, subId)
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
556
557
558
|
info["br"] = buyRecord
end
|
c99f08df
liuzujun
探索指令调试完成
|
559
560
|
bpInfo[id] = info
role.storeData:updateProperty({field = "bpInfo", value = bpInfo})
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
561
562
563
564
565
566
567
|
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
多队挂机任务取消功能,累充奖励
|
568
569
570
571
572
|
-- 累充奖励
function _M.getTotalRechargeAwardRpc(agent, data)
local role = agent.role
local msg = MsgPack.unpack(data)
local index = msg.index -- 领取的索引id
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
573
|
local totalTwd = role:getProperty("twdC")
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
574
575
|
local totalRechargeRecord = role.storeData:getProperty("totalRR")
local flag = string.char(string.getbit(totalRechargeRecord, index))
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
576
|
if flag == "1" then return 1 end
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
577
|
local cfg = csvdb["activity_payRebateCsv"][index]
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
578
|
if not cfg then return 2 end
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
579
|
if cfg.twd > totalTwd then return 3 end
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
580
581
582
|
totalRechargeRecord = string.setbit(totalRechargeRecord, index)
role.storeData:updateProperty({field = "totalRR", value = totalRechargeRecord})
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
583
584
585
586
587
|
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
多队挂机任务取消功能,累充奖励
|
588
|
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
589
590
|
local reward, change = role:award(main, {log = {desc = "totalRecharge", int1 = index}})
SendPacket(actionCodes.Store_getTotalRechargeAwardRpc, MsgPack.pack(role:packReward(reward, change)))
|
4f7cffe5
liuzujun
多队挂机任务取消功能,累充奖励
|
591
592
593
|
return true
end
|
c40a6460
zhangqijia
feat: 月卡+特刊
|
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
|
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
商城
|
622
|
return _M
|