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
89
90
91
92
|
}
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
goods[goods_id..val.id] = clone(val)
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})
|
555f745e
zhangqijia
feat: 一番赏
|
138
139
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
140
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
|
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: 一番赏
|
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
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
|
203
|
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
204
205
|
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
206
|
function Capsule:getRegisterByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
207
|
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
208
209
210
211
212
|
return register[roleId] or 0
end
function Capsule:isRegister(roleId)
return self:getRegisterByRoleId(roleId) == 1
|
555f745e
zhangqijia
feat: 一番赏
|
213
214
215
216
|
end
function Capsule:register(roleId)
local register = self:getProperty("register") or {}
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
217
218
219
|
register[roleId] = 1
self:setProperty("register", register)
return self:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
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与...
|
238
|
change[k] = {typ=1, count = goods[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
239
240
241
|
end
else
if specials[k] and specials[k].amount ~= v.count then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
242
|
change[k] = {typ=1, count = specials[k].amount}
|
555f745e
zhangqijia
feat: 一番赏
|
243
244
245
246
247
248
249
250
251
|
end
end
end
return change
end
function Capsule:getGoodsAmount()
local goods = self:getProperty("goods") or {}
local amount = 0
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
252
|
for _, v in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
|
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: 一番赏增加通知信息的数据...
|
268
269
|
function Capsule:checkSpecialFlag(typ)
local spKey, special = self:getSpecialByType(typ)
|
555f745e
zhangqijia
feat: 一番赏
|
270
271
|
if not special then return nil end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
272
273
274
|
if special["amount"] <= 0 then return nil end
return spKey, special
end
|
555f745e
zhangqijia
feat: 一番赏
|
275
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
276
277
278
279
280
|
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: 一番赏奖励中加入得奖者的...
|
281
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
282
283
284
285
|
local tmp = rewardRecord[roleId]
tmp["amount"] = tmp["amount"] - 1
if tmp["amount"] <= 0 then rewardRecord[roleId] = nil end
|
555f745e
zhangqijia
feat: 一番赏
|
286
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
287
288
|
tmp = rewardByRole[roleId] or {}
if not next(tmp) then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
289
290
|
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: 一番赏
|
291
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
292
|
if not tmp[spKey] then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
293
294
|
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: 一番赏增加通知信息的数据...
|
295
296
297
|
else
tmp[spKey].amount = tmp[spKey].amount + 1
end
|
555f745e
zhangqijia
feat: 一番赏
|
298
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
299
|
rewardByRole[roleId] = tmp
|
555f745e
zhangqijia
feat: 一番赏
|
300
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
301
302
303
304
305
|
count = count - 1
end
end
return rewardByRole, count
end
|
555f745e
zhangqijia
feat: 一番赏
|
306
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
307
308
309
310
311
|
function Capsule:getTop(record)
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: 一番赏
|
312
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
313
314
315
316
317
|
if #record < special["np"] then return nil end
local topRecord = {}
local count = special["np"]
for _, v in ipairs(record) do
if count <= 0 then break end
|
555f745e
zhangqijia
feat: 一番赏
|
318
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
319
320
321
322
323
324
325
|
local tmpCount = 0
if count >= v.amount then
count = count - v.amount
tmpCount = v.amount
else
tmpCount = count
count = 0
|
555f745e
zhangqijia
feat: 一番赏
|
326
327
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
328
329
330
331
332
|
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: 一番赏
|
333
334
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
335
336
337
338
339
340
341
342
|
local rewardByRole, count = getSpecialRoleNotify(topRecord, special["amount"], special["award"], spKey, SpecialType.TOP)
special["amount"] = count
specials[spKey] = special
specialsRecord[SpecialType.TOP] = rewardByRole
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
343
344
345
346
|
end
--TODO
function Capsule:getCore(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
347
348
|
local spKey, special = self:checkSpecialFlag(SpecialType.CORE)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
349
350
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
351
352
353
|
local specialsRecord = self:getProperty("specialsRecord") or {}
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
|
local np = special["np"]
if np > #record then return nil end
local left = math.ceil((np - #record)/2) or 0
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: 一番赏增加通知信息的数据...
|
374
375
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
376
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
377
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
378
379
380
381
382
|
end
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
383
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.CORE)
|
555f745e
zhangqijia
feat: 一番赏
|
384
|
|
555f745e
zhangqijia
feat: 一番赏
|
385
386
|
special["amount"] = count
specials[spKey] = special
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
387
388
389
|
specialsRecord[SpecialType.CORE] = rewardByRole
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
390
391
392
|
end
function Capsule:getLast(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
393
394
|
local spKey, special = self:checkSpecialFlag(SpecialType.LAST)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
395
396
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
397
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
398
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
399
|
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
400
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
401
|
table.sort(record, function(a, b) return a.create_time > b.create_time end)
|
555f745e
zhangqijia
feat: 一番赏
|
402
403
404
|
local np = special["np"]
local count = np
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
405
|
local roleRecord = {}
|
555f745e
zhangqijia
feat: 一番赏
|
406
407
408
409
410
411
412
413
414
415
416
417
|
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: 一番赏增加通知信息的数据...
|
418
419
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
420
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
421
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + tmpCount}
|
555f745e
zhangqijia
feat: 一番赏
|
422
423
424
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
425
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.LAST)
|
555f745e
zhangqijia
feat: 一番赏
|
426
|
|
555f745e
zhangqijia
feat: 一番赏
|
427
428
|
special["amount"] = count
specials[spKey] = special
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
429
430
431
|
specialsRecord[SpecialType.LAST] = rewardByRole
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
432
433
434
|
end
function Capsule:getJoker(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
435
436
|
local spKey, special = self:checkSpecialFlag(SpecialType.JOKER)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
437
438
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
439
440
441
|
local specialsRecord = self:getProperty("specialsRecord") or {}
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
442
443
444
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
445
446
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
447
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
448
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
449
450
451
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
452
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.JOKER)
|
555f745e
zhangqijia
feat: 一番赏
|
453
|
|
555f745e
zhangqijia
feat: 一番赏
|
454
455
|
special["amount"] = count
specials[spKey] = special
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
456
457
458
|
specialsRecord[SpecialType.JOKER] = rewardByRole
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
|
555f745e
zhangqijia
feat: 一番赏
|
459
460
461
|
end
function Capsule:getKing(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
462
463
|
local spKey, special = self:checkSpecialFlag(SpecialType.KING)
if not special then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
464
465
|
local specials = self:getProperty("specials") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
466
|
local specialsRecord = self:getProperty("specialsRecord") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
467
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
468
|
if self:getGoodsAmount() > 0 then return nil end
|
555f745e
zhangqijia
feat: 一番赏
|
469
470
471
|
local roleRecord = {}
for _, v in ipairs(record) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
472
473
|
if not roleRecord[v.roleId]then
roleRecord[v.roleId] = {amount = v.amount }
|
555f745e
zhangqijia
feat: 一番赏
|
474
|
else
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
475
|
roleRecord[v.roleId] = {amount = (roleRecord[v.roleId]["amount"] or 0) + v.amount}
|
555f745e
zhangqijia
feat: 一番赏
|
476
477
478
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
479
480
481
482
483
484
485
|
local rewardByRole, count = getSpecialRoleNotify(roleRecord, special["amount"], special["award"], SpecialType.KING)
special["amount"] = count
specials[spKey] = special
specialsRecord[SpecialType.KING] = rewardByRole
self:setProperties({specialsRecord = specialsRecord, specials = specials})
return rewardByRole
end
|
555f745e
zhangqijia
feat: 一番赏
|
486
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
487
488
489
490
491
492
493
494
495
496
497
498
|
local rewardToNtyFunc = function(notify, tmpReward)
for key, val in pairs(tmpReward or {}) do
if not notify[key] then
notify[key] = 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
|
555f745e
zhangqijia
feat: 一番赏
|
499
|
|
555f745e
zhangqijia
feat: 一番赏
|
500
501
|
end
end
|
555f745e
zhangqijia
feat: 一番赏
|
502
503
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
504
|
function Capsule:checkSpecialReward( now)
|
555f745e
zhangqijia
feat: 一番赏
|
505
506
507
|
local specials = self:getProperty("specials") or {}
if not next(specials) then return nil end
local record = self:getProperty("record") or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
508
|
|
555f745e
zhangqijia
feat: 一番赏
|
509
510
|
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: 一番赏
|
511
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
512
513
|
local notify = self:getTop(record) or {}
|
555f745e
zhangqijia
feat: 一番赏
|
514
515
|
local coreReward = self:getCore(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
516
517
|
rewardToNtyFunc(notify, coreReward)
|
555f745e
zhangqijia
feat: 一番赏
|
518
|
local lastReward = self:getLast(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
519
520
|
rewardToNtyFunc(notify, lastReward)
|
555f745e
zhangqijia
feat: 一番赏
|
521
|
local jokerReward = self:getJoker(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
522
523
|
rewardToNtyFunc(notify, jokerReward)
|
555f745e
zhangqijia
feat: 一番赏
|
524
|
local kingReward = self:getKing(record)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
525
|
rewardToNtyFunc(notify, kingReward)
|
555f745e
zhangqijia
feat: 一番赏
|
526
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
527
|
|
555f745e
zhangqijia
feat: 一番赏
|
528
529
530
|
return notify
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
531
|
function Capsule:checkIncentive(roleId, name, now)
|
555f745e
zhangqijia
feat: 一番赏
|
532
|
local goods = self:getProperty("goods") or {}
|
555f745e
zhangqijia
feat: 一番赏
|
533
534
|
local recordByRole = self:getProperty("recordByRole") or {}
local roleRecord = recordByRole[roleId] or {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
535
536
|
local incentiveRecord = self:getProperty("incentiveRecord") or {}
local incentiveByRole = incentiveRecord[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
537
538
539
|
local incentive = self:getProperty("incentive")
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
540
|
local notify = {}
|
555f745e
zhangqijia
feat: 一番赏
|
541
542
543
544
545
546
547
548
549
|
-- 最后一抽 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: 一番赏增加通知信息的数据...
|
550
|
if last then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
551
|
notify["last"] = {name = name, good_id = "last", typ = RewardType.INCENTIVE, award = incentive["last"]["award"], amount = 1, quality = 1, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
552
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
553
554
555
556
557
558
559
560
561
562
563
564
565
|
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与...
|
566
|
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: 一番赏
|
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
|
--填充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: 一番赏奖励中加入得奖者的...
|
590
|
notify["probabilities"] = {name = name, good_id = "probabilities", typ = RewardType.INCENTIVE, award = incentive["probabilities"]["award"], amount = 1, quality = 3, create_time= now}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
591
|
|
555f745e
zhangqijia
feat: 一番赏
|
592
593
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
594
595
596
|
table.insert(incentiveByRole, notify)
incentiveRecord[roleId] = incentiveByRole
self:setProperty("incentiveRecord", incentiveRecord)
|
555f745e
zhangqijia
feat: 一番赏
|
597
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
598
599
|
--TODO 先屏蔽
return {}
|
555f745e
zhangqijia
feat: 一番赏
|
600
601
602
603
604
605
606
607
|
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: 一番赏增加通知信息的数据...
|
608
|
local roleRecord = recordByRole[roleId] or {}
|
555f745e
zhangqijia
feat: 一番赏
|
609
610
611
612
613
|
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: 一番赏增加通知信息的数据...
|
614
|
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
615
616
|
--奖励, 通知信息
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
617
618
619
|
local notify= {}
notify[roleId] = {}
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
620
|
local name = getNameByRoleId(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
621
622
|
while (goods and next(goods) and count > 0) do
local good_id = math.randWeight(goods, "weight")
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
623
|
if not good_id then break end
|
555f745e
zhangqijia
feat: 一番赏
|
624
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
625
626
627
628
629
630
631
632
633
634
635
636
637
638
|
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: 一番赏增加通知信息的数据...
|
639
|
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
640
641
642
643
644
|
--记录角色的抽奖记录 计算激励奖需要用到
if not roleRecord[good_id] then
roleRecord[good_id] = tmpNotify
else
roleRecord[good_id].amount = roleRecord[good_id].amount + 1
|
555f745e
zhangqijia
feat: 一番赏
|
645
|
end
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
646
647
648
|
good.weight = good.weight - csvdb["ichibankuji_goodsCsv"][goods_id][good.id].weight
count = count - 1
|
555f745e
zhangqijia
feat: 一番赏
|
649
650
651
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
652
653
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
654
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
655
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
656
657
658
659
660
661
|
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: 一番赏
|
662
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
663
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
664
665
|
local speciNotify = self:checkSpecialReward(now)
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
666
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
667
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
668
669
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
670
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
671
672
673
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
674
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
675
676
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
677
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
678
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
679
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
680
681
682
683
684
685
|
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: 一番赏增加通知信息的数据...
|
686
687
|
local roleRecord = recordByRole[roleId] or {}
local now = skynet.timex()
|
555f745e
zhangqijia
feat: 一番赏
|
688
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
689
|
local name = getNameByRoleId(roleId)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
690
691
|
local notify = {}
notify[roleId] = {}
|
555f745e
zhangqijia
feat: 一番赏
|
692
|
for good_id, good in pairs(goods) do
|
555f745e
zhangqijia
feat: 一番赏
|
693
|
if good.amount > 0 then
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
694
|
--插入记录
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
695
696
|
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}
table.insert(record, tmpNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
697
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
698
699
700
|
--作为奖励记录+通知
if not notify[roleId][good_id] then
notify[roleId][good_id] = tmpNotify
|
555f745e
zhangqijia
feat: 一番赏
|
701
|
else
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
702
|
notify[roleId][good_id].amount = notify[roleId][good_id].amount + good.award
|
555f745e
zhangqijia
feat: 一番赏
|
703
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
704
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
705
706
|
--记录角色的抽奖记录
if not roleRecord[good_id] then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
707
|
roleRecord[good_id] = tmpNotify
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
708
709
|
else
roleRecord[good_id].amount = roleRecord[good_id].amount + good.amount
|
555f745e
zhangqijia
feat: 一番赏
|
710
|
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
711
712
|
good.amount = 0
|
555f745e
zhangqijia
feat: 一番赏
|
713
714
715
|
end
end
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
716
717
|
recordByRole[roleId] = roleRecord
self:setProperties({recordByRole = recordByRole, record = record, goods = goods})
|
555f745e
zhangqijia
feat: 一番赏
|
718
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
719
|
local tmpNotify = self:checkIncentive(roleId, name, now)
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
720
721
722
723
724
725
|
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: 一番赏
|
726
|
end
|
555f745e
zhangqijia
feat: 一番赏
|
727
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
728
729
|
local speciNotify = self:checkSpecialReward(now)
rewardToNtyFunc(notify, speciNotify)
|
555f745e
zhangqijia
feat: 一番赏
|
730
|
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
731
|
local reward, rewardByGoods = {}, {}
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
732
733
|
for key, val in pairs(notify) do
if key == roleId then
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
734
|
for k, v in pairs(val) do
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
735
736
737
|
for id, count in pairs(v.award:toNumMap()) do
reward[id] = (reward[id] or 0) + count
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
738
|
rewardByGoods[k] = v
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
739
740
|
end
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
741
|
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
742
|
end
|
cd2a7a67
zhangqijia
fix: 一番赏奖励中加入得奖者的...
|
743
|
return reward, rewardByGoods, notify
|
555f745e
zhangqijia
feat: 一番赏
|
744
745
746
747
748
|
end
--@param
--[[
@roleId
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
749
|
@typ 0=独享,1=公开
|
555f745e
zhangqijia
feat: 一番赏
|
750
751
752
753
|
@cares 关注{k=v}
]]--
function Capsule:draw(roleId, full, cares)
|
555f745e
zhangqijia
feat: 一番赏
|
754
755
|
if self:getProperty("typ") == 1 then
--是否报名
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
756
|
if self:isRegister(roleId) == false then return 4 end
|
555f745e
zhangqijia
feat: 一番赏
|
757
758
759
760
|
--关注的奖品的数量发生了变化
if cares then
local change = self:confirmed(cares)
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
761
|
if next(change) then return 5, change end
|
555f745e
zhangqijia
feat: 一番赏
|
762
763
764
765
|
end
end
if full == 0 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
766
|
return 6, self:drawByCount(roleId, 1)
|
555f745e
zhangqijia
feat: 一番赏
|
767
|
elseif full == 1 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
768
|
return 6, self:drawByCount(roleId, 10)
|
555f745e
zhangqijia
feat: 一番赏
|
769
|
elseif full == 2 then
|
0eb317fb
zhangqijia
fix: 一番赏奖励抽奖的bug与...
|
770
|
return 6, self:drawAll(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
771
772
773
774
|
end
end
|
f382b4f2
zhangqijia
fix: 一番赏的抽奖bug
|
775
|
function Capsule:data(roleId)
|
555f745e
zhangqijia
feat: 一番赏
|
776
777
778
779
780
781
782
|
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
|
783
|
playerStatus = self:getRegisterByRoleId(roleId),
|
555f745e
zhangqijia
feat: 一番赏
|
784
|
record = self:getProperty("record"),
|
555f745e
zhangqijia
feat: 一番赏
|
785
786
787
788
|
rank = self:getProperty("rank"),
goods = self:getProperty("goods"),
specials = self:getProperty("specials"),
incentive = self:getProperty("incentive"),
|
d10a9a36
zhangqijia
fix: 一番赏增加通知信息的数据...
|
789
|
specialsRecord= self:getProperty("specialsRecord"),
|
555f745e
zhangqijia
feat: 一番赏
|
790
791
792
793
|
}
end
return Capsule
|