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
|
function Capsule:isShow()
if skynet.timex() >= self:getProperty("hideTime") then
return false
end
return true
end
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
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
186
187
188
189
190
191
192
193
194
195
196
197
|
function Capsule:resetTimeOut(curTime, now)
now = now or skynet.timex()
local cur4Time = curTime or (specTime({hour = 4},now))
local interval
if cur4Time > now then
interval = cur4Time - now
elseif cur4Time < now then
local nextTime = dayLater(now)
interval = nextTime - now
elseif cur4Time == now then
self:init()
self:create()
local nextTime = dayLater(now)
interval = nextTime - now
end
interval = (interval + 1)* 100
skynet.timeout(interval, handler(self,self.resetTimeOut))
end
function Capsule:reset4TimeOut(curTime, now)
now = now or skynet.timex()
local interval
if curTime > now then
interval = curTime - now
elseif curTime < now then
local nextTime = dayLater(now)
interval = nextTime - now
elseif curTime == now then
self:init()
self:create()
return false
end
interval = (interval + 1)* 100
skynet.timeout(interval, handler(self,self.reset4TimeOut))
end
function Capsule:checkTime(resetArr, now)
if resetArr[1] == "3" then
local cur4Time = specTime({hour = 4},now)
if now == cur4Time then return true end
self:resetTimeOut(cur4Time, now)
elseif resetArr[1] == "4" then
if now == resetArr[2] then return true end
self:reset4TimeOut(resetArr[2], now)
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
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
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
226
227
|
else
self:checkTime(resetArr, now)
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
228
|
end
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
229
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
230
231
232
233
234
|
end
return false
end
|
555f745e
zhangqijia
feat: 一番赏
|
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
|
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
|
253
|
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
254
255
|
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
256
|
function Capsule:getRegisterByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
257
|
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
258
259
260
261
262
|
return register[roleId] or 0
end
function Capsule:isRegister(roleId)
return self:getRegisterByRoleId(roleId) == 1
|
555f745e
zhangqijia
feat: 一番赏
|
263
264
265
266
|
end
function Capsule:register(roleId)
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
267
268
269
|
register[roleId] = 1
self:setProperty("register", register)
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
|
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与...
|
288
|
change[k] = {typ=1, count = goods[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
289
290
291
|
end
else
if specials[k] and specials[k].amount ~= v.count then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
292
|
change[k] = {typ=1, count = specials[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
293
294
295
296
297
298
299
300
301
|
end
end
end
return change
end
function Capsule:getGoodsAmount()
local goods = self:getProperty("goods") or {}
local amount = 0
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
302
|
for _, v in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
|
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: 一番赏增加通知信息的数据...
|
318
319
|
function Capsule:checkSpecialFlag(typ)
local spKey, special = self:getSpecialByType(typ)
|
555f745e
zhangqijia
feat: 一番赏
|
320
321
|
if not special then return nil end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
322
323
324
|
if special["amount"] <= 0 then return nil end
return spKey, special
end
|
555f745e
zhangqijia
feat: 一番赏
|
325
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
326
327
328
329
330
|
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: 一番赏奖励中加入得奖者的...
|
331
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
332
333
334
335
|
local tmp = rewardRecord[roleId]
tmp["amount"] = tmp["amount"] - 1
if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
|
555f745e
zhangqijia
feat: 一番赏
|
336
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
337
338
|
tmp = rewardByRole[roleId] or {}
if not next(tmp) then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
339
340
|
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: 一番赏
|
341
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
342
|
if not tmp[spKey] then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
343
344
|
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: 一番赏增加通知信息的数据...
|
345
346
347
|
else
tmp[spKey].amount = tmp[spKey].amount + 1
end
|
555f745e
zhangqijia
feat: 一番赏
|
348
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
349
|
rewardByRole[roleId] = tmp
|
555f745e
zhangqijia
feat: 一番赏
|
350
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
351
352
353
354
355
|
count = count - 1
end
end
return rewardByRole, count
end
|
555f745e
zhangqijia
feat: 一番赏
|
356
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
|
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...
|
376
|
return #record
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
377
378
379
380
|
end
function Capsule:getTop(record, recordAmount,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
381
382
383
384
|
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: 一番赏
|
385
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
386
387
|
if recordAmount < special["np"] then return nil end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
388
389
390
391
|
local topRecord = {}
local count = special["np"]
for _, v in ipairs(record) do
if count <= 0 then break end
|
555f745e
zhangqijia
feat: 一番赏
|
392
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
393
394
395
396
397
398
399
|
local tmpCount = 0
if count >= v.amount then
count = count - v.amount
tmpCount = v.amount
else
tmpCount = count
count = 0
|
555f745e
zhangqijia
feat: 一番赏
|
400
401
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
402
403
404
405
406
|
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: 一番赏
|
407
408
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
409
|
local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
410
411
412
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
413
414
415
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
416
417
418
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
419
420
421
|
end
--TODO
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
422
|
function Capsule:getCore(record, recordAmount,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
423
424
|
local spKey, special = self:checkSpecialFlag(SpecialType.CORE)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
425
426
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
427
428
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
429
|
|
555f745e
zhangqijia
feat: 一番赏
|
430
431
|
local np = special["np"]
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
432
|
if np > recordAmount then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
433
434
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
435
|
local left = math.ceil((np - recordAmount)/2) or 0
|
555f745e
zhangqijia
feat: 一番赏
|
436
437
438
439
440
441
442
443
444
445
446
447
448
449
|
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: 一番赏增加通知信息的数据...
|
450
451
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
452
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
453
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
454
455
456
457
458
|
end
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
459
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.CORE,now)
|
555f745e
zhangqijia
feat: 一番赏
|
460
|
|
555f745e
zhangqijia
feat: 一番赏
|
461
462
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
463
464
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
465
466
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
467
468
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
469
|
function Capsule:getLast(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
470
471
|
local spKey, special = self:checkSpecialFlag(SpecialType.LAST)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
472
473
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
474
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
475
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
476
|
table.sort(record, function(a, b) return a.create_time > b.create_time end)
|
555f745e
zhangqijia
feat: 一番赏
|
477
478
479
|
local np = special["np"]
local count = np
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
480
|
local roleRecord = {}
|
555f745e
zhangqijia
feat: 一番赏
|
481
482
483
484
485
486
487
488
489
490
491
492
|
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: 一番赏增加通知信息的数据...
|
493
494
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
495
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
496
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
497
498
499
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
500
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.LAST,now)
|
555f745e
zhangqijia
feat: 一番赏
|
501
|
|
555f745e
zhangqijia
feat: 一番赏
|
502
503
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
504
505
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
506
507
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
508
509
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
510
|
function Capsule:getJoker(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
511
512
|
local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
513
514
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
515
516
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
517
518
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
519
520
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
521
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
522
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
523
524
525
|
end
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
526
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], spKey, SpecialType.JOKER,now)
|
555f745e
zhangqijia
feat: 一番赏
|
527
|
|
555f745e
zhangqijia
feat: 一番赏
|
528
529
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
530
531
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
532
533
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
534
535
|
end
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
536
|
function Capsule:getKing(record,now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
537
538
|
local spKey, special = self:checkSpecialFlag(SpecialType.KING)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
539
540
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
541
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
542
543
|
local rank = self:getProperty("rank") or {}
if not next(rank) then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
544
|
|
555f745e
zhangqijia
feat: 一番赏
|
545
|
local roleRecord = {}
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
|
for roleId, count in pairs(rank) do
table.insert(roleRecord, {roleId = roleId, count = count})
end
table.sort(roleRecord, function(a, b) return a.count > b.count end)
--tmp[spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = award, amount = 1, quality = typ, create_time= now}
local count = math.min(special["amount"], #roleRecord)
local rewardByRole = {}
local index = 1
while (count > 0 ) do
count = count - 1
local tmp = roleRecord[index]
if not tmp then break end
index = index + 1
local name = getNameByRoleId(tmp.roleId)
rewardByRole[tmp.roleId][spKey] = {name = name, good_id = spKey, typ = RewardType.SPECIAL, award = special["award"], amount = 1, SpecialType.KING, create_time= now}
|
555f745e
zhangqijia
feat: 一番赏
|
566
567
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
568
569
|
special["amount"] = count
specials[spKey] = special
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
570
571
|
rewardToNtyFunc(specialsRecord, rewardByRole)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
572
573
574
|
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
end
|
555f745e
zhangqijia
feat: 一番赏
|
575
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
576
|
function Capsule:checkSpecialReward(now, goodsAmount)
|
555f745e
zhangqijia
feat: 一番赏
|
577
578
579
|
local specials = self:getProperty("specials") or {}
if not next(specials) then return nil end
local record = self:getProperty("record") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
580
|
|
555f745e
zhangqijia
feat: 一番赏
|
581
582
|
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: 一番赏
|
583
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
584
|
local recordAmount = getRecordAmount(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
585
|
|
0a421d34
zhangqijia
fix: 一番赏奖励 刷新协议缺少...
|
586
|
local notify = self:getTop(record, recordAmount,now) or {}
|
555f745e
zhangqijia
feat: 一番赏
|
587
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
588
589
590
|
if goodsAmount == 0 then
local coreReward = self:getCore(record, recordAmount, now)
rewardToNtyFunc(notify, coreReward)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
591
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
592
593
|
local lastReward = self:getLast(record, now)
rewardToNtyFunc(notify, lastReward)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
594
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
595
596
|
local jokerReward = self:getJoker(record, now)
rewardToNtyFunc(notify, jokerReward)
|
555f745e
zhangqijia
feat: 一番赏
|
597
|
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
598
599
600
|
local kingReward = self:getKing(record, now)
rewardToNtyFunc(notify, kingReward)
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
601
|
|
555f745e
zhangqijia
feat: 一番赏
|
602
603
604
|
return notify
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
605
|
function Capsule:checkIncentive(roleId, name, now)
|
555f745e
zhangqijia
feat: 一番赏
|
606
|
local goods = self:getProperty("goods") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
607
608
|
local recordByRole = self:getProperty("recordByRole") or {}
local roleRecord = recordByRole[roleId] or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
609
610
|
local incentiveRecord = self:getProperty("incentiveRecord") or {}
local incentiveByRole = incentiveRecord[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
611
612
613
|
local incentive = self:getProperty("incentive")
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
614
|
local notify = {}
|
555f745e
zhangqijia
feat: 一番赏
|
615
616
617
618
619
620
621
622
623
|
-- 最后一抽 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: 一番赏增加通知信息的数据...
|
624
|
if last then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
625
|
notify["last"] = {name = name, good_id = "last", typ = RewardType.INCENTIVE, award = incentive["last"]["award"], amount = 1, quality = 1, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
626
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
627
628
629
630
631
632
633
634
635
636
637
638
639
|
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与...
|
640
|
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: 一番赏
|
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
|
--填充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: 一番赏奖励中加入得奖者的...
|
664
|
notify["probabilities"] = {name = name, good_id = "probabilities", typ = RewardType.INCENTIVE, award = incentive["probabilities"]["award"], amount = 1, quality = 3, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
665
|
|
555f745e
zhangqijia
feat: 一番赏
|
666
667
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
668
669
670
|
table.insert(incentiveByRole, notify)
incentiveRecord[roleId] = incentiveByRole
self:setProperty("incentiveRecord", incentiveRecord)
|
555f745e
zhangqijia
feat: 一番赏
|
671
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
672
673
|
--TODO 先屏蔽
return {}
|
555f745e
zhangqijia
feat: 一番赏
|
674
675
|
end
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
|
local rewardCollect = function(reward, goods)
for _, v in pairs(goods) do
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
end
end
local rewardCollectByRoleId = function(roleId, reward, goods)
local tmp = {}
for key, val in pairs(goods) do
if roleId == key then
for k, v in pairs(val) do
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
end
tmp = val
end
end
return tmp
end
|
555f745e
zhangqijia
feat: 一番赏
|
700
701
702
703
704
|
function Capsule:drawByCount(roleId, count)
if count <= 0 then return nil end
local goods = self:getProperty("goods") or {}
local record = self:getProperty("record") or {}
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
705
706
|
local rank = self:getProperty("rank") or {}
local rankRole = rank[roleId] or 0
|
555f745e
zhangqijia
feat: 一番赏
|
707
|
local recordByRole = self:getProperty("recordByRole") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
708
|
local roleRecord = recordByRole[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
709
710
711
712
713
|
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: 一番赏增加通知信息的数据...
|
714
|
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
715
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
716
717
|
--奖励,普通奖品信息
local goodsByUsual= {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
718
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
719
|
local name = getNameByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
720
721
|
while (goods and next(goods) and count > 0) do
local good_id = math.randWeight(goods, "weight")
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
722
|
if not good_id then break end
|
555f745e
zhangqijia
feat: 一番赏
|
723
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
724
725
726
727
|
local good = goods[good_id] or {}
if good and good.amount > 0 then
good.amount = good.amount - 1
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
728
729
730
|
--插入rank
rankRole = rankRole + 1
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
731
732
733
734
735
|
--插入记录
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)
--作为奖励记录+通知
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
736
737
|
if not goodsByUsual[good_id] then
goodsByUsual[good_id] = tmpNotify
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
738
|
else
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
739
|
goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + 1
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
740
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
741
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
742
743
744
745
746
|
--记录角色的抽奖记录 计算激励奖需要用到
if not roleRecord[good_id] then
roleRecord[good_id] = tmpNotify
else
roleRecord[good_id].amount = roleRecord[good_id].amount + 1
|
555f745e
zhangqijia
feat: 一番赏
|
747
|
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
748
749
750
|
good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
count = count - 1
|
555f745e
zhangqijia
feat: 一番赏
|
751
752
753
|
end
end
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
754
755
|
--奖励池重新赋值
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
756
|
rank[roleId] = rankRole
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
757
|
recordByRole[roleId] = roleRecord
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
758
|
self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
|
555f745e
zhangqijia
feat: 一番赏
|
759
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
760
761
762
|
--奖励收集
local reward = {}
rewardCollect(reward, goodsByUsual)
|
555f745e
zhangqijia
feat: 一番赏
|
763
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
764
765
|
local goodsByIncentive = self:checkIncentive(roleId, name, now)
rewardCollect(reward, goodsByIncentive)
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
766
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
767
768
769
|
local goodsAmount = self:getGoodsAmount()
if goodsAmount == 0 then
self:setProperty("drawEndTime", now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
770
|
end
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
771
772
773
774
775
|
local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
|
555f745e
zhangqijia
feat: 一番赏
|
776
777
778
779
780
|
end
function Capsule:drawAll(roleId)
local goods = self:getProperty("goods") or {}
local record = self:getProperty("record") or {}
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
781
782
|
local rank = self:getProperty("rank") or {}
local rankRole = rank[roleId] or 0
|
555f745e
zhangqijia
feat: 一番赏
|
783
|
local recordByRole = self:getProperty("recordByRole") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
784
785
|
local roleRecord = recordByRole[roleId] or {}
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
786
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
787
|
local name = getNameByRoleId(roleId)
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
788
|
local goodsByUsual = {}
|
555f745e
zhangqijia
feat: 一番赏
|
789
|
for good_id, good in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
790
|
if good.amount > 0 then
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
791
792
793
|
--插入rank
rankRole = rankRole + good.amount
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
794
|
--插入记录
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
795
|
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...
|
796
797
798
|
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: 一番赏
|
799
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
800
|
--作为奖励记录+通知
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
801
802
|
if not goodsByUsual[good_id] then
goodsByUsual[good_id] = tmpNotify
|
555f745e
zhangqijia
feat: 一番赏
|
803
|
else
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
804
|
goodsByUsual[good_id].amount = goodsByUsual[good_id].amount + good.award
|
555f745e
zhangqijia
feat: 一番赏
|
805
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
806
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
807
808
|
--记录角色的抽奖记录
if not roleRecord[good_id] then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
809
|
roleRecord[good_id] = tmpNotify
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
810
811
|
else
roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
|
555f745e
zhangqijia
feat: 一番赏
|
812
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
813
814
|
good.amount = 0
|
555f745e
zhangqijia
feat: 一番赏
|
815
816
817
|
end
end
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
818
|
rank[roleId] = rankRole
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
819
|
recordByRole[roleId] = roleRecord
|
7f21f75b
zhangqijia
fix: 一番赏 增加rank,刷...
|
820
|
self:setProperties({recordByRole = recordByRole, record = record, goods = goods, rank = rank})
|
555f745e
zhangqijia
feat: 一番赏
|
821
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
822
823
824
|
--奖励收集
local reward = {}
rewardCollect(reward, goodsByUsual)
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
825
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
826
827
|
local goodsByIncentive = self:checkIncentive(roleId, name, now)
rewardCollect(reward, goodsByIncentive)
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
828
|
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
829
|
local goodsAmount = self:getGoodsAmount()
|
49df162b
zhangqijia
fix: 一番赏 增加drawEn...
|
830
831
832
833
|
if goodsAmount == 0 then
self:setProperty("drawEndTime", now)
end
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
834
835
836
837
|
local goodsBySpecial = self:checkSpecialReward(now, goodsAmount)
local specialByRole = rewardCollectByRoleId(roleId, reward, goodsBySpecial)
return {reward = reward, usual = goodsByUsual, incentive = goodsByIncentive, specials = goodsBySpecial, special = specialByRole}
|
555f745e
zhangqijia
feat: 一番赏
|
838
839
840
841
842
|
end
--@param
--[[
@roleId
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
843
|
@typ 0=独享,1=公开
|
555f745e
zhangqijia
feat: 一番赏
|
844
845
846
847
|
@cares 关注{k=v}
]]--
function Capsule:draw(roleId, full, cares)
|
555f745e
zhangqijia
feat: 一番赏
|
848
849
|
if self:getProperty("typ") == 1 then
--是否报名
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
850
|
if self:isRegister(roleId) == false then return 4 end
|
555f745e
zhangqijia
feat: 一番赏
|
851
852
853
854
|
--关注的奖品的数量发生了变化
if cares then
local change = self:confirmed(cares)
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
855
|
if next(change) then return 5, change end
|
555f745e
zhangqijia
feat: 一番赏
|
856
857
858
859
|
end
end
if full == 0 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
860
|
return 6, self:drawByCount(roleId, 1)
|
555f745e
zhangqijia
feat: 一番赏
|
861
|
elseif full == 1 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
862
|
return 6, self:drawByCount(roleId, 10)
|
555f745e
zhangqijia
feat: 一番赏
|
863
|
elseif full == 2 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
864
|
return 6, self:drawAll(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
865
866
867
|
end
end
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
|
function Capsule:pageRecord(up, idx)
local record = self:getProperty("record") or {}
if not next(record) then return nil end
--默认取20条
idx = idx or #record
up = up or 0
local count = 0
local tmpRecord = {}
if up == 1 then
--向上获取索引更大的 从上往下拉
count = math.min(#record - idx, 20)
for i = idx, count do
tmpRecord[i] = record[i]
end
else
--向下获取索引更小的 从下往上拉
count = math.max(idx - 20, 0)
for i = count, idx do
tmpRecord[i] = record[i]
end
end
return tmpRecord
end
|
555f745e
zhangqijia
feat: 一番赏
|
895
|
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
896
|
function Capsule:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
897
898
899
900
901
902
903
|
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
|
904
|
playerStatus = self:getRegisterByRoleId(roleId),
|
01ff9b4b
zhangqijia
fix: 一番赏 优化; 抽奖记录...
|
905
|
record = self:pageRecord() or {},
|
555f745e
zhangqijia
feat: 一番赏
|
906
907
908
909
|
rank = self:getProperty("rank"),
goods = self:getProperty("goods"),
specials = self:getProperty("specials"),
incentive = self:getProperty("incentive"),
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
910
|
specialsRecord= self:getProperty("specialsRecord"),
|
555f745e
zhangqijia
feat: 一番赏
|
911
912
913
914
|
}
end
return Capsule
|