fa992c94
liuzujun
添加daily,diner,act...
|
1
|
local Activity = class("Activity", require("shared.ModelBaseMysql"))
|
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, -- 扭蛋活动
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
27
28
29
|
WishHeroPool = 23, -- 心愿卡池
ActHeroPool = 24, -- 活动卡池
|
8e892c71
liuzujun
挑战关卡活动打完再扣门票
|
30
|
ActShopGoods = 25, -- 活动商品
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
31
|
|
161c50cc
zhouhaihai
宝藏怪活动
|
32
|
Crisis = 26, -- 宝藏怪活动
|
ac885527
liuzujun
联动签到活动
|
33
34
|
CommonSignIn = 28, --通用签到
|
cab7184b
chenyueqi
活动能量bug
|
35
|
FriendEnergy = 30, -- 好友互赠能量活动
|
c756d4df
liuzujun
新年将军令活动
|
36
37
|
AdvLevel = 33, -- 拾荒关卡
BattleCommand = 34, -- 战令活动
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
38
39
|
NewSign = 36, -- 活动签到,单独的签到界面
HeroBackFree = 37, -- 无损耗归还
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
40
|
|
dfa9ae5e
liuzujun
战令任务活动
|
41
|
BattleCommandTask = 38, -- 战令任务活动
|
161c50cc
zhouhaihai
宝藏怪活动
|
42
|
}
|
9a1c54b2
zhouhaihai
活动
|
43
|
|
e51ff6d2
zhouhaihai
冒险~
|
44
45
46
47
|
local function checkActivityType(activityType)
if type(activityType) == "string" then
activityType = Activity.ActivityType[activityType]
end
|
ea40710f
zhouhaihai
活动
|
48
|
return activityType or 0
|
e51ff6d2
zhouhaihai
冒险~
|
49
50
51
52
53
54
|
end
function Activity:ctor(properties)
Activity.super.ctor(self, properties)
|
9a1c54b2
zhouhaihai
活动
|
55
|
self._isOpen = {}
|
e51ff6d2
zhouhaihai
冒险~
|
56
|
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
57
|
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
58
59
60
61
62
63
64
|
function Activity:getType(actType)
if type(actType) == "string" then
actType = Activity.ActivityType[actType]
end
return actType or 0
end
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
65
|
|
e51ff6d2
zhouhaihai
冒险~
|
66
|
Activity.schema = {
|
fa992c94
liuzujun
添加daily,diner,act...
|
67
|
id = {"number", 0, "pri"}, -- 角色id
|
be4e8031
zhouhaihai
活动 拾荒
|
68
|
actime = {"table", {}}, -- 最近检查某项活动的开始时间 {id = time}
|
7f9f002d
liuzujun
循环周活动
|
69
|
round = {"table", {}}, -- 记录活动到了第几轮 {id = roundnum}
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
70
|
act4 = {"table", {}}, -- {0 = day, 1= -1, 2 = -1} == 签到活动
|
ede282c0
liuzujun
付费签到规则改为按登录天数计算进度...
|
71
|
act6 = {"table", {}}, -- {0 = day, 1 = 1, 2 = 1} == 付费签到活动
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
72
73
74
75
76
77
|
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
兑换活动,邮件内容修改
|
78
|
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
79
80
|
act17 = {"table", {}}, -- {id=关卡星数, totalDmg=Boss总伤害}
act18 = {"table", {}, true}, -- {id=兑换数量}
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
81
|
act19 = {"number", 0}, -- {挂机信息}
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
82
|
act20 = {"table", {}}, -- {id=扭蛋抽出数量}
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
83
84
|
act24 = {"table", {}, true}, -- 活动卡池 {id=repaynum}
|
161c50cc
zhouhaihai
宝藏怪活动
|
85
|
act26 = {"table", {}}, -- {task = {id = count}, socre = {id = status}}
|
ac885527
liuzujun
联动签到活动
|
86
87
|
act28 = {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
|
cab7184b
chenyueqi
活动能量bug
|
88
|
act30 = {"table", {}}, -- {magic = 0, limit = 0, reward = {id = 1, id = 1}, giveAE = {}, getAE = {}} 奖励字段1表示领取过奖励
|
c756d4df
liuzujun
新年将军令活动
|
89
|
|
98be031a
liuzujun
新年活动
|
90
91
|
act33 = {"table", {}}, -- 拾荒关卡活动 {id={max=最大积分, pass=1}, r=""}
|
c756d4df
liuzujun
新年将军令活动
|
92
|
act34 = {"table", {}}, -- 战令记录{unlock = 1, freeR = "", payR = "", lvl = 10, sum = 100}
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
93
|
act36 = {"table", {}}, -- 每日活跃签到 {0=day, 1=1,2=1,3=1}
|
e51ff6d2
zhouhaihai
冒险~
|
94
|
}
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
95
|
|
e51ff6d2
zhouhaihai
冒险~
|
96
97
|
function Activity:data()
return {
|
be4e8031
zhouhaihai
活动 拾荒
|
98
|
actime = self:getProperty("actime"),
|
7f9f002d
liuzujun
循环周活动
|
99
|
round = self:getProperty("round"),
|
7f9f002d
liuzujun
循环周活动
|
100
|
act4 = self:getProperty("act4"),
|
7f9f002d
liuzujun
循环周活动
|
101
|
act6 = self:getProperty("act6"),
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
102
103
104
105
106
|
act8 = self:getProperty("act8"),
act11 = self:getProperty("act11"),
act12 = self:getProperty("act12"),
act13 = self:getProperty("act13"),
act14 = self:getProperty("act14"),
|
1be743f3
liuzujun
扭蛋机调试
|
107
108
109
110
111
|
act17 = self:getProperty("act17"),
act18 = self:getProperty("act18"),
act19 = self:getProperty("act19"),
act20 = self:getProperty("act20"),
|
ac885527
liuzujun
联动签到活动
|
112
|
act24 = self:getProperty("act24"),
|
558c9044
zhouhaihai
物资危机
|
113
|
act26 = self:getProperty("act26"),
|
ac885527
liuzujun
联动签到活动
|
114
115
|
act28 = self:getProperty("act28"),
|
cab7184b
chenyueqi
活动能量bug
|
116
|
act30 = self:getProperty("act30"),
|
c756d4df
liuzujun
新年将军令活动
|
117
|
|
98be031a
liuzujun
新年活动
|
118
119
|
act33 = self:getProperty("act33"),
|
c756d4df
liuzujun
新年将军令活动
|
120
|
act34 = self:getProperty("act34"),
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
121
|
act36 = self:getProperty("act36"),
|
e51ff6d2
zhouhaihai
冒险~
|
122
|
}
|
be83d162
zhouahaihai
登陆成功。 增加数据结构修正功能
|
123
124
|
end
|
e51ff6d2
zhouhaihai
冒险~
|
125
|
|
9a1c54b2
zhouhaihai
活动
|
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
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
|
146
147
148
|
function Activity:isOpenRaw(activityId, now)
activityId = checkActivityType(activityId)
local actData = csvdb["activity_ctrlCsv"][activityId]
|
ea40710f
zhouhaihai
活动
|
149
150
151
152
153
154
155
156
|
if not actData then return end
if actData.time == "" then -- 关闭
return false
end
local st = 0
local et = 0
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
157
|
--local now = skynet.timex()
|
ea40710f
zhouhaihai
活动
|
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
|
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
活动
|
184
185
|
function Activity:isOpen(activityType)
activityType = checkActivityType(activityType)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
186
187
188
189
190
191
192
193
194
195
196
|
--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
活动
|
197
198
|
end
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
199
200
201
202
|
function Activity:isOpenById(id, activityType)
activityType = checkActivityType(activityType)
local cfg = csvdb["activity_ctrlCsv"][id]
if not cfg then return false end
|
be697585
liuzujun
活动剧情解锁
|
203
|
if activityType ~= 0 and cfg.showType ~= activityType then return false end
|
686d4fd6
liuzujun
兑换活动支持兑换多个, 新增卡池
|
204
|
|
b8b1c164
liuzujun
扭蛋活动,万能碎片bug
|
205
206
207
|
return self._isOpen[id]
end
|
ea40710f
zhouhaihai
活动
|
208
209
210
211
|
function Activity:getActData(actType)
actType = checkActivityType(actType)
return self:getProperty("act" .. actType)
end
|
9a1c54b2
zhouhaihai
活动
|
212
|
|
ea40710f
zhouhaihai
活动
|
213
214
215
|
function Activity:updateActData(actType, data, notNotify)
actType = checkActivityType(actType)
self:updateProperty({field = "act" .. actType, value = data, notNotify = notNotify})
|
9a1c54b2
zhouhaihai
活动
|
216
217
|
end
|
ea40710f
zhouhaihai
活动
|
218
|
|
9a1c54b2
zhouhaihai
活动
|
219
|
-- 跨天刷新 --登录刷新
|
ea40710f
zhouhaihai
活动
|
220
221
|
function Activity:checkActivityStatus(now, isCrossDay, notify)
self._isOpen = {}
|
be4e8031
zhouhaihai
活动 拾荒
|
222
|
local actime = self:getProperty("actime")
|
ea40710f
zhouhaihai
活动
|
223
|
local change = false
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
224
225
226
|
for actId, actData in pairs(csvdb["activity_ctrlCsv"]) do
local isOpen, startTime = self:isOpenRaw(actId, now)
self._isOpen[actId] = isOpen
|
ea40710f
zhouhaihai
活动
|
227
228
|
if isOpen then
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
229
|
if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
|
66fe093a
liuzujun
元旦关卡活动
|
230
|
self:onLoginActivity(actId)
|
ea40710f
zhouhaihai
活动
|
231
|
else -- 重置
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
232
233
234
|
actime[actId] = startTime
self:closeActivity(actId, notify, true)
self:initActivity(actId, isCrossDay, notify)
|
ea40710f
zhouhaihai
活动
|
235
236
237
|
change = true
end
else
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
238
239
240
|
if actime[actId] then
self:closeActivity(actId, notify)
actime[actId] = nil
|
ea40710f
zhouhaihai
活动
|
241
242
243
244
245
|
change = true
end
end
end
if change then
|
be4e8031
zhouhaihai
活动 拾荒
|
246
|
self:updateProperty({field = "actime", value = actime, notNotify = not notify})
|
ea40710f
zhouhaihai
活动
|
247
|
end
|
9a1c54b2
zhouhaihai
活动
|
248
249
|
end
|
ea40710f
zhouhaihai
活动
|
250
|
local activityFunc = {}
|
9a1c54b2
zhouhaihai
活动
|
251
|
|
ea40710f
zhouhaihai
活动
|
252
253
254
255
256
257
258
259
260
261
262
263
264
|
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
活动 拾荒
|
265
|
local actData = csvdb["new_signInCsv"]
|
ea40710f
zhouhaihai
活动
|
266
267
268
269
270
271
|
if curData[0] > #actData then return end -- 满了就忽略了
-- 没满更新一下
self:updateActData(actType, curData, not notify)
end,
}
|
9a1c54b2
zhouhaihai
活动
|
272
|
|
7f9f002d
liuzujun
循环周活动
|
273
274
275
276
|
--loop1:累计料理贩卖N次
--loop2:累计招募N次
--loop3:累计资助N次
--loop4:时钟箱拆解N个
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
277
|
function Activity:checkWeeklyAct(actType, notify, count, pool)
|
7f9f002d
liuzujun
循环周活动
|
278
279
280
281
282
283
|
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保底
|
284
285
286
|
if actType == Activity.ActivityType.DrawHero and pool == DrawCardType.FriendDraw then
return
end
|
7f9f002d
liuzujun
循环周活动
|
287
288
289
|
local info = actInfoMap[actType]
if not info then return end
|
ee021c58
liuzujun
每周循环任务bug
|
290
291
292
293
294
|
local open, actId = self:isOpen(actType)
if not open then
return
end
|
7f9f002d
liuzujun
循环周活动
|
295
296
297
|
local curData = self:getActData(actType)
local roundData = self:getProperty("round")
local curRound = roundData[actType] or 0
|
ee021c58
liuzujun
每周循环任务bug
|
298
|
local ctrlData = csvdb["activity_ctrlCsv"][actId]
|
7f9f002d
liuzujun
循环周活动
|
299
300
301
302
303
304
305
306
|
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
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
|
local flag = true
while flag do
--print("tatal number :", curData[0])
for i = 1, #csvdb[info.table] do
local cfg = csvdb[info.table][i]
--for k, cfg in pairs(csvdb[info.table] or {}) do
totalCnt = totalCnt + 1
if maxCondition < cfg.condition1 then
maxCondition = cfg.condition1
end
--print("cur condition", cfg.condition1)
if curData[0] < cfg.condition1 then
flag = false
break
end
|
c59e058b
zhouhaihai
新一批日志记录
|
322
|
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
323
324
325
|
--print(curData[0], cfg.condition1)
if not curData[cfg.id] and curData[0] >= cfg.condition1 then
if info.mailId then
|
c59e058b
zhouhaihai
新一批日志记录
|
326
|
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
327
328
329
330
331
|
self.owner:log("activity", {
activity_id = cfg.id, -- 活动ID(或活动指定任务的ID)
activity_type = actType, -- 活动类型,见活动类型枚举表
activity_reward = cfg.reward:toNumMap(), -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
})
|
c59e058b
zhouhaihai
新一批日志记录
|
332
|
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
333
334
335
336
337
338
|
self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
curData[cfg.id] = 1
end
end
if curData[cfg.id] then
finishCnt = finishCnt + 1
|
7f9f002d
liuzujun
循环周活动
|
339
340
|
end
end
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
341
342
343
344
345
346
347
348
349
350
351
352
353
|
if totalCnt == finishCnt then
roundData[actType] = (roundData[actType] or 0) + 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
--print("cur round ".. roundData[actType], ctrlData.condition)
if roundData[actType] >= ctrlData.condition then
curData[0] = maxCondition
flag = false
|
7f9f002d
liuzujun
循环周活动
|
354
|
end
|
b8d77233
liuzujun
拆解周活动跨轮数据异常bug
|
355
|
self:updateProperty({field = "round", value = roundData, notNotify = not notify})
|
7f9f002d
liuzujun
循环周活动
|
356
|
end
|
7f9f002d
liuzujun
循环周活动
|
357
358
359
360
361
362
|
end
self:updateActData(actType, curData, not notify)
end
-- 抽卡周
activityFunc[Activity.ActivityType.DrawHero] = {
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
363
364
|
["check"] = function(self, actType, notify, count, pool) -- 检查
self:checkWeeklyAct(actType, notify, count, pool)
|
7f9f002d
liuzujun
循环周活动
|
365
366
367
368
369
370
371
372
373
|
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
循环周活动
|
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
|
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
循环周活动
|
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
|
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
循环周活动
|
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
|
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
循环周活动
|
425
426
427
428
|
self.owner:sendMail(MailId.ActOpenBox)
end,
}
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
429
430
431
432
433
|
-- 付费签到
activityFunc[Activity.ActivityType.PaySignIn] = {
["init"] = function(self, actType, isCrossDay, notify)
self:updateActData(actType, {}, not notify)
end,
|
ede282c0
liuzujun
付费签到规则改为按登录天数计算进度...
|
434
435
436
437
438
|
["crossDay"] = function(self, actType, notify)
local curData = self:getActData(actType)
curData[0] = (curData[0] or 0) + 1
self:updateActData(actType, curData, not notify)
end,
|
460afa6e
liuzujun
付费签到改为主动领取,战斗关卡不一...
|
439
440
|
["close"] = function(self, actType, notify)
self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
|
d4d00016
liuzujun
付费签到开始时间改为开服时间
|
441
442
443
444
445
446
447
448
449
|
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
付费签到改为主动领取,战斗关卡不一...
|
450
|
end,
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
451
452
|
}
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
453
454
455
456
457
|
-- 充值反馈
activityFunc[Activity.ActivityType.PayBack] = {
["check"] = function(self, actType, notify, twd) -- 检查
local oldVal = self:getActData(actType) or 0
local newVal = oldVal + twd
|
4709685d
liuzujun
返利邮件拼接充值档位
|
458
|
local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
459
|
if gift ~= "" then
|
1cfe4c75
liuzujun
充值返利邮件内容优化
|
460
|
local strCp = table.concat(checkPoint ,"、")
|
4709685d
liuzujun
返利邮件拼接充值档位
|
461
|
self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
|
e52c384f
liuzujun
探索指令bug, 充值返利活动
|
462
463
464
465
466
467
468
469
470
471
|
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
英雄帖活动初始化
|
472
473
474
|
-- 英雄帖
activityFunc[Activity.ActivityType.CalendaTask] = {
["init"] = function(self, actType, isCrossDay, notify)
|
dfa9ae5e
liuzujun
战令任务活动
|
475
|
local calTask = self.owner:getProperty("calTask")
|
190e1415
liuzujun
英雄帖活动初始化
|
476
|
calTask = {}
|
86a873b9
liuzujun
活动任务数据重置
|
477
|
self.owner:updateProperty({field="calTask", value=calTask})
|
190e1415
liuzujun
英雄帖活动初始化
|
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
|
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"
|
576c791c
liuzujun
玛尼英雄帖活动通过任务bug 元旦...
|
495
496
|
--role:checkTaskEnter("HangPass", {id = 0})
role:checkCalendaTask(true, 15, 3)
|
190e1415
liuzujun
英雄帖活动初始化
|
497
498
499
500
|
role:checkTaskEnter("HeroStarCollect", {})
role:checkTaskEnter("RuneQualityCollect", {})
end,
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
501
|
["crossDay"] = function(self, actType, notify, actId)
|
dfa9ae5e
liuzujun
战令任务活动
|
502
|
local actData = self.owner:getProperty("calTask") or {}
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
503
504
505
506
507
|
local record = actData["r"] or {}
local actCfg = csvdb["activity_taskCsv"][actId]
if not actCfg then return end
local change = false
for taskId, cfg in pairs(actCfg) do
|
dfa9ae5e
liuzujun
战令任务活动
|
508
|
if cfg["resetType"] == 1 then -- 每日重置
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
509
510
511
512
513
514
|
record[taskId] = nil
actData[taskId] = nil
change = true
end
end
if change then
|
dfa9ae5e
liuzujun
战令任务活动
|
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
|
self.owner:updateProperty({field="calTask", value=actData})
end
end,
["crossWeek"] = function(self, actType, notify, actId)
local actData = self.owner:getProperty("calTask") or {}
local record = actData["r"] or {}
local actCfg = csvdb["activity_taskCsv"][actId]
if not actCfg then return end
local change = false
for taskId, cfg in pairs(actCfg) do
if cfg["resetType"] == 2 then -- 每周重置
record[taskId] = nil
actData[taskId] = nil
change = true
end
end
if change then
self.owner:updateProperty({field="calTask", value=actData})
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
533
534
|
end
end,
|
f76d63e1
liuzujun
联动任务活动
|
535
|
["close"] = function(self, actType, notify)
|
dfa9ae5e
liuzujun
战令任务活动
|
536
|
self.owner:updateProperty({field="calTask", value={}})
|
f76d63e1
liuzujun
联动任务活动
|
537
|
end,
|
190e1415
liuzujun
英雄帖活动初始化
|
538
539
|
}
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
540
|
-- 活动任务 仅供春节活动使用 防冲突
|
dfa9ae5e
liuzujun
战令任务活动
|
541
|
activityFunc[Activity.ActivityType.BattleCommandTask] = {
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
542
|
["init"] = function(self, actType, isCrossDay, notify)
|
dfa9ae5e
liuzujun
战令任务活动
|
543
544
|
local bcTask = self.owner:getProperty("bcTask")
bcTask = {}
|
86a873b9
liuzujun
活动任务数据重置
|
545
|
self.owner:updateProperty({field="bcTask", value=bcTask})
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
|
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", {id = 0})
role:checkCalendaTask(true, 15, 3)
role:checkTaskEnter("HeroStarCollect", {})
role:checkTaskEnter("RuneQualityCollect", {})
end,
["crossDay"] = function(self, actType, notify, actId)
|
dfa9ae5e
liuzujun
战令任务活动
|
570
|
local actData = self.owner:getProperty("bcTask") or {}
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
571
572
573
574
575
576
577
578
579
580
581
582
|
local record = actData["r"] or {}
local actCfg = csvdb["activity_taskCsv"][actId]
if not actCfg then return end
local change = false
for taskId, cfg in pairs(actCfg) do
if cfg["resetType"] == 1 then -- 每日充值
record[taskId] = nil
actData[taskId] = nil
change = true
end
end
if change then
|
dfa9ae5e
liuzujun
战令任务活动
|
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
|
self.owner:updateProperty({field="bcTask", value=actData})
end
end,
["crossWeek"] = function(self, actType, notify, actId)
local actData = self.owner:getProperty("bcTask") or {}
local record = actData["r"] or {}
local actCfg = csvdb["activity_taskCsv"][actId]
if not actCfg then return end
local change = false
for taskId, cfg in pairs(actCfg) do
if cfg["resetType"] == 2 then -- 每周重置
record[taskId] = nil
actData[taskId] = nil
change = true
end
end
if change then
self.owner:updateProperty({field="bcTask", value=actData})
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
601
602
603
|
end
end,
["close"] = function(self, actType, notify)
|
dfa9ae5e
liuzujun
战令任务活动
|
604
|
self.owner:updateProperty({field="bcTask", value={}})
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
605
606
607
|
end,
}
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
608
609
610
|
-- 兑换
activityFunc[Activity.ActivityType.Exchange] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
611
612
613
614
|
local actData = self:getActData(actType) or {}
actData[actId] = {}
self:updateActData(actType, actData, not notify)
end,
|
a6898231
liuzujun
兑换活动上线检测是否需要刷新
|
615
|
["login"] = function(self, actType, actId)
|
7245bc4b
liuzujun
登入刷新兑换活动商店
|
616
|
activityFunc[Activity.ActivityType.Exchange]["crossDay"](self, actType, true, actId)
|
a6898231
liuzujun
兑换活动上线检测是否需要刷新
|
617
|
end,
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
618
619
620
621
622
623
624
625
|
["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
|
16f58f21
liuzujun
兑换商店不刷新bug
|
626
|
local rt = toUnixtime(refreshTimes[i]..string_format("%02x", RESET_TIME))
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
627
628
629
630
631
|
if timeNow >= rt and rt > lastTs then
lastTs = rt
actData = {}
end
end
|
16f58f21
liuzujun
兑换商店不刷新bug
|
632
633
|
if not next(actData) then
actData["ts"] = timeNow
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
634
635
636
637
638
639
640
641
|
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
兑换活动,邮件内容修改
|
642
643
644
645
646
647
648
649
650
651
652
653
|
}
-- 扭蛋机
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,
}
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
654
655
656
657
658
659
660
661
|
-- 活动卡池
activityFunc[Activity.ActivityType.ActHeroPool] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
end,
["close"] = function(self, actType, notify, actId)
local actData = self:getActData(actType)
local cfg = csvdb["activity_ctrlCsv"][actId]
if not cfg then return end
|
0c54995a
liuzujun
第一次通关拾荒章节推送限时礼包,活...
|
662
|
-- 保底次数转换成万能碎片
|
0285ef6c
liuzujun
活动卡池结束回馈次数通关邮件折算碎...
|
663
664
665
666
667
|
--local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60)
--if count > 0 then
-- local gift = {[723] = count}
-- self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {})
--end
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
668
669
670
671
672
|
actData[cfg.condition] = nil
self:updateActData(actType, actData, not notify)
end,
}
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
673
674
675
676
|
-- 挂机掉落
activityFunc[Activity.ActivityType.HangDrop] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
local actime = self:getProperty("actime")
|
576c791c
liuzujun
玛尼英雄帖活动通过任务bug 元旦...
|
677
678
|
local ctime = self.owner:getProperty("ctime")
local startTime = math.max(actime[actId], ctime)
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
679
680
681
682
683
684
685
686
|
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
}
|
66fe093a
liuzujun
元旦关卡活动
|
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
|
--ChallengeLevel
activityFunc[Activity.ActivityType.ChallengeLevel] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
self:getBattleTicket(actId)
end,
["login"] = function(self, actType, actId)
self:getBattleTicket(actId)
end
}
function Activity:onLoginActivity(actId)
local actData = csvdb["activity_ctrlCsv"][actId]
if not actData then return end
local actType = actData.showType
if activityFunc[actType] and activityFunc[actType]['login'] then
activityFunc[actType]["login"](self, actType, actId)
end
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
706
707
708
709
|
function Activity:initActivity(actId, isCrossDay, notify)
local actData = csvdb["activity_ctrlCsv"][actId]
if not actData then return end
local actType = actData.showType
|
66fe093a
liuzujun
元旦关卡活动
|
710
|
if activityFunc[actType] and activityFunc[actType]['init'] then
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
711
|
activityFunc[actType]["init"](self, actType, isCrossDay, notify, actId)
|
ea40710f
zhouhaihai
活动
|
712
713
714
|
end
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
715
716
717
718
|
function Activity:closeActivity(actId, notify, notUpdateAct)
local actData = csvdb["activity_ctrlCsv"][actId]
if not actData then return end
local actType = actData.showType
|
ea40710f
zhouhaihai
活动
|
719
|
if activityFunc[actType] and activityFunc[actType]['close'] then
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
720
|
activityFunc[actType]["close"](self, actType, notify, actId)
|
ea40710f
zhouhaihai
活动
|
721
|
end
|
fb344e8a
liuzujun
活动结束回收邮件
|
722
|
self:recycleActItem(actId)
|
7f9f002d
liuzujun
循环周活动
|
723
|
if Activity.schema["act".. actType] then
|
eb5ffd1c
liuzujun
世界boss翻牌奖励 活动卡池保底...
|
724
725
726
|
if not Activity.schema["act" .. actType][3] then
self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
end
|
7f9f002d
liuzujun
循环周活动
|
727
|
end
|
ea40710f
zhouhaihai
活动
|
728
729
730
|
end
function Activity:refreshDailyData(notify)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
731
732
733
734
|
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
活动
|
735
|
if activityFunc[actType] and activityFunc[actType]['crossDay'] then
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
736
|
activityFunc[actType]["crossDay"](self, actType, notify, actId)
|
ea40710f
zhouhaihai
活动
|
737
738
739
|
end
end
end
|
9a1c54b2
zhouhaihai
活动
|
740
741
|
end
|
dfa9ae5e
liuzujun
战令任务活动
|
742
743
744
745
746
747
748
749
750
751
752
753
|
function Activity:refreshWeekData(notify)
for actId, status in pairs(self._isOpen) do
local actData = csvdb["activity_ctrlCsv"][actId]
if status and actData then
local actType = actData.showType
if activityFunc[actType] and activityFunc[actType]['crossWeek'] then
activityFunc[actType]["crossWeek"](self, actType, notify, actId)
end
end
end
end
|
ea40710f
zhouhaihai
活动
|
754
|
function Activity:checkActivity(notNotify, activityType, ...)
|
9a1c54b2
zhouhaihai
活动
|
755
|
if not activityType then return end
|
ea40710f
zhouhaihai
活动
|
756
757
758
|
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
活动
|
759
760
761
|
end
end
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
762
763
764
|
-- 获取此次挂机掉落翻倍时长
function Activity:getActHangDoubleTime(lastTs, nowTs)
local type = "DoubleDrop"
|
2bc706ab
liuzujun
兑换活动重置,累充功能
|
765
766
|
--local actId = checkActivityType(type)
local isOpen, actId = self:isOpen(type)
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
767
768
769
770
|
local openTs = self:getProperty("actime")[actId] or 0
local timeNow = skynet.timex()
lastTs = math.max(lastTs, openTs)
if isOpen then
|
024370be
liuzujun
双倍掉掉落bug
|
771
|
if nowTs > openTs and nowTs > lastTs then
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
772
773
774
775
776
777
778
779
|
return nowTs - lastTs
else
return 0
end
end
return 0
end
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
780
781
|
-- 获取活动卡池id
function Activity:getActivityPool(mainType, subType)
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
782
783
784
|
local open, actId = self:isOpen(Activity.ActivityType.SsrUpPoolChange)
if not open then
--if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
785
786
|
return 0
end
|
accf94c4
liuzujun
活动以类型标识,修改双倍活动bug
|
787
|
local actData = csvdb["activity_ctrlCsv"][actId]
|
93f6e69b
liuzujun
拾荒选择时间,抽卡增加sr保底
|
788
789
790
791
792
793
794
795
796
797
798
799
|
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
付费签到,应用市场反馈
|
800
801
|
-- 付费签到可领奖励
function Activity:getPaySignReward()
|
7754304d
zhouhaihai
bug
|
802
|
local actGoodsFlag = self.owner.storeData:getProperty("actGoodsFlag")
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
803
804
805
806
807
808
809
810
|
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
付费签到,抽卡阶段奖励,探索指令
|
811
|
local curData = self:getActData("PaySignIn")
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
812
|
local reward, change = {}
|
37bb4611
liuzujun
付费签到,抽卡阶段奖励,探索指令
|
813
|
for day, csvData in pairs(csvdb["pay_signInCsv"]) do
|
51d9d20b
liuzujun
付费签到,应用市场反馈
|
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
|
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
兑换活动,邮件内容修改
|
841
842
843
844
845
846
847
|
-- 回收活动道具
function Activity:recycleActItem(actId)
local role = self.owner
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return end
local gift = {}
local costs = {}
|
1be743f3
liuzujun
扭蛋机调试
|
848
|
for _, arr in ipairs(actCfg.recycle:toTableArray(true)) do
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
849
850
851
852
|
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
|
40dd5057
zhouhaihai
奖励内容错误
|
853
|
gift[toId] = (gift[toId] or 0) + toNum * itemCount
|
847f9a7b
liuzujun
兑换活动,邮件内容修改
|
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
|
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
|
66fe093a
liuzujun
元旦关卡活动
|
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
895
896
897
898
899
900
901
902
|
-- 活动挑战关卡计算门票
function Activity:getBattleTicket(actId)
local role = self.owner
local createTs = role:getProperty("ctime")
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return 0 end
local actStartTime = 0
local openTimes = actCfg.time:toArray(false, "=")
actStartTime = toUnixtime(openTimes[1]..string_format("%02x", RESET_TIME))
local actData = self:getActData("ChallengeLevel") or {}
local startTs = actData["ts"] or math.max(actStartTime, createTs)
local timeNow = skynet.timex()
local modify = false
local arr = actCfg.condition2:toArray(true, "=")
local ticketId, init, limit, duration = arr[1] or 0, arr[2] or 0, arr[3] or 0, arr[4] or 10000
local count = actData["ticket"] or init
local add = math.max(math.floor((timeNow - startTs) / (duration * 60)), 0)
local newCount= math.min(count + add, limit)
if newCount ~= count or newCount >= limit then
modify = true
end
add = newCount - count
if modify or not next(actData) then
actData["ticket"] = newCount
actData["ts"] = newCount >= limit and timeNow or (startTs + add * duration * 60)
self:updateActData("ChallengeLevel", actData)
end
end
|
485c8c35
liuzujun
活动礼包购买记录活动过期清理
|
903
904
905
906
907
908
909
910
911
912
913
914
915
916
|
activityFunc[Activity.ActivityType.ActShopGoods] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
end,
["close"] = function(self, actType, notify)
local rechargeRecord = self.owner.storeData:getProperty("payR")
for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
if cfg.shop == 3 and cfg.type == ShopPackType.ActShopPack then
rechargeRecord[id] = nil
end
end
self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
end,
}
|
091912ed
chenyueqi
未测试版好友能量助力活动
|
917
918
|
activityFunc[Activity.ActivityType.FriendEnergy] = {
["init"] = function (self, actType, isCrossDay, notify, actId)
|
6a61fe2c
chenyueqi
少个大括号
|
919
|
local data = {magic = 0, limit = 0, reward = {}, giveAE = {}, getAE = {}, new = self:getActFriendNew()}
|
091912ed
chenyueqi
未测试版好友能量助力活动
|
920
921
|
self:updateActData(actType, data, not notify)
end,
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
922
|
["login"] = function (self, actType)
|
cab7184b
chenyueqi
活动能量bug
|
923
|
local actData = self:getActData(actType) or {}
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
924
925
926
|
actData.new = self:getActFriendNew()
self:updateActData(actType, actData, not notify)
end,
|
091912ed
chenyueqi
未测试版好友能量助力活动
|
927
928
929
930
931
932
933
934
935
936
937
|
["crossDay"] = function(self, actType, notify)
local actData = self:getActData(actType)
actData.limit = 0
actData.giveAE = {}
actData.getAE = {}
self:updateActData(actType, actData, not notify)
end,
["close"] = function (self, actType, notify, actId)
redisproxy:del(FRIEND_ENERGY:format(self.owner:getProperty("id")))
end
}
|
161c50cc
zhouhaihai
宝藏怪活动
|
938
|
|
cab7184b
chenyueqi
活动能量bug
|
939
|
function Activity:getActFriendNew()
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
940
|
local roleId = self.owner:getProperty("id")
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
941
942
|
local ids = {}
|
cab7184b
chenyueqi
活动能量bug
|
943
944
|
local members = redisproxy:smembers(FRIEND_ENERGY:format(roleId))
for _, id in pairs(members) do
|
6136eaca
liuzujun
添加好友表
|
945
|
if self.owner.friends[tonumber(id)] then
|
cab7184b
chenyueqi
活动能量bug
|
946
|
ids[tonumber(id)] = 1
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
947
|
end
|
cab7184b
chenyueqi
活动能量bug
|
948
|
end
|
0886d05a
chenyueqi
修改联动好友赠送获得的红点记录和通知
|
949
950
951
|
return ids
end
|
161c50cc
zhouhaihai
宝藏怪活动
|
952
953
954
955
956
957
958
|
activityFunc[Activity.ActivityType.Crisis] = {
["check"] = function(self, actType, notify, atype, count) -- 检查
count = count or 1
local isOpen, actId = self:isOpen(actType)
local actData = self:getActData(actType) or {}
actData.task = actData.task or {}
local change = false
|
e8719dc4
zhouhaihai
物资危机bug
|
959
|
local actCsv = csvdb["activity_crisisCsv"][actId]
|
161c50cc
zhouhaihai
宝藏怪活动
|
960
961
962
|
for id, actSet in pairs(actCsv) do
if actSet.type == atype then
local status = actData.task[id] or 0
|
bb30b1c1
zhouhaihai
宝藏怪
|
963
964
965
966
967
968
969
970
971
972
973
974
975
976
|
if status ~= -1 then
status = status + count
if status >= actSet.condition1 then
local reward
if actSet.loop == 1 then
local rcount = math.floor(status / actSet.condition1)
reward = actSet.reward:toNumMap()
for itemId, itemC in pairs(reward) do
reward[itemId] = itemC * rcount
end
status = status % actSet.condition1
else
reward = actSet.reward
status = -1
|
161c50cc
zhouhaihai
宝藏怪活动
|
977
|
end
|
b47316e6
zhouhaihai
活动奖励bug
|
978
|
|
bb30b1c1
zhouhaihai
宝藏怪
|
979
980
981
982
|
self.owner:award(reward, {log = {desc = "activity_crisis"}, notNotify = not notify})
end
actData.task[id] = status
change = true
|
161c50cc
zhouhaihai
宝藏怪活动
|
983
|
end
|
161c50cc
zhouhaihai
宝藏怪活动
|
984
985
986
987
988
989
990
991
992
993
|
end
end
if change then
-- 更新下排行榜
self.owner:updateRankCommon(RANK_TYPE.ActCrisis, self.owner:getItemCount(ItemId.CrisisScore))
self:updateActData(actType, actData)
end
end,
}
|
ac885527
liuzujun
联动签到活动
|
994
995
996
997
|
activityFunc[Activity.ActivityType.CommonSignIn] = {
["init"] = function(self, actType, isCrossDay, notify, actId)
if not isCrossDay then
activityFunc[Activity.ActivityType.CommonSignIn]["crossDay"](self, actType, notify, actId)
|
115454c1
liuzujun
调整咵天清日常与活动初始化的调用顺序
|
998
999
1000
|
local taskStatus = self.owner:getProperty("dTask")
activityFunc[Activity.ActivityType.CommonSignIn]["check"](self, actType, notify, 0, (taskStatus["a"] or 0))
|
ac885527
liuzujun
联动签到活动
|
1001
|
end
|
ac885527
liuzujun
联动签到活动
|
1002
1003
1004
1005
|
end,
["crossDay"] = function(self, actType, notify, actId)
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return end
|
86a873b9
liuzujun
活动任务数据重置
|
1006
|
local conArr = actCfg.condition2:toArray(true, "=")
|
ac885527
liuzujun
联动签到活动
|
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
|
-- 0 登录即可, 1 达到指定活跃度
if conArr[1] ~= 0 then
return
end
local curData = self:getActData(actType) or {}
curData[0] = (curData[0] or 0) + 1
self:updateActData(actType, curData, not notify)
end,
["check"] = function(self, actType, notify, pre, cur) -- 检查
local isOpen, actId = self:isOpen(actType)
local actData = self:getActData(actType) or {}
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return end
|
dfa9ae5e
liuzujun
战令任务活动
|
1020
|
local conArr = actCfg.condition2:toArray(true, "=")
|
ac885527
liuzujun
联动签到活动
|
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
|
-- 0 登录即可, 1 达到指定活跃度
if conArr[1] ~= 1 then
return
end
local val = conArr[2] or 0
if pre < val and cur >= val then
actData[0] = (actData[0] or 0) + 1
self:updateActData(actType, actData, not notify)
end
end,
}
|
c756d4df
liuzujun
新年将军令活动
|
1033
1034
|
activityFunc[Activity.ActivityType.BattleCommand] = {
["init"] = function (self, actType, isCrossDay, notify, actId)
|
dfa9ae5e
liuzujun
战令任务活动
|
1035
|
local data = {unlock = 0, freeR = "", payR = "", lvl = 0, sum = 0, week = 0}
|
c756d4df
liuzujun
新年将军令活动
|
1036
1037
|
self:updateActData(actType, data, not notify)
end,
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
1038
|
["check"] = function(self, actType, notify, id, count) -- 检查 itemid, count
|
c756d4df
liuzujun
新年将军令活动
|
1039
1040
1041
1042
1043
|
local isOpen, actId = self:isOpen(actType)
local actData = self:getActData(actType) or {}
local actCfg = csvdb["activity_ctrlCsv"][actId]
if not actCfg then return end
if actCfg.condition1 == "" then return end
|
dfa9ae5e
liuzujun
战令任务活动
|
1044
|
local arr = actCfg.condition2:toArray(true, "=")
|
75876cb3
liuzujun
代理拾荒出勤人数计数错误, 代理拾...
|
1045
1046
1047
1048
1049
1050
|
local itemIdWeek, itemIdNormal, limit = arr[1], arr[2], arr[3]
if (itemIdWeek == id or itemIdNormal == id) and count > 0 then
if itemIdWeek == id then
if (actData["week"] or 0) >= limit then
return
end
|
e3b29f2f
liuzujun
战令-一次性领取超出周上限的战令经...
|
1051
1052
1053
|
local old = actData["week"] or 0
actData["week"] = math.min(old + count, limit)
count = actData["week"] - old
|
dfa9ae5e
liuzujun
战令任务活动
|
1054
|
end
|
b620581a
liuzujun
战令活动,战令相关的任务活动
|
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
|
local total = actData["sum"] + count
local curLvl = actData["lvl"] or 0
if actCfg.condition == 1 then -- 代表sum需要转换为等级
local bpCfg = csvdb["activity_battlepass_rewardCsv"][actId]
if not bpCfg then return end
for i = 1, #bpCfg do
local cfg = bpCfg[i]
if cfg["type"] > curLvl then
if total < cfg["condition"] then break end
total = total - cfg["condition"]
curLvl = curLvl + 1
end
end
actData["lvl"] = curLvl
actData["sum"] = total
end
|
c756d4df
liuzujun
新年将军令活动
|
1072
1073
1074
|
self:updateActData(actType, actData)
end
end,
|
dfa9ae5e
liuzujun
战令任务活动
|
1075
1076
1077
1078
1079
|
["crossWeek"] = function(self, actType, notify, actId)
local actData = self:getActData(actType) or {}
actData["week"] = 0
self:updateActData(actType, actData, true)
end,
|
c756d4df
liuzujun
新年将军令活动
|
1080
1081
1082
|
}
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
|
activityFunc[Activity.ActivityType.NewSign] = {
-- ["check"] = function(self, actType, notify) -- 检查
-- end,
["init"] = function(self, actType, isCrossDay, notify)
if not isCrossDay then
activityFunc[Activity.ActivityType.NewSign]["crossDay"](self, actType, notify)
end
end,
-- ["close"] = function(self, actType, notify)
-- end,
["crossDay"] = function(self, actType, notify)
local curData = self:getActData(actType)
|
1d7517e6
chenyueqi
新春签到代码优化,支持不同时开同类...
|
1095
1096
1097
1098
1099
|
local isOpen, actId = self:isOpen(actType)
local actData = csvdb["activity_signInCsv"][actId] or {}
curData["0"] = curData["0"] or 0
if curData["0"] >= #actData then return end -- 满了就忽略了
curData["0"] = curData["0"] + 1
|
336fa4a6
chenyueqi
新的活动签到,新春三重奏之返还0消耗
|
1100
1101
1102
1103
1104
1105
|
-- 没满更新一下
self:updateActData(actType, curData, not notify)
end,
}
|
43a6d57e
liuzujun
拾荒活动
|
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
|
local function closeActAdvHang(role, chapterId)
local advHang = role:getProperty("advHang")
local info = advHang[chapterId]
if not info then return end
local index = info.index or 1
local chapterData = csvdb["adv_chapter_campsiteCsv"][chapterId]
if not chapterData then return end
local campSiteData = chapterData[info.campId or 2]
if not campSiteData then return 1 end
if campSiteData.idleReward_1 == "" and campSiteData.idleReward_2 == "" then return 2 end --没有奖励 没有挂机
local adv_idle_time = globalCsv.adv_idle_time[index]
local adv_idle_energy = globalCsv.adv_idle_energy[index]
local adv_idle_reward_coef = globalCsv.adv_idle_reward[index]
if not adv_idle_time or not adv_idle_energy or not adv_idle_reward_coef then
return 2
end
adv_idle_time = adv_idle_time * 60
local reward, isFull, change, heroFaithMap
local heroCnt = 0
if skynet.timex() >= info.time then
-- 增加英雄信赖
local exp = info.duration / 60
heroFaithMap = {}
for _, heroId in pairs(info.format.heros) do
local curFaith = role:addHeroFaith(heroId, exp)
heroFaithMap[heroId] = curFaith
heroCnt = heroCnt + 1
end
local totalReward = campSiteData.idleReward_1 .. " " .. campSiteData.idleReward_2
local idleReward = totalReward:toNumMap()
for itemId, count in pairs(idleReward) do
idleReward[itemId] = count * adv_idle_reward_coef
end
reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
end
|
43a6d57e
liuzujun
拾荒活动
|
1146
1147
1148
1149
1150
1151
1152
1153
|
role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = 2})
role:checkTaskEnter("AdvHang", {})
role:checkTaskEnter("AdvHangHeroCnt", {count = heroCnt})
end
|
98be031a
liuzujun
新年活动
|
1154
1155
1156
1157
1158
1159
1160
1161
|
activityFunc[Activity.ActivityType.AdvLevel] = {
-- ["check"] = function(self, actType, notify) -- 检查
-- end,
["init"] = function(self, actType, isCrossDay, notify)
end,
["close"] = function(self, actType, notify, actid)
local actCfg = csvdb["activity_adv_chapterCsv"][actid]
if not actCfg then return end
|
1a20d90b
liuzujun
添加活动关卡gm指令, 活动代理拾...
|
1162
|
for chapterId, _ in pairs(actCfg) do
|
98be031a
liuzujun
新年活动
|
1163
1164
|
local advPass = self.owner:getProperty("advPass")
advPass[chapterId] = nil
|
f037f9c3
zhouhaihai
充值中继, 关闭缺少参数
|
1165
1166
1167
1168
1169
1170
|
local advRelay = self.owner:getProperty("advRelay")
advRelay[chapterId] = nil
self.owner:updateProperties({
advPass = advPass,
advRelay = advRelay,
}, not notify)
|
43a6d57e
liuzujun
拾荒活动
|
1171
|
-- 关闭活动代理拾荒
|
f037f9c3
zhouhaihai
充值中继, 关闭缺少参数
|
1172
|
closeActAdvHang(self.owner, chapterId)
|
43a6d57e
liuzujun
拾荒活动
|
1173
1174
|
end
-- 强制关闭活动拾荒关卡
|
edd92fd9
liuzujun
活动拾荒活动结束重置数据
|
1175
|
local adv = self.owner:getAdvData()
|
43a6d57e
liuzujun
拾荒活动
|
1176
1177
|
if adv:isRunning() and adv:isActivity() then
adv:forceOver()
|
98be031a
liuzujun
新年活动
|
1178
|
end
|
43a6d57e
liuzujun
拾荒活动
|
1179
|
|
98be031a
liuzujun
新年活动
|
1180
1181
1182
|
end,
}
|
706b517e
liuzujun
翻倍掉落活动,商城免费宝箱
|
1183
|
return Activity
|