e51ff6d2
zhouhaihai
冒险~
|
1
|
local Activity = class("Activity", require("shared.ModelBase"))
|
be4e8031
zhouhaihai
活动 拾荒
|
2
|
local string_format = string.format
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
3
|
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
4
|
-- activity_ctr showType
|
e51ff6d2
zhouhaihai
冒险~
|
5
|
Activity.ActivityType = {
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
6
|
SsrUpPoolChange = 1, -- 特定英雄活动,切卡池
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
7
|
DoubleDrop = 2, -- 双倍掉落
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
8
9
10
11
12
13
14
15
16
17
18
19
20
|
Sign = 4, -- 签到
ChangeCG = 5, -- 客户端使用,切换抽卡界面
PaySignIn = 6, --付费签到
ExploreCommand = 7, -- 探索指令
PayBack = 8, --返利
BonusDouble = 9, -- 奖励关卡翻倍
CalendaTask = 10, -- 日历任务
FoodSell = 11, --贩卖周 料理
DrawHero = 12, --抽卡周 招募
AdvDraw = 13, --拾荒抽周 资助
OpenBox = 14, --拆解周 时钟箱
|
f7a55da3
liuzujun
新增cb2临时限时礼包
|
21
|
RaceDraw = 16, -- 定向招募活动
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
22
23
24
25
26
|
ChallengeLevel = 17, -- 挑战关卡活动
Exchange = 18, -- 兑换活动
HangDrop = 19, -- 挂机掉落活动
Gachakon = 20, -- 扭蛋活动
|
e51ff6d2
zhouhaihai
冒险~
|
27
|
}
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
28
|
|
9a1c54b2
zhouhaihai
活动
|
29
|
|
e51ff6d2
zhouhaihai
冒险~
|
30
31
32
33
|
local function checkActivityType(activityType)
if type(activityType) == "string" then
activityType = Activity.ActivityType[activityType]
end
|
ea40710f
zhouhaihai
活动
|
34
|
return activityType or 0
|
e51ff6d2
zhouhaihai
冒险~
|
35
36
37
38
39
40
|
end
function Activity:ctor(properties)
Activity.super.ctor(self, properties)
|
9a1c54b2
zhouhaihai
活动
|
41
|
self._isOpen = {}
|
e51ff6d2
zhouhaihai
冒险~
|
42
|
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
43
44
|
|
e51ff6d2
zhouhaihai
冒险~
|
45
|
Activity.schema = {
|
be4e8031
zhouhaihai
活动 拾荒
|
46
|
actime = {"table", {}}, -- 最近检查某项活动的开始时间 {id = time}
|
7f9f002d
liuzujun
循环周活动
|
47
|
round = {"table", {}}, -- 记录活动到了第几轮 {id = roundnum}
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
48
49
50
51
52
53
54
55
|
act4 = {"table", {}}, -- {0 = day, 1= -1, 2 = -1} == 签到活动
act6 = {"table", {}}, -- {1 = 1, 2 = 1} == 付费签到活动
act8 = {"number", 0}, -- 充值返利
act11 = {"table", {}}, -- {0 = 贩卖数量, 1=1, 2=1} 贩卖周活动 1表示领取过该档位的奖励
act12 = {"table", {}}, -- {0 = 抽卡次数, 1=1, 2=1} 抽卡周活动 1表示领取过该档位的奖励
act13 = {"table", {}}, -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1} 拾荒周活动 1表示领取过该档位的奖励
act14 = {"table", {}}, -- {0 = 拆解数量, 1=1, 2=1} 拆解周活动 1表示领取过该档位的奖励
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
56
|
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
57
58
|
act17 = {"table", {}}, -- {id=关卡星数, totalDmg=Boss总伤害}
act18 = {"table", {}, true}, -- {id=兑换数量}
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
59
|
act19 = {"number", 0}, -- {挂机信息}
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
60
|
act20 = {"table", {}}, -- {id=扭蛋抽出数量}
|
e51ff6d2
zhouhaihai
冒险~
|
61
|
}
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
62
|
|
e51ff6d2
zhouhaihai
冒险~
|
63
64
|
function Activity:data()
return {
|
be4e8031
zhouhaihai
活动 拾荒
|
65
|
actime = self:getProperty("actime"),
|
7f9f002d
liuzujun
循环周活动
|
66
|
round = self:getProperty("round"),
|
7f9f002d
liuzujun
循环周活动
|
67
|
act4 = self:getProperty("act4"),
|
7f9f002d
liuzujun
循环周活动
|
68
|
act6 = self:getProperty("act6"),
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
69
70
71
72
73
|
act8 = self:getProperty("act8"),
act11 = self:getProperty("act11"),
act12 = self:getProperty("act12"),
act13 = self:getProperty("act13"),
act14 = self:getProperty("act14"),
|
e51ff6d2
zhouhaihai
冒险~
|
74
|
}
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
75
76
|
end
|
e51ff6d2
zhouhaihai
冒险~
|
77
|
|
9a1c54b2
zhouhaihai
活动
|
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
function Activity:updateProperty(params)
local type, default = table.unpack(self.schema[params.field])
if params.delta then
self:incrProperty(params.field, params.delta)
if not params.notNotify then
self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
end
return true
end
if params.value then
self:setProperty(params.field, params.value)
if not params.notNotify then
self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
end
return true
end
return false
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
98
99
100
|
function Activity:isOpenRaw(activityId, now)
activityId = checkActivityType(activityId)
local actData = csvdb["activity_ctrlCsv"][activityId]
|
ea40710f
zhouhaihai
活动
|
101
102
103
104
105
106
107
108
|
if not actData then return end
if actData.time == "" then -- 关闭
return false
end
local st = 0
local et = 0
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
109
|
--local now = skynet.timex()
|
ea40710f
zhouhaihai
活动
|
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
|
if actData.ttype == 0 then -- 时间开放
local openTimes = actData.time:toArray(false, "=")
if openTimes[1] ~= "0" then
st = toUnixtime(openTimes[1]..string_format("%02x", RESET_TIME))
end
if openTimes[2] ~= "0" then
et = toUnixtime(openTimes[2]..string_format("%02x", RESET_TIME))
end
elseif actData.ttype == 1 then -- 周期开放
local openTimes = actData.time:toArray(true, "=")
local resetTime = toUnixtime(tostring(openTimes[1]) .. string_format("%02x", RESET_TIME))
local r = math.floor((now - resetTime) / (openTimes[3] * 86400))
st = resetTime + r * (openTimes[3] * 86400)
et = st + openTimes[2] * 86400
else
return
end
if now >= st and (et == 0 or now < et) then
return true, st
end
return false
end
-- 缓存开放
|
9a1c54b2
zhouhaihai
活动
|
136
137
|
function Activity:isOpen(activityType)
activityType = checkActivityType(activityType)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
138
139
140
141
142
143
144
145
146
147
148
|
--return self._isOpen[activityType]
local open = false
for id, data in pairs(csvdb["activity_ctrlCsv"]) do
if data.showType == activityType then
open = self._isOpen[data.id]
if open then
return true, data.id
end
end
end
return false
|
ea40710f
zhouhaihai
活动
|
149
150
|
end
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
151
|
function Activity:isOpenById(id)
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
152
153
154
|
return self._isOpen[id]
end
|
ea40710f
zhouhaihai
活动
|
155
156
157
158
|
function Activity:getActData(actType)
actType = checkActivityType(actType)
return self:getProperty("act" .. actType)
end
|
9a1c54b2
zhouhaihai
活动
|
159
|
|
ea40710f
zhouhaihai
活动
|
160
161
162
|
function Activity:updateActData(actType, data, notNotify)
actType = checkActivityType(actType)
self:updateProperty({field = "act" .. actType, value = data, notNotify = notNotify})
|
9a1c54b2
zhouhaihai
活动
|
163
164
|
end
|
ea40710f
zhouhaihai
活动
|
165
|
|
9a1c54b2
zhouhaihai
活动
|
166
|
-- 跨天刷新 --登录刷新
|
ea40710f
zhouhaihai
活动
|
167
168
|
function Activity:checkActivityStatus(now, isCrossDay, notify)
self._isOpen = {}
|
be4e8031
zhouhaihai
活动 拾荒
|
169
|
local actime = self:getProperty("actime")
|
ea40710f
zhouhaihai
活动
|
170
|
local change = false
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
171
172
173
|
for actId, actData in pairs(csvdb["activity_ctrlCsv"]) do
local isOpen, startTime = self:isOpenRaw(actId, now)
self._isOpen[actId] = isOpen
|
ea40710f
zhouhaihai
活动
|
174
175
|
if isOpen then
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
176
|
if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
|
ea40710f
zhouhaihai
活动
|
177
|
else -- 重置
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
178
179
180
|
actime[actId] = startTime
self:closeActivity(actId, notify, true)
self:initActivity(actId, isCrossDay, notify)
|
ea40710f
zhouhaihai
活动
|
181
182
183
|
change = true
end
else
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
184
185
186
|
if actime[actId] then
self:closeActivity(actId, notify)
actime[actId] = nil
|
ea40710f
zhouhaihai
活动
|
187
188
189
190
191
|
change = true
end
end
end
if change then
|
be4e8031
zhouhaihai
活动 拾荒
|
192
|
self:updateProperty({field = "actime", value = actime, notNotify = not notify})
|
ea40710f
zhouhaihai
活动
|
193
|
end
|
9a1c54b2
zhouhaihai
活动
|
194
195
|
end
|
ea40710f
zhouhaihai
活动
|
196
|
local activityFunc = {}
|
9a1c54b2
zhouhaihai
活动
|
197
|
|
ea40710f
zhouhaihai
活动
|
198
199
200
201
202
203
204
205
206
207
208
209
210
|
activityFunc[Activity.ActivityType.Sign] = {
-- ["check"] = function(self, actType, notify) -- 检查
-- end,
["init"] = function(self, actType, isCrossDay, notify)
if not isCrossDay then
activityFunc[Activity.ActivityType.Sign]["crossDay"](self, actType, notify)
end
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
local curData = self:getActData(actType)
curData[0] = (curData[0] or 0) + 1
|
be4e8031
zhouhaihai
活动 拾荒
|
211
|
local actData = csvdb["new_signInCsv"]
|
ea40710f
zhouhaihai
活动
|
212
213
214
215
216
217
|
if curData[0] > #actData then return end -- 满了就忽略了
-- 没满更新一下
self:updateActData(actType, curData, not notify)
end,
}
|
9a1c54b2
zhouhaihai
活动
|
218
|
|
7f9f002d
liuzujun
循环周活动
|
219
220
221
222
|
--loop1:累计料理贩卖N次
--loop2:累计招募N次
--loop3:累计资助N次
--loop4:时钟箱拆解N个
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
223
|
function Activity:checkWeeklyAct(actType, notify, count, pool)
|
7f9f002d
liuzujun
循环周活动
|
224
225
226
227
228
229
|
local actInfoMap = {
[Activity.ActivityType.DrawHero] = {mailId = MailId.ActDrawCardReward, table = "activity_loop2Csv"},
[Activity.ActivityType.AdvDraw] = {mailId = MailId.ActAdvDrawReward, table = "activity_loop3Csv"},
[Activity.ActivityType.OpenBox] = {mailId = MailId.ActOpenBoxReward, table = "activity_loop4Csv"},
[Activity.ActivityType.FoodSell] = {mailId = MailId.ActSellFoodReward, table = "activity_loop1Csv"}
}
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
230
231
232
|
if actType == Activity.ActivityType.DrawHero and pool == DrawCardType.FriendDraw then
return
end
|
7f9f002d
liuzujun
循环周活动
|
233
234
235
|
local info = actInfoMap[actType]
if not info then return end
|
ee021c58
liuzujun
每周循环任务bug
|
236
237
238
239
240
|
local open, actId = self:isOpen(actType)
if not open then
return
end
|
7f9f002d
liuzujun
循环周活动
|
241
242
243
|
local curData = self:getActData(actType)
local roundData = self:getProperty("round")
local curRound = roundData[actType] or 0
|
ee021c58
liuzujun
每周循环任务bug
|
244
|
local ctrlData = csvdb["activity_ctrlCsv"][actId]
|
7f9f002d
liuzujun
循环周活动
|
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
if not ctrlData then return end
if curRound >= ctrlData.condition then
return
end
curData[0] = (curData[0] or 0) + count
local totalCnt = 0
local finishCnt = 0
local maxCondition = 0
for k, cfg in pairs(csvdb[info.table] or {}) do
totalCnt = totalCnt + 1
if maxCondition < cfg.condition1 then
maxCondition = cfg.condition1
end
if not curData[cfg.id] and curData[0] >= cfg.condition1 then
if info.mailId then
|
c59e058b
zhouhaihai
新一批日志记录
|
260
261
262
263
|
self.owner:log("activity", {
activity_id = cfg.id, -- 活动ID(或活动指定任务的ID)
activity_type = actType, -- 活动类型,见活动类型枚举表
|
887c1843
zhouhaihai
日志新一批
|
264
|
activity_reward = cfg.reward:toNumMap(), -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
|
c59e058b
zhouhaihai
新一批日志记录
|
265
266
|
})
|
7f9f002d
liuzujun
循环周活动
|
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
|
self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
curData[cfg.id] = 1
end
end
if curData[cfg.id] then
finishCnt = finishCnt + 1
end
end
if totalCnt == finishCnt then
roundData[actType] = curRound + 1
for k,v in pairs(curData) do
if k == 0 then
curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
else
curData[k] = nil
end
end
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
end
self:updateActData(actType, curData, not notify)
end
-- 抽卡周
activityFunc[Activity.ActivityType.DrawHero] = {
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
291
292
|
["check"] = function(self, actType, notify, count, pool) -- 检查
self:checkWeeklyAct(actType, notify, count, pool)
|
7f9f002d
liuzujun
循环周活动
|
293
294
295
296
297
298
299
300
301
|
end,
["init"] = function(self, actType, isCrossDay, notify)
local roundData = self:getProperty("round")
roundData[actType] = 0
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
|
7f9f002d
liuzujun
循环周活动
|
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
|
self.owner:sendMail(MailId.ActDrawCard)
end,
}
-- 售卖周
activityFunc[Activity.ActivityType.FoodSell] = {
["check"] = function(self, actType, notify, count) -- 检查
self:checkWeeklyAct(actType, notify, count)
end,
["init"] = function(self, actType, isCrossDay, notify)
local roundData = self:getProperty("round")
roundData[actType] = 0
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
|
7f9f002d
liuzujun
循环周活动
|
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
|
self.owner:sendMail(MailId.ActSellFood)
end,
}
-- 拾荒周
activityFunc[Activity.ActivityType.AdvDraw] = {
["check"] = function(self, actType, notify, count) -- 检查
self:checkWeeklyAct(actType, notify, count)
end,
["init"] = function(self, actType, isCrossDay, notify)
local roundData = self:getProperty("round")
roundData[actType] = 0
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
|
7f9f002d
liuzujun
循环周活动
|
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
|
self.owner:sendMail(MailId.ActAdvDraw)
end,
}
-- 拆解周
activityFunc[Activity.ActivityType.OpenBox] = {
["check"] = function(self, actType, notify, count) -- 检查
self:checkWeeklyAct(actType, notify, count)
end,
["init"] = function(self, actType, isCrossDay, notify)
local roundData = self:getProperty("round")
roundData[actType] = 0
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
|
7f9f002d
liuzujun
循环周活动
|
353
354
355
356
|
self.owner:sendMail(MailId.ActOpenBox)
end,
}
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
357
358
359
360
361
|
-- 付费签到
activityFunc[Activity.ActivityType.PaySignIn] = {
["init"] = function(self, actType, isCrossDay, notify)
self:updateActData(actType, {}, not notify)
end,
|
460afa6e
liuzujun
付费签到改为主动领取,战斗关卡不一...
|
362
363
|
["close"] = function(self, actType, notify)
self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
|
d4d00016
liuzujun
付费签到开始时间改为开服时间
|
364
365
366
367
368
369
370
371
372
|
local rechargeRecord = self.owner.storeData:getProperty("payR")
for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
if cfg.shop == 2 and cfg.type == CardType.PaySignCard then
rechargeRecord[id] = nil
break
end
end
self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
|
460afa6e
liuzujun
付费签到改为主动领取,战斗关卡不一...
|
373
|
end,
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
374
375
|
}
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
376
377
378
379
380
|
-- 充值反馈
activityFunc[Activity.ActivityType.PayBack] = {
["check"] = function(self, actType, notify, twd) -- 检查
local oldVal = self:getActData(actType) or 0
local newVal = oldVal + twd
|
4709685d
liuzujun
返利邮件拼接充值档位
|
381
|
local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
382
|
if gift ~= "" then
|
1cfe4c75
liuzujun
充值返利邮件内容优化
|
383
|
local strCp = table.concat(checkPoint ,"、")
|
4709685d
liuzujun
返利邮件拼接充值档位
|
384
|
self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
385
386
387
388
389
390
391
392
393
394
|
end
self:updateActData(actType, newVal, not notify)
end,
["init"] = function(self, actType, isCrossDay, notify)
self:updateActData(actType, {}, not notify)
end,
-- ["close"] = function(self, actType, notify)
-- end,
}
|
190e1415
liuzujun
英雄帖活动初始化
|
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
|
-- 英雄帖
activityFunc[Activity.ActivityType.CalendaTask] = {
["init"] = function(self, actType, isCrossDay, notify)
local calTask = self.owner:getProperty("CalTask")
calTask = {}
local role = self.owner
local buildL = role.dinerData:getProperty("buildL")
local curLevel = buildL:getv(1, 1)
role:checkTaskEnter("DinerLevelUp", {level = curLevel})
role:checkTaskEnter("HeroLvlCollect", {})
role:checkTaskEnter("HeroQualityCollect", {})
local curPopular = role.dinerData:getProperty("popular")
role:checkTaskEnter("DinerPopular", {count = curPopular})
local rLevel = role:getProperty("level")
role:checkTaskEnter("RoleLevelUp", {level = rLevel})
local towerInfo = role:getProperty("towerInfo")
role:checkTaskEnter("TowerPass", {level = towerInfo.l})
--"PvpWin"
role:checkTaskEnter("HangPass", {})
role:checkTaskEnter("HeroStarCollect", {})
role:checkTaskEnter("RuneQualityCollect", {})
end,
-- ["close"] = function(self, actType, notify)
-- end,
}
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
426
427
428
|
-- 兑换
activityFunc[Activity.ActivityType.Exchange] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
429
430
431
432
|
local actData = self:getActData(actType) or {}
actData[actId] = {}
self:updateActData(actType, actData, not notify)
end,
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
|
["crossDay"] = function(self, actType, notify, actId)
local actData = self:getActData(actType) or {}
local lastTs = actData["ts"] or 0
local timeNow = skynet.timex()
local cfg = csvdb["activity_ctrlCsv"][actId]
if not cfg then return end
local refreshTimes = cfg.condition2:toArray(false, "=")
for i = 1, #refreshTimes do
local rt = toUnixtime(refreshTimes[1]..string_format("%02x", RESET_TIME))
if timeNow >= rt and rt > lastTs then
lastTs = rt
actData = {}
end
end
if next(actData) then
actData["ts"] = lastTs
self:updateActData(actType, actData, not notify)
end
end,
["close"] = function(self, actType, notify, actId)
local actData = self:getActData(actType) or {}
actData[actId] = nil
self:updateActData(actType, actData, not notify)
end,
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
457
458
459
460
461
462
463
464
465
466
467
468
|
}
-- 扭蛋机
activityFunc[Activity.ActivityType.Gachakon] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
self:updateActData(actType, {}, not notify)
end,
["crossDay"] = function(self, actType, notify)
self:updateActData(actType, {}, not notify)
end,
}
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
469
470
471
472
473
474
475
476
477
478
479
480
481
|
-- 挂机掉落
activityFunc[Activity.ActivityType.HangDrop] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
local actime = self:getProperty("actime")
local startTime = actime[actId]
local actData = self:getActData(actType) or 0
local cfg = csvdb["activity_putCsv"][actId]
if not cfg then return end
actData = startTime
self:updateActData(actType, actData, not notify)
end
}
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
482
483
484
485
|
function Activity:initActivity(actId, isCrossDay, notify)
local actData = csvdb["activity_ctrlCsv"][actId]
if not actData then return end
local actType = actData.showType
|
ea40710f
zhouhaihai
活动
|
486
|
if activityFunc[actType] and activityFunc[actType]['close'] then
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
487
|
activityFunc[actType]["init"](self, actType, isCrossDay, notify, actId)
|
ea40710f
zhouhaihai
活动
|
488
489
490
|
end
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
491
492
493
494
|
function Activity:closeActivity(actId, notify, notUpdateAct)
local actData = csvdb["activity_ctrlCsv"][actId]
if not actData then return end
local actType = actData.showType
|
ea40710f
zhouhaihai
活动
|
495
|
if activityFunc[actType] and activityFunc[actType]['close'] then
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
496
497
|
activityFunc[actType]["close"](self, actType, notify, actId)
self:recycleActItem(actId)
|
ea40710f
zhouhaihai
活动
|
498
|
end
|
7f9f002d
liuzujun
循环周活动
|
499
500
501
|
if Activity.schema["act".. actType] then
self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
end
|
ea40710f
zhouhaihai
活动
|
502
503
504
|
end
function Activity:refreshDailyData(notify)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
505
506
507
508
|
for actId, status in pairs(self._isOpen) do
local actData = csvdb["activity_ctrlCsv"][actId]
if status and actData then
local actType = actData.showType
|
ea40710f
zhouhaihai
活动
|
509
|
if activityFunc[actType] and activityFunc[actType]['crossDay'] then
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
510
|
activityFunc[actType]["crossDay"](self, actType, notify, actId)
|
ea40710f
zhouhaihai
活动
|
511
512
513
|
end
end
end
|
9a1c54b2
zhouhaihai
活动
|
514
515
|
end
|
ea40710f
zhouhaihai
活动
|
516
|
function Activity:checkActivity(notNotify, activityType, ...)
|
9a1c54b2
zhouhaihai
活动
|
517
|
if not activityType then return end
|
ea40710f
zhouhaihai
活动
|
518
519
520
|
if not self:isOpen(activityType) then return end
if activityFunc[activityType] and activityFunc[activityType]['check'] then
activityFunc[activityType]["check"](self, activityType, not notNotify, ...)
|
9a1c54b2
zhouhaihai
活动
|
521
522
523
|
end
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
524
525
526
|
-- 获取此次挂机掉落翻倍时长
function Activity:getActHangDoubleTime(lastTs, nowTs)
local type = "DoubleDrop"
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
527
528
|
--local actId = checkActivityType(type)
local isOpen, actId = self:isOpen(type)
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
529
530
531
532
|
local openTs = self:getProperty("actime")[actId] or 0
local timeNow = skynet.timex()
lastTs = math.max(lastTs, openTs)
if isOpen then
|
024370be
liuzujun
双倍掉掉落bug
|
533
|
if nowTs > openTs and nowTs > lastTs then
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
534
535
536
537
538
539
540
541
|
return nowTs - lastTs
else
return 0
end
end
return 0
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
542
543
|
-- 获取活动卡池id
function Activity:getActivityPool(mainType, subType)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
544
545
546
|
local open, actId = self:isOpen(Activity.ActivityType.SsrUpPoolChange)
if not open then
--if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
547
548
|
return 0
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
549
|
local actData = csvdb["activity_ctrlCsv"][actId]
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
550
551
552
553
554
555
556
557
558
559
560
561
|
if not actData then return 0 end
local poolMap = actData.condition2:toMap(true, "=")
local key = mainType .. "_" .. subType
for k, v in pairs(poolMap) do
if k == key then
return v
end
end
return 0
end
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
562
563
|
-- 付费签到可领奖励
function Activity:getPaySignReward()
|
7754304d
zhouhaihai
bug
|
564
|
local actGoodsFlag = self.owner.storeData:getProperty("actGoodsFlag")
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
565
566
567
568
569
570
571
572
|
local index = GetActGoodsIndex("paySignIn")
local flag = actGoodsFlag[index] or 0
if flag == 0 then return {} end
if not self.owner.activity:isOpen("PaySignIn") then return {} end
local diffDay = diffFromOpen() + 1
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
573
|
local curData = self:getActData("PaySignIn")
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
574
|
local reward, change = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
575
|
for day, csvData in pairs(csvdb["pay_signInCsv"]) do
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
|
if day <= diffDay then
if not curData[day] then
curData[day] = 1
-- 奖励
for itemId, count in pairs(csvData.reward:toNumMap()) do
reward[itemId] = (reward[itemId] or 0) + count
end
end
else
break
end
end
return reward, curData
--if next(reward) then
--role.activity:updateActData("PaySignIn", curData)
--reward, change = role:award(reward, {log = {desc = "actPaySign"}})
--end
--role:log("activity", {
-- activity_id = curData[0], -- 活动ID(或活动指定任务的ID)
-- activity_type = role.activity.ActivityType.PaySignIn, -- 活动类型,见活动类型枚举表
-- activity_reward = reward, -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
--})
--SendPacket(actionCodes.Activity_actPaySignRpc, MsgPack.pack(role:packReward(reward, change)))
end
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
|
-- 回收活动道具
function Activity:recycleActItem(actId)
local role = self.owner
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return end
local gift = {}
local costs = {}
for _, arr in ipairs(role:getItemCount(actCfg.recycle):toTableArray(true)) do
local fromId, toId, toNum = arr[1], arr[2], arr[3]
local itemCount = role:getItemCount(fromId)
if itemCount > 0 then
costs[fromId] = (costs[fromId] or 0) + itemCount
gift[toId] = toNum * itemCount
end
end
if next(costs) then
local itemStr = ""
for k, v in pairs(costs) do
if itemStr ~= "" then
itemStr = itemStr .. " "
end
itemStr = itemStr .. k .. "=" .. v
end
role:costItems(costs, {log = {desc = "actRecycle"}})
role:sendMail(actCfg.recycle_email, nil, gift, {itemStr})
end
end
|
e51ff6d2
zhouhaihai
冒险~
|
631
|
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
632
|
return Activity
|