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