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
380
|
local specialsRecord = self:getProperty("specialsRecord") or {}
if self:getGoodsAmount() > 0 then return nil end
|
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
|
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
428
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
429
|
table.sort(record, function(a, b) return a.create_time > b.create_time end)
|
555f745e
zhangqijia
feat: 一番赏
|
430
431
432
|
local np = special["np"]
local count = np
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
433
|
local roleRecord = {}
|
555f745e
zhangqijia
feat: 一番赏
|
434
435
436
437
438
439
440
441
442
443
444
445
|
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: 一番赏增加通知信息的数据...
|
446
447
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
448
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
449
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
450
451
452
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
453
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
|
555f745e
zhangqijia
feat: 一番赏
|
454
|
|
555f745e
zhangqijia
feat: 一番赏
|
455
456
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
457
458
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
459
460
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
461
462
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
463
|
function Capsule:getJoker(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
464
465
|
local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
466
467
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
468
469
470
|
local specialsRecord = self:getProperty("specialsRecord") or {}
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
471
472
473
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
474
475
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
476
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
477
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
478
479
480
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
481
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
|
555f745e
zhangqijia
feat: 一番赏
|
482
|
|
555f745e
zhangqijia
feat: 一番赏
|
483
484
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
485
486
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
487
488
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
489
490
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
491
|
function Capsule:getKing(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
492
493
|
local spKey, special = self:checkSpecialFlag(SpecialType.KING)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
494
495
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
496
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
497
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
498
|
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
499
500
501
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
502
503
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
504
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
505
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
506
507
508
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
509
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.KING,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
510
511
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
512
513
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
514
515
516
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
end
|
555f745e
zhangqijia
feat: 一番赏
|
517
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
518
|
function Capsule:checkSpecialReward( now)
|
555f745e
zhangqijia
feat: 一番赏
|
519
520
521
|
local specials = self:getProperty("specials") or {}
if not next(specials) then return nil end
local record = self:getProperty("record") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
522
|
|
555f745e
zhangqijia
feat: 一番赏
|
523
524
|
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: 一番赏
|
525
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
526
|
local recordAmount = getRecordAmount(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
527
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
528
|
local notify = self:getTop(record, recordAmount,now) or {}
|
555f745e
zhangqijia
feat: 一番赏
|
529
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
530
|
local coreReward = self:getCore(record, recordAmount, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
531
532
|
rewardToNtyFunc(notify, coreReward)
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
533
|
local lastReward = self:getLast(record, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
534
535
|
rewardToNtyFunc(notify, lastReward)
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
536
|
local jokerReward = self:getJoker(record, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
537
538
|
rewardToNtyFunc(notify, jokerReward)
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
539
|
local kingReward = self:getKing(record, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
540
|
rewardToNtyFunc(notify, kingReward)
|
555f745e
zhangqijia
feat: 一番赏
|
541
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
542
|
|
555f745e
zhangqijia
feat: 一番赏
|
543
544
545
|
return notify
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
546
|
function Capsule:checkIncentive(roleId, name, now)
|
555f745e
zhangqijia
feat: 一番赏
|
547
|
local goods = self:getProperty("goods") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
548
549
|
local recordByRole = self:getProperty("recordByRole") or {}
local roleRecord = recordByRole[roleId] or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
550
551
|
local incentiveRecord = self:getProperty("incentiveRecord") or {}
local incentiveByRole = incentiveRecord[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
552
553
554
|
local incentive = self:getProperty("incentive")
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
555
|
local notify = {}
|
555f745e
zhangqijia
feat: 一番赏
|
556
557
558
559
560
561
562
563
564
|
-- 最后一抽 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: 一番赏增加通知信息的数据...
|
565
|
if last then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
566
|
notify["last"] = {name = name, good_id = "last", typ = RewardType.INCENTIVE, award = incentive["last"]["award"], amount = 1, quality = 1, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
567
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
568
569
570
571
572
573
574
575
576
577
578
579
580
|
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与...
|
581
|
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: 一番赏
|
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
|
--填充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: 一番赏奖励中加入得奖者的...
|
605
|
notify["probabilities"] = {name = name, good_id = "probabilities", typ = RewardType.INCENTIVE, award = incentive["probabilities"]["award"], amount = 1, quality = 3, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
606
|
|
555f745e
zhangqijia
feat: 一番赏
|
607
608
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
609
610
611
|
table.insert(incentiveByRole, notify)
incentiveRecord[roleId] = incentiveByRole
self:setProperty("incentiveRecord", incentiveRecord)
|
555f745e
zhangqijia
feat: 一番赏
|
612
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
613
614
|
--TODO 先屏蔽
return {}
|
555f745e
zhangqijia
feat: 一番赏
|
615
616
617
618
619
620
621
622
|
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: 一番赏增加通知信息的数据...
|
623
|
local roleRecord = recordByRole[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
624
625
626
627
628
|
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: 一番赏增加通知信息的数据...
|
629
|
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
630
631
|
--奖励, 通知信息
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
632
633
634
|
local notify= {}
notify[roleId] = {}
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
635
|
local name = getNameByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
636
637
|
while (goods and next(goods) and count > 0) do
local good_id = math.randWeight(goods, "weight")
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
638
|
if not good_id then break end
|
555f745e
zhangqijia
feat: 一番赏
|
639
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
640
641
642
643
644
645
646
647
648
649
650
651
652
653
|
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: 一番赏增加通知信息的数据...
|
654
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
655
656
657
658
659
|
--记录角色的抽奖记录 计算激励奖需要用到
if not roleRecord[good_id] then
roleRecord[good_id] = tmpNotify
else
roleRecord[good_id].amount = roleRecord[good_id].amount + 1
|
555f745e
zhangqijia
feat: 一番赏
|
660
|
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
661
662
663
|
good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
count = count - 1
|
555f745e
zhangqijia
feat: 一番赏
|
664
665
666
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
667
668
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
669
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
670
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
671
672
673
674
675
676
|
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: 一番赏
|
677
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
678
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
679
680
|
local speciNotify = self:checkSpecialReward(now)
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
681
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
682
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
683
684
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
685
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
686
687
688
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
689
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
690
691
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
692
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
693
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
694
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
695
696
697
698
699
700
|
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: 一番赏增加通知信息的数据...
|
701
702
|
local roleRecord = recordByRole[roleId] or {}
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
703
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
704
|
local name = getNameByRoleId(roleId)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
705
706
|
local notify = {}
notify[roleId] = {}
|
555f745e
zhangqijia
feat: 一番赏
|
707
|
for good_id, good in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
708
|
if good.amount > 0 then
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
709
|
--插入记录
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
710
|
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...
|
711
712
713
|
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: 一番赏
|
714
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
715
716
717
|
--作为奖励记录+通知
if not notify[roleId][good_id] then
notify[roleId][good_id] = tmpNotify
|
555f745e
zhangqijia
feat: 一番赏
|
718
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
719
|
notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
|
555f745e
zhangqijia
feat: 一番赏
|
720
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
721
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
722
723
|
--记录角色的抽奖记录
if not roleRecord[good_id] then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
724
|
roleRecord[good_id] = tmpNotify
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
725
726
|
else
roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
|
555f745e
zhangqijia
feat: 一番赏
|
727
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
728
729
|
good.amount = 0
|
555f745e
zhangqijia
feat: 一番赏
|
730
731
732
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
733
734
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
735
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
736
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
737
738
739
740
741
742
|
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: 一番赏
|
743
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
744
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
745
746
|
local speciNotify = self:checkSpecialReward(now)
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
747
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
748
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
749
750
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
751
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
752
753
754
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
755
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
756
757
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
758
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
759
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
760
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
761
762
763
764
765
|
end
--@param
--[[
@roleId
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
766
|
@typ 0=独享,1=公开
|
555f745e
zhangqijia
feat: 一番赏
|
767
768
769
770
|
@cares 关注{k=v}
]]--
function Capsule:draw(roleId, full, cares)
|
555f745e
zhangqijia
feat: 一番赏
|
771
772
|
if self:getProperty("typ") == 1 then
--是否报名
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
773
|
if self:isRegister(roleId) == false then return 4 end
|
555f745e
zhangqijia
feat: 一番赏
|
774
775
776
777
|
--关注的奖品的数量发生了变化
if cares then
local change = self:confirmed(cares)
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
778
|
if next(change) then return 5, change end
|
555f745e
zhangqijia
feat: 一番赏
|
779
780
781
782
|
end
end
if full == 0 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
783
|
return 6, self:drawByCount(roleId, 1)
|
555f745e
zhangqijia
feat: 一番赏
|
784
|
elseif full == 1 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
785
|
return 6, self:drawByCount(roleId, 10)
|
555f745e
zhangqijia
feat: 一番赏
|
786
|
elseif full == 2 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
787
|
return 6, self:drawAll(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
788
789
790
791
|
end
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
792
|
function Capsule:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
793
794
795
796
797
798
799
|
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
|
800
|
playerStatus = self:getRegisterByRoleId(roleId),
|
555f745e
zhangqijia
feat: 一番赏
|
801
|
record = self:getProperty("record"),
|
555f745e
zhangqijia
feat: 一番赏
|
802
803
804
805
|
rank = self:getProperty("rank"),
goods = self:getProperty("goods"),
specials = self:getProperty("specials"),
incentive = self:getProperty("incentive"),
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
806
|
specialsRecord= self:getProperty("specialsRecord"),
|
555f745e
zhangqijia
feat: 一番赏
|
807
808
809
810
|
}
end
return Capsule
|