555f745e
zhangqijia
feat: 一番赏
|
1
2
3
4
5
6
7
8
|
--扭蛋机
local MsgPack = MsgPack
local Capsule = class("Capsule", require("shared.ModelBase"))
function Capsule:ctor(properties)
Capsule.super.ctor(self, properties)
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
9
10
11
12
13
14
15
|
RewardType = {
GOODS = 1,
SPECIAL = 2,
INCENTIVE = 3,
}
SpecialType = {
|
555f745e
zhangqijia
feat: 一番赏
|
16
17
18
19
20
|
TOP = 1,
CORE = 2,
LAST = 3,
JOKER = 4,
KING = 5,
|
555f745e
zhangqijia
feat: 一番赏
|
21
22
23
24
25
26
27
|
}
CapsuleType = {
PRIVATE = 0,
PUBLIC = 1,
}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
28
29
|
--[[
--通知数据结构
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
30
|
{ [roleId] = { [good_id1] = { }, [good_id2] = { }, } }
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
31
32
|
]]--
|
555f745e
zhangqijia
feat: 一番赏
|
33
34
35
|
Capsule.schema = {
id = {"number", 0}, --扭蛋机key,配置读取
room = {"number", 0}, --房间号, 配置读取
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
36
|
name = {"string"},
|
555f745e
zhangqijia
feat: 一番赏
|
37
38
|
typ = {"number", 1}, -- 1=共享,2=独享
coin = {"number", 0}, --货币代号
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
39
|
token = {"table", {}}, --抽一次,货币=消耗
|
555f745e
zhangqijia
feat: 一番赏
|
40
41
42
43
44
45
46
|
register = {"table", {}}, --人数 {["id"]=0}, 0 围观, 1 已报名
record = {"table", {}}, --抽取记录 列表
recordByRole = {"table", {}}, -- 抽取记录,hash, {roleid=record}
rank = {"table", {}}, --排行
goods = {"table", {}}, --奖励池
specials = {"table", {}}, --特殊赏
incentive = {"table", {}}, --激励奖
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
47
48
|
incentiveRecord = {"table", {}}, --激励奖记录
specialsRecord= {"table", {}}, --特殊赏领取记录
|
555f745e
zhangqijia
feat: 一番赏
|
49
50
51
52
53
|
resetTimes = {"number", 0}, --每日一次手动重置的机会
hideTime = {"number", 0} , --隐藏时间
drawEndTime = {"number", 0}, --抽完时间
}
|
555f745e
zhangqijia
feat: 一番赏
|
54
55
56
57
58
59
|
function Capsule:getResetFields()
return {
id = self:getProperty("id"),
room = self:getProperty("room"),
typ = self:getProperty("typ"),
coin = 0,
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
60
|
token = {},
|
555f745e
zhangqijia
feat: 一番赏
|
61
62
63
64
65
66
67
|
register = {},
record = {},
recordByRole = {},
rank = {},
goods = {},
specials = {},
incentive = {},
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
68
|
incentiveRecord = {},
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
69
|
specialsRecord= {},
|
555f745e
zhangqijia
feat: 一番赏
|
70
|
resetTimes = 0,
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
71
72
|
hideTime = 0,
drawEndTime = 0,
|
555f745e
zhangqijia
feat: 一番赏
|
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
}
end
function Capsule:init()
local id = self:getProperty("id")
local room = self:getProperty("room")
self:setProperties(self:getResetFields())
local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
--奖励池
local goods_id = ichibankuji["goods_id"]
local goods, specials, incentive = {}, {}, {}
for _, data in pairs(csvdb["ichibankuji_goodsCsv"]) do
for _, val in pairs(data) do
if val.key == goods_id then
|
50a0dd50
zhangqijia
fix: 一番赏 重新组合商品id
|
89
|
goods[goods_id..val.id] = clone(val)
|
555f745e
zhangqijia
feat: 一番赏
|
90
91
92
|
end
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
93
|
for _, v in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
v.weight = (v.weight or 0) * v.amount
end
--特殊赏
local special_ids = ichibankuji["special_id"]
if special_ids ~= "" then
for _, special_id in ipairs(special_ids:toArray(true, "=")) do
local val = csvdb["ichibankuji_specialCsv"][special_id]
if type(val.type) == "number" then
specials[special_id] = {np= 1, amount = val.amount, award = val.award, quality = tonumber(val.type), showIndex = val.showIndex}
elseif type(val.type) == "string" then
local pos = val.type:find("=")
if pos then
for k, v in pairs(val.type:toNumMap()) do
specials[special_id] = {np= v, amount = val.amount, award = val.award, quality = k, showIndex = val.showIndex}
end
else
specials[special_id] = {np= 1, amount = val.amount, award = val.award, quality = tonumber(val.type), showIndex = val.showIndex}
end
end
end
end
--激励奖
local incentive_ids = ichibankuji["incentive_id"]
if incentive_ids ~= "" then
for _, incentive_id in ipairs(incentive_ids:toArray(true, "=")) do
local val = csvdb["ichibankuji_incentiveCsv"][incentive_id]
if type(val.type) == "number" then
incentive["last"] = {np=val.type, award = val.award}
elseif type(val.type) == "string" then
for k, v in pairs(val.type:toNumMap()) do
if k == 2 then
incentive["amount"] = {np= v, award = val.award}
elseif k==3 then
incentive["probabilities"] = {np= v, award = val.award}
end
end
end
end
end
--货币类型
local coin = ichibankuji["token"]:toArray(true, "=")
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
137
|
self:setProperties({coin = coin[1] or 0, token = coin, hideTime = ichibankuji.hide_time, goods = goods, specials = specials, incentive = incentive})
|
49810b00
zhangqijia
fix: 一番赏 抽奖记录 去掉a...
|
138
|
|
555f745e
zhangqijia
feat: 一番赏
|
139
140
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
141
142
143
144
145
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
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
function Capsule:isShow()
if skynet.timex() >= self:getProperty("hideTime") then
return false
end
return true
end
function Capsule:refreshing(now)
local id = self:getProperty("id")
local room = self:getProperty("room")
local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
local reset = tostring(ichibankuji.reset)
if reset == "0" then
return false
elseif reset == "1" then
if self:getProperty("resetTimes") == 1 then
return true
end
return false
else
local resetArr = reset:toArray(true, "=")
if not next(resetArr) then return false end
if resetArr[1] == "2" then
if self:getGoodsAmount() > 0 then return false end
local drawEndTime = self:getProperty("drawEndTime") or 0
if drawEndTime == 0 then return false end
if now - drawEndTime >= resetArr[2] then
return true
end
return false
elseif resetArr[1] == "3" then
elseif resetArr[1] == "4" then
if now >= resetArr[2] then return true end
end
end
return false
end
|
555f745e
zhangqijia
feat: 一番赏
|
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
|
function Capsule:getOnlineCount()
local register = self:getProperty("register") or {}
local reg, onlookers = 0, 0
for _, v in pairs(register) do
if v == 1 then
reg = reg + 1
else
onlookers = onlookers + 1
end
end
return {[0]=onlookers, [1]=reg, [2] = reg+onlookers}
end
function Capsule:join(roleId)
--一个房间最多人数 TODO
local register = self:getProperty("register") or {}
register[roleId] = 0
self:setProperty("register", register)
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
204
|
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
205
206
|
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
207
|
function Capsule:getRegisterByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
208
|
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
209
210
211
212
213
|
return register[roleId] or 0
end
function Capsule:isRegister(roleId)
return self:getRegisterByRoleId(roleId) == 1
|
555f745e
zhangqijia
feat: 一番赏
|
214
215
216
217
|
end
function Capsule:register(roleId)
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
218
219
220
|
register[roleId] = 1
self:setProperty("register", register)
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
|
end
function Capsule:exit(roleId)
local register = self:getProperty("register") or {}
if next(register) then
register[roleId] = nil
return true
end
return false
end
function Capsule:confirmed(cares)
local goods = self:getProperty("goods") or {}
local specials = self:getProperty("specials") or {}
local change = {}
for k, v in pairs(cares) do
if v.typ == 1 then
if goods[k] and goods[k].amount ~= v.count then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
239
|
change[k] = {typ=1, count = goods[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
240
241
242
|
end
else
if specials[k] and specials[k].amount ~= v.count then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
243
|
change[k] = {typ=1, count = specials[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
244
245
246
247
248
249
250
251
252
|
end
end
end
return change
end
function Capsule:getGoodsAmount()
local goods = self:getProperty("goods") or {}
local amount = 0
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
253
|
for _, v in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
|
amount = amount + v.amount
end
return amount
end
function Capsule:getSpecialByType(typ)
local specials = self:getProperty("specials") or {}
for k, v in pairs(specials) do
if v.quality == typ then
return k, v
end
end
return nil
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
269
270
|
function Capsule:checkSpecialFlag(typ)
local spKey, special = self:getSpecialByType(typ)
|
555f745e
zhangqijia
feat: 一番赏
|
271
272
|
if not special then return nil end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
273
274
275
|
if special["amount"] <= 0 then return nil end
return spKey, special
end
|
555f745e
zhangqijia
feat: 一番赏
|
276
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
277
278
279
280
281
|
local function getSpecialRoleNotify(rewardRecord, count, award, spKey, typ, now)
local rewardByRole = {}
while(count > 0 and next(rewardRecord)) do
local roleId = math.randWeight(rewardRecord, "amount")
if roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
282
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
283
284
285
286
|
local tmp = rewardRecord[roleId]
tmp["amount"] = tmp["amount"] - 1
if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
|
555f745e
zhangqijia
feat: 一番赏
|
287
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
288
289
|
tmp = rewardByRole[roleId] or {}
if not next(tmp) then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
290
291
|
local name = getNameByRoleId(roleId)
tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
|
555f745e
zhangqijia
feat: 一番赏
|
292
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
293
|
if not tmp[spKey] then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
294
295
|
local name = getNameByRoleId(roleId)
tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
296
297
298
|
else
tmp[spKey].amount = tmp[spKey].amount + 1
end
|
555f745e
zhangqijia
feat: 一番赏
|
299
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
300
|
rewardByRole[roleId] = tmp
|
555f745e
zhangqijia
feat: 一番赏
|
301
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
302
303
304
305
306
|
count = count - 1
end
end
return rewardByRole, count
end
|
555f745e
zhangqijia
feat: 一番赏
|
307
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
|
local rewardToNtyFunc = function(notify, tmpReward)
for key, val in pairs(tmpReward or {}) do
if not notify[key] then
notify[key] = clone(val)
else
for k, v in pairs(val) do
if not notify[key][k] then
notify[key][k] = v
else
notify[key][k] = notify[key][k].amount + v.amount
end
end
end
end
end
local function getRecordAmount(record)
|
49810b00
zhangqijia
fix: 一番赏 抽奖记录 去掉a...
|
327
|
return #record
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
328
329
330
331
|
end
function Capsule:getTop(record, recordAmount,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
332
333
334
335
|
local spKey, special = self:checkSpecialFlag(SpecialType.TOP)
if not special then return nil end
local specials = self:getProperty("specials") or {}
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
336
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
337
338
|
if recordAmount < special["np"] then return nil end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
339
340
341
342
|
local topRecord = {}
local count = special["np"]
for _, v in ipairs(record) do
if count <= 0 then break end
|
555f745e
zhangqijia
feat: 一番赏
|
343
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
344
345
346
347
348
349
350
|
local tmpCount = 0
if count >= v.amount then
count = count - v.amount
tmpCount = v.amount
else
tmpCount = count
count = 0
|
555f745e
zhangqijia
feat: 一番赏
|
351
352
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
353
354
355
356
357
|
if not topRecord[v.roleId]then
topRecord[v.roleId] = {amount = v.amount }
else
topRecord[v.roleId] = {amount = (topRecord[v.roleId]["amount"] or 0) + tmpCount}
end
|
555f745e
zhangqijia
feat: 一番赏
|
358
359
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
360
|
local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
361
362
363
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
364
365
366
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
367
368
369
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
370
371
372
|
end
--TODO
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
373
|
function Capsule:getCore(record, recordAmount,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
374
375
|
local spKey, special = self:checkSpecialFlag(SpecialType.CORE)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
376
377
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
378
379
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
380
|
|
555f745e
zhangqijia
feat: 一番赏
|
381
382
|
local np = special["np"]
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
383
|
if np > recordAmount then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
384
385
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
386
|
local left = math.ceil((np - recordAmount)/2) or 0
|
555f745e
zhangqijia
feat: 一番赏
|
387
388
389
390
391
392
393
394
395
396
397
398
399
400
|
local count = np
local roleRecord = {}
for i, v in ipairs(record) do
if count <= 0 then break end
if i > left then
local tmpCount = 0
if count >= v.amount then
count = count - v.amount
tmpCount = v.amount
else
tmpCount = count
count = 0
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
401
402
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
403
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
404
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
405
406
407
408
409
|
end
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
410
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
|
555f745e
zhangqijia
feat: 一番赏
|
411
|
|
555f745e
zhangqijia
feat: 一番赏
|
412
413
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
414
415
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
416
417
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
418
419
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
420
|
function Capsule:getLast(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
421
422
|
local spKey, special = self:checkSpecialFlag(SpecialType.LAST)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
423
424
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
425
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
426
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
427
|
table.sort(record, function(a, b) return a.create_time > b.create_time end)
|
555f745e
zhangqijia
feat: 一番赏
|
428
429
430
|
local np = special["np"]
local count = np
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
431
|
local roleRecord = {}
|
555f745e
zhangqijia
feat: 一番赏
|
432
433
434
435
436
437
438
439
440
441
442
443
|
for _, v in ipairs(record) do
if count <= 0 then break end
local tmpCount = 0
if count >= v.amount then
count = count - v.amount
tmpCount = v.amount
else
tmpCount = count
count = 0
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
444
445
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
446
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
447
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
448
449
450
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
451
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
|
555f745e
zhangqijia
feat: 一番赏
|
452
|
|
555f745e
zhangqijia
feat: 一番赏
|
453
454
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
455
456
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
457
458
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
459
460
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
461
|
function Capsule:getJoker(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
462
463
|
local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
464
465
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
466
467
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
468
469
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
470
471
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
472
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
473
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
474
475
476
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
477
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
|
555f745e
zhangqijia
feat: 一番赏
|
478
|
|
555f745e
zhangqijia
feat: 一番赏
|
479
480
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
481
482
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
483
484
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
485
486
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
487
|
function Capsule:getKing(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
488
489
|
local spKey, special = self:checkSpecialFlag(SpecialType.KING)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
490
491
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
492
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
493
|
|
555f745e
zhangqijia
feat: 一番赏
|
494
495
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
496
497
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
498
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
499
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
500
501
502
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
503
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.KING,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
504
505
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
506
507
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
508
509
510
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
end
|
555f745e
zhangqijia
feat: 一番赏
|
511
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
512
|
function Capsule:checkSpecialReward(now, goodsAmount)
|
555f745e
zhangqijia
feat: 一番赏
|
513
514
515
|
local specials = self:getProperty("specials") or {}
if not next(specials) then return nil end
local record = self:getProperty("record") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
516
|
|
555f745e
zhangqijia
feat: 一番赏
|
517
518
|
if not next(record) then return nil end
table.sort(record, function(a, b) return a.create_time < b.create_time end )
|
555f745e
zhangqijia
feat: 一番赏
|
519
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
520
|
local recordAmount = getRecordAmount(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
521
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
522
|
local notify = self:getTop(record, recordAmount,now) or {}
|
555f745e
zhangqijia
feat: 一番赏
|
523
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
524
525
526
|
if goodsAmount == 0 then
local coreReward = self:getCore(record, recordAmount, now)
rewardToNtyFunc(notify, coreReward)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
527
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
528
529
|
local lastReward = self:getLast(record, now)
rewardToNtyFunc(notify, lastReward)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
530
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
531
532
|
local jokerReward = self:getJoker(record, now)
rewardToNtyFunc(notify, jokerReward)
|
555f745e
zhangqijia
feat: 一番赏
|
533
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
534
535
536
|
local kingReward = self:getKing(record, now)
rewardToNtyFunc(notify, kingReward)
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
537
|
|
555f745e
zhangqijia
feat: 一番赏
|
538
539
540
|
return notify
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
541
|
function Capsule:checkIncentive(roleId, name, now)
|
555f745e
zhangqijia
feat: 一番赏
|
542
|
local goods = self:getProperty("goods") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
543
544
|
local recordByRole = self:getProperty("recordByRole") or {}
local roleRecord = recordByRole[roleId] or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
545
546
|
local incentiveRecord = self:getProperty("incentiveRecord") or {}
local incentiveByRole = incentiveRecord[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
547
548
549
|
local incentive = self:getProperty("incentive")
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
550
|
local notify = {}
|
555f745e
zhangqijia
feat: 一番赏
|
551
552
553
554
555
556
557
558
559
|
-- 最后一抽 TODO
if incentive["last"] then
local last = true
for k, v in pairs(goods) do
if v and v.amount then
last = false
break
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
560
|
if last then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
561
|
notify["last"] = {name = name, good_id = "last", typ = RewardType.INCENTIVE, award = incentive["last"]["award"], amount = 1, quality = 1, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
562
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
563
564
565
566
567
568
569
570
571
572
573
574
575
|
end
--次数
if incentive["amount"] then
local amount = 0
for _, v in pairs(roleRecord) do
if (v.calculated or 0) == 0 then
amount = amount + v.amount
end
end
local count = math.floor(amount / incentive["amount"]["np"])
local tmpCount = count * incentive["amount"]["np"]
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
576
|
notify["amount"] = {name = name, roleId= roleId, good_id = "amount", typ = RewardType.INCENTIVE, award = incentive["amount"]["award"], amount = count, quality = 2, create_time= now}
|
555f745e
zhangqijia
feat: 一番赏
|
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
|
--填充v.calculated 字段,标识已经用于每x抽的计算中。
for _, v in pairs(roleRecord) do
if tmpCount <= 0 then break end
v.calculated = v.calculated or 0
if v.calculated ~= v.amount then
if tmpCount <= v.amount then
v.calculated = tmpCount
tmpCount = 0
else
v.calculated = v.amount
tmpCount = tmpCount - v.amount
end
end
end
end
--概率
if incentive["probabilities"] then
local probabilities = math.randomInt(1, 100)
if probabilities <= incentive["probabilities"]["np"] then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
600
|
notify["probabilities"] = {name = name, good_id = "probabilities", typ = RewardType.INCENTIVE, award = incentive["probabilities"]["award"], amount = 1, quality = 3, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
601
|
|
555f745e
zhangqijia
feat: 一番赏
|
602
603
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
604
605
606
|
table.insert(incentiveByRole, notify)
incentiveRecord[roleId] = incentiveByRole
self:setProperty("incentiveRecord", incentiveRecord)
|
555f745e
zhangqijia
feat: 一番赏
|
607
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
608
609
|
--TODO 先屏蔽
return {}
|
555f745e
zhangqijia
feat: 一番赏
|
610
611
612
613
614
615
616
617
|
end
function Capsule:drawByCount(roleId, count)
if count <= 0 then return nil end
local goods = self:getProperty("goods") or {}
local record = self:getProperty("record") or {}
local recordByRole = self:getProperty("recordByRole") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
618
|
local roleRecord = recordByRole[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
619
620
621
622
623
|
local id = self:getProperty("id")
local room = self:getProperty("room")
local ichibankuji = csvdb["ichibankuji_mainCsv"][id][room]
local goods_id = ichibankuji["goods_id"]
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
624
|
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
625
626
|
--奖励, 通知信息
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
627
628
629
|
local notify= {}
notify[roleId] = {}
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
630
|
local name = getNameByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
631
632
|
while (goods and next(goods) and count > 0) do
local good_id = math.randWeight(goods, "weight")
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
633
|
if not good_id then break end
|
555f745e
zhangqijia
feat: 一番赏
|
634
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
635
636
637
638
639
640
641
642
643
644
645
646
647
648
|
local good = goods[good_id] or {}
if good and good.amount > 0 then
good.amount = good.amount - 1
--插入记录
local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time= now}
table.insert(record, tmpNotify)
--作为奖励记录+通知
if not notify[roleId][good_id] then
notify[roleId][good_id] = tmpNotify
else
notify[roleId][good_id].amount = notify[roleId][good_id].amount + 1
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
649
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
650
651
652
653
654
|
--记录角色的抽奖记录 计算激励奖需要用到
if not roleRecord[good_id] then
roleRecord[good_id] = tmpNotify
else
roleRecord[good_id].amount = roleRecord[good_id].amount + 1
|
555f745e
zhangqijia
feat: 一番赏
|
655
|
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
656
657
658
|
good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
count = count - 1
|
555f745e
zhangqijia
feat: 一番赏
|
659
660
661
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
662
663
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
664
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
665
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
666
667
668
669
670
671
|
for k, v in pairs(tmpNotify) do
if not notify[roleId][k] then
notify[roleId][k] = v
else
notify[roleId][k].amount = notify[roleId][k].amount + v.amount
end
|
555f745e
zhangqijia
feat: 一番赏
|
672
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
673
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
674
675
|
local speciNotify = self:checkSpecialReward(now)
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
676
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
677
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
678
679
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
680
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
681
682
683
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
684
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
685
686
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
687
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
688
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
689
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
690
691
692
693
694
695
|
end
function Capsule:drawAll(roleId)
local goods = self:getProperty("goods") or {}
local record = self:getProperty("record") or {}
local recordByRole = self:getProperty("recordByRole") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
696
697
|
local roleRecord = recordByRole[roleId] or {}
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
698
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
699
|
local name = getNameByRoleId(roleId)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
700
701
|
local notify = {}
notify[roleId] = {}
|
555f745e
zhangqijia
feat: 一番赏
|
702
|
for good_id, good in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
703
|
if good.amount > 0 then
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
704
|
--插入记录
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
705
|
local tmpNotify = {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = good.amount, quality = good.quality, create_time = now}
|
49810b00
zhangqijia
fix: 一番赏 抽奖记录 去掉a...
|
706
707
708
|
for i = 1, good.amount do
table.insert(record, {roleId = roleId, name= name, good_id = good_id, typ = RewardType.GOODS, award = good.award, amount = 1, quality = good.quality, create_time = now})
end
|
555f745e
zhangqijia
feat: 一番赏
|
709
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
710
711
712
|
--作为奖励记录+通知
if not notify[roleId][good_id] then
notify[roleId][good_id] = tmpNotify
|
555f745e
zhangqijia
feat: 一番赏
|
713
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
714
|
notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
|
555f745e
zhangqijia
feat: 一番赏
|
715
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
716
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
717
718
|
--记录角色的抽奖记录
if not roleRecord[good_id] then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
719
|
roleRecord[good_id] = tmpNotify
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
720
721
|
else
roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
|
555f745e
zhangqijia
feat: 一番赏
|
722
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
723
724
|
good.amount = 0
|
555f745e
zhangqijia
feat: 一番赏
|
725
726
727
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
728
729
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
730
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
731
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
732
733
734
735
736
737
|
for k, v in pairs(tmpNotify) do
if not notify[roleId][k] then
notify[roleId][k] = v
else
notify[roleId][k].amount = notify[roleId][k].amount + v.amount
end
|
555f745e
zhangqijia
feat: 一番赏
|
738
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
739
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
740
741
|
local goodsAmount = self:getGoodsAmount()
local speciNotify = self:checkSpecialReward(now, goodsAmount)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
742
|
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
743
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
744
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
745
746
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
747
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
748
749
750
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
751
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
752
753
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
754
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
755
|
end
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
756
757
758
759
760
|
if goodsAmount == 0 then
self:setProperty("drawEndTime", now)
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
761
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
762
763
764
765
766
|
end
--@param
--[[
@roleId
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
767
|
@typ 0=独享,1=公开
|
555f745e
zhangqijia
feat: 一番赏
|
768
769
770
771
|
@cares 关注{k=v}
]]--
function Capsule:draw(roleId, full, cares)
|
555f745e
zhangqijia
feat: 一番赏
|
772
773
|
if self:getProperty("typ") == 1 then
--是否报名
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
774
|
if self:isRegister(roleId) == false then return 4 end
|
555f745e
zhangqijia
feat: 一番赏
|
775
776
777
778
|
--关注的奖品的数量发生了变化
if cares then
local change = self:confirmed(cares)
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
779
|
if next(change) then return 5, change end
|
555f745e
zhangqijia
feat: 一番赏
|
780
781
782
783
|
end
end
if full == 0 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
784
|
return 6, self:drawByCount(roleId, 1)
|
555f745e
zhangqijia
feat: 一番赏
|
785
|
elseif full == 1 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
786
|
return 6, self:drawByCount(roleId, 10)
|
555f745e
zhangqijia
feat: 一番赏
|
787
|
elseif full == 2 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
788
|
return 6, self:drawAll(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
789
790
791
792
|
end
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
793
|
function Capsule:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
794
795
796
797
798
799
800
|
return {
id = self:getProperty("id"),
room = self:getProperty("room"),
typ = self:getProperty("typ"),
name = self:getProperty("name"),
coin = self:getProperty("coin"),
onlineCount = self:getOnlineCount(),
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
801
|
playerStatus = self:getRegisterByRoleId(roleId),
|
555f745e
zhangqijia
feat: 一番赏
|
802
|
record = self:getProperty("record"),
|
555f745e
zhangqijia
feat: 一番赏
|
803
804
805
806
|
rank = self:getProperty("rank"),
goods = self:getProperty("goods"),
specials = self:getProperty("specials"),
incentive = self:getProperty("incentive"),
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
807
|
specialsRecord= self:getProperty("specialsRecord"),
|
555f745e
zhangqijia
feat: 一番赏
|
808
809
810
811
|
}
end
return Capsule
|