Blame view

src/models/Activity.lua 16.1 KB
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,  -- 定向招募活动
e51ff6d2   zhouhaihai   冒险~
22
  }
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
23
  
9a1c54b2   zhouhaihai   活动
24
  
e51ff6d2   zhouhaihai   冒险~
25
26
27
28
  local function checkActivityType(activityType)
  	if type(activityType) == "string" then
  		activityType = Activity.ActivityType[activityType]
  	end
ea40710f   zhouhaihai   活动
29
  	return activityType or 0
e51ff6d2   zhouhaihai   冒险~
30
31
32
33
34
35
  end
  
  
  function Activity:ctor(properties)
  	Activity.super.ctor(self, properties)
  
9a1c54b2   zhouhaihai   活动
36
  	self._isOpen = {}
e51ff6d2   zhouhaihai   冒险~
37
  end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
38
39
  
  
e51ff6d2   zhouhaihai   冒险~
40
  Activity.schema = {
be4e8031   zhouhaihai   活动 拾荒
41
  	actime 		= {"table", {}},  -- 最近检查某项活动的开始时间  {id = time}
7f9f002d   liuzujun   循环周活动
42
  	round		= {"table", {}},  -- 记录活动到了第几轮  {id = roundnum}
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
43
44
45
46
47
48
49
50
  	act4		= {"table", {}},  -- {0 = day, 1= -1, 2 = -1} == 签到活动
  	act6		= {"table", {}},  -- {1 = 1, 2 = 1} == 付费签到活动
  	act8		= {"number", 0},  -- 充值返利 
  
  	act11		= {"table", {}},  -- {0 = 贩卖数量, 1=1, 2=1}  贩卖周活动  1表示领取过该档位的奖励
  	act12		= {"table", {}},  -- {0 = 抽卡次数, 1=1, 2=1}  抽卡周活动  1表示领取过该档位的奖励
  	act13		= {"table", {}},  -- {0 = 拾荒消耗远古金币数量, 1=1, 2=1}  拾荒周活动  1表示领取过该档位的奖励
  	act14		= {"table", {}},  -- {0 = 拆解数量, 1=1, 2=1}  拆解周活动  1表示领取过该档位的奖励
e51ff6d2   zhouhaihai   冒险~
51
  }
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
52
  
e51ff6d2   zhouhaihai   冒险~
53
54
  function Activity:data()
  	return {
be4e8031   zhouhaihai   活动 拾荒
55
  		actime = self:getProperty("actime"),
7f9f002d   liuzujun   循环周活动
56
  		round = self:getProperty("round"),
7f9f002d   liuzujun   循环周活动
57
  		act4 = self:getProperty("act4"),
7f9f002d   liuzujun   循环周活动
58
  		act6 = self:getProperty("act6"),
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
59
60
61
62
63
  		act8 = self:getProperty("act8"),
  		act11 = self:getProperty("act11"),
  		act12 = self:getProperty("act12"),
  		act13 = self:getProperty("act13"),
  		act14 = self:getProperty("act14"),
e51ff6d2   zhouhaihai   冒险~
64
  	}
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
65
66
  end
  
e51ff6d2   zhouhaihai   冒险~
67
  
9a1c54b2   zhouhaihai   活动
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
  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
88
89
90
  function Activity:isOpenRaw(activityId, now)
  	activityId = checkActivityType(activityId)
  	local actData = csvdb["activity_ctrlCsv"][activityId]
ea40710f   zhouhaihai   活动
91
92
93
94
95
96
97
98
  	if not actData then return end
  
  	if actData.time == "" then -- 关闭
  		return false
  	end
  
  	local st = 0
  	local et = 0
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
99
  	--local now = skynet.timex()
ea40710f   zhouhaihai   活动
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
  
  	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   活动
126
127
  function Activity:isOpen(activityType)
  	activityType = checkActivityType(activityType)
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
128
129
130
131
132
133
134
135
136
137
138
  	--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   活动
139
140
141
142
143
144
  end
  
  function Activity:getActData(actType)
  	actType = checkActivityType(actType)
  	return self:getProperty("act" .. actType)
  end
9a1c54b2   zhouhaihai   活动
145
  
ea40710f   zhouhaihai   活动
146
147
148
  function Activity:updateActData(actType, data, notNotify)
  	actType = checkActivityType(actType)
  	self:updateProperty({field = "act" .. actType,  value = data, notNotify = notNotify})
9a1c54b2   zhouhaihai   活动
149
150
  end
  
ea40710f   zhouhaihai   活动
151
  
9a1c54b2   zhouhaihai   活动
152
  -- 跨天刷新 --登录刷新
ea40710f   zhouhaihai   活动
153
154
  function Activity:checkActivityStatus(now, isCrossDay, notify)
  	self._isOpen = {}
be4e8031   zhouhaihai   活动 拾荒
155
  	local actime = self:getProperty("actime")
ea40710f   zhouhaihai   活动
156
  	local change = false
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
157
158
159
  	for actId, actData in pairs(csvdb["activity_ctrlCsv"]) do
  		local isOpen, startTime = self:isOpenRaw(actId, now)
  		self._isOpen[actId] = isOpen
ea40710f   zhouhaihai   活动
160
161
  
  		if isOpen then
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
162
  			if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
ea40710f   zhouhaihai   活动
163
  			else  -- 重置
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
164
165
166
  				actime[actId] = startTime
  				self:closeActivity(actId, notify, true)
  				self:initActivity(actId, isCrossDay, notify)
ea40710f   zhouhaihai   活动
167
168
169
  				change = true
  			end
  		else
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
170
171
172
  			if actime[actId] then
  				self:closeActivity(actId, notify)
  				actime[actId] = nil
ea40710f   zhouhaihai   活动
173
174
175
176
177
  				change = true
  			end
  		end
  	end
  	if change then
be4e8031   zhouhaihai   活动 拾荒
178
  		self:updateProperty({field = "actime", value = actime, notNotify = not notify})
ea40710f   zhouhaihai   活动
179
  	end
9a1c54b2   zhouhaihai   活动
180
181
  end
  
ea40710f   zhouhaihai   活动
182
  local activityFunc = {}
9a1c54b2   zhouhaihai   活动
183
  
ea40710f   zhouhaihai   活动
184
185
186
187
188
189
190
191
192
193
194
195
196
  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   活动 拾荒
197
  		local actData = csvdb["new_signInCsv"]
ea40710f   zhouhaihai   活动
198
199
200
201
202
203
  		if curData[0] > #actData then return end -- 满了就忽略了
  
  		-- 没满更新一下
  		self:updateActData(actType, curData, not notify)
  	end,
  }
9a1c54b2   zhouhaihai   活动
204
  
7f9f002d   liuzujun   循环周活动
205
206
207
208
  --loop1:累计料理贩卖N次
  --loop2:累计招募N次
  --loop3:累计资助N次
  --loop4:时钟箱拆解N个
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
209
  function Activity:checkWeeklyAct(actType, notify, count, pool)
7f9f002d   liuzujun   循环周活动
210
211
212
213
214
215
  		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保底
216
217
218
  		if actType == Activity.ActivityType.DrawHero and pool == DrawCardType.FriendDraw then
  			return
  		end
7f9f002d   liuzujun   循环周活动
219
220
221
  		local info = actInfoMap[actType]
  		if not info then return end
  
ee021c58   liuzujun   每周循环任务bug
222
223
224
225
226
  		local open, actId = self:isOpen(actType)
  		if not open then
  			return
  		end
  
7f9f002d   liuzujun   循环周活动
227
228
229
  		local curData = self:getActData(actType)
  		local roundData = self:getProperty("round")
  		local curRound = roundData[actType] or 0
ee021c58   liuzujun   每周循环任务bug
230
  		local ctrlData = csvdb["activity_ctrlCsv"][actId]
7f9f002d   liuzujun   循环周活动
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
  		if not ctrlData then return end
  		if curRound >= ctrlData.condition then
  			return
  		end
  		curData[0] = (curData[0] or 0) + count
  		local totalCnt = 0
  		local finishCnt = 0
  		local maxCondition = 0
  		for k, cfg in pairs(csvdb[info.table] or {}) do
  			totalCnt = totalCnt + 1
  			if maxCondition < cfg.condition1 then
  				maxCondition = cfg.condition1
  			end
  			if not curData[cfg.id] and curData[0] >= cfg.condition1 then
  				if info.mailId then 
c59e058b   zhouhaihai   新一批日志记录
246
247
248
249
  
  					self.owner:log("activity", {
  						activity_id = cfg.id, -- 活动ID(或活动指定任务的ID)
  						activity_type = actType, -- 活动类型,见活动类型枚举表
887c1843   zhouhaihai   日志新一批
250
  						activity_reward = cfg.reward:toNumMap(), -- 活动奖励,json格式记录,{'itemid1':123,'itemid2':456,………...}
c59e058b   zhouhaihai   新一批日志记录
251
252
  					})
  
7f9f002d   liuzujun   循环周活动
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
  					self.owner:sendMail(info.mailId, nil, cfg.reward, {cfg.condition1})
  					curData[cfg.id] = 1
  				end
  			end
  			if curData[cfg.id] then
  				finishCnt = finishCnt + 1
  			end
  		end
  		if totalCnt == finishCnt then
  			roundData[actType] = curRound + 1
  			for k,v in pairs(curData) do
  				if k == 0 then
  					curData[k] = curData[0] >= maxCondition and curData[0] - maxCondition or 0
  				else
  					curData[k] = nil
  				end
  			end
  			self:updateProperty({field = "round", value = roundData, notNotify = not notify})
  		end
  		self:updateActData(actType, curData, not notify)
  end
  
  -- 抽卡周
  activityFunc[Activity.ActivityType.DrawHero] = {
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
277
278
  	["check"] = function(self, actType, notify, count, pool) -- 检查
  		self:checkWeeklyAct(actType, notify, count, pool)
7f9f002d   liuzujun   循环周活动
279
280
281
282
283
284
285
286
287
  	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   循环周活动
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
  		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   循环周活动
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
  		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   循环周活动
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
  		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   循环周活动
339
340
341
342
  		self.owner:sendMail(MailId.ActOpenBox)
  	end,
  }
  
51d9d20b   liuzujun   付费签到,应用市场反馈
343
344
345
346
347
  -- 付费签到
  activityFunc[Activity.ActivityType.PaySignIn] = {
  	["init"] = function(self, actType, isCrossDay, notify)
  		self:updateActData(actType, {}, not notify)
  	end,
460afa6e   liuzujun   付费签到改为主动领取,战斗关卡不一...
348
349
  	["close"] = function(self, actType, notify)
  		self.owner.storeData:SetActGoodsFlag("paySignIn", 0)
d4d00016   liuzujun   付费签到开始时间改为开服时间
350
351
352
353
354
355
356
357
358
  		
  		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   付费签到改为主动领取,战斗关卡不一...
359
  	end,
51d9d20b   liuzujun   付费签到,应用市场反馈
360
361
  }
  
e52c384f   liuzujun   探索指令bug, 充值返利活动
362
363
364
365
366
  -- 充值反馈
  activityFunc[Activity.ActivityType.PayBack] = {
  	["check"] = function(self, actType, notify, twd) -- 检查
  		local oldVal = self:getActData(actType) or 0
  		local newVal = oldVal + twd
4709685d   liuzujun   返利邮件拼接充值档位
367
  		local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
e52c384f   liuzujun   探索指令bug, 充值返利活动
368
  		if gift ~= "" then
1cfe4c75   liuzujun   充值返利邮件内容优化
369
  			local strCp = table.concat(checkPoint ,"、")
4709685d   liuzujun   返利邮件拼接充值档位
370
  			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
e52c384f   liuzujun   探索指令bug, 充值返利活动
371
372
373
374
375
376
377
378
379
380
  		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   英雄帖活动初始化
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
  -- 英雄帖
  activityFunc[Activity.ActivityType.CalendaTask] = {
  	["init"] = function(self, actType, isCrossDay, notify)
  		local calTask = self.owner:getProperty("CalTask")
  		calTask = {}
  		local role = self.owner
  		local buildL = role.dinerData:getProperty("buildL")
  		local curLevel = buildL:getv(1, 1)
  		role:checkTaskEnter("DinerLevelUp", {level = curLevel})
  
  		role:checkTaskEnter("HeroLvlCollect", {})
  		role:checkTaskEnter("HeroQualityCollect", {})
  
  		local curPopular = role.dinerData:getProperty("popular")
  		role:checkTaskEnter("DinerPopular", {count = curPopular})
  
  		local rLevel = role:getProperty("level")
  		role:checkTaskEnter("RoleLevelUp", {level = rLevel})
  
  		local towerInfo = role:getProperty("towerInfo")
  		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
  		--"PvpWin"
  		role:checkTaskEnter("HangPass", {})
  		role:checkTaskEnter("HeroStarCollect", {})
  		role:checkTaskEnter("RuneQualityCollect", {})
  
  	end,
  	-- ["close"] = function(self, actType, notify)
  	-- end,
  }
  
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
412
413
414
415
  function Activity:initActivity(actId, isCrossDay, notify)
  	local actData = csvdb["activity_ctrlCsv"][actId]
  	if not actData then return end
  	local actType = actData.showType
ea40710f   zhouhaihai   活动
416
417
418
419
420
  	if activityFunc[actType] and activityFunc[actType]['close'] then
  		activityFunc[actType]["init"](self, actType, isCrossDay, notify)
  	end
  end
  
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
421
422
423
424
  function Activity:closeActivity(actId, notify, notUpdateAct)
  	local actData = csvdb["activity_ctrlCsv"][actId]
  	if not actData then return end
  	local actType = actData.showType
ea40710f   zhouhaihai   活动
425
426
427
  	if activityFunc[actType] and activityFunc[actType]['close'] then
  		activityFunc[actType]["close"](self, actType, notify)
  	end
7f9f002d   liuzujun   循环周活动
428
429
430
  	if Activity.schema["act".. actType] then
  		self:updateActData(actType, Activity.schema["act" .. actType][2], not notify or notUpdateAct)
  	end
ea40710f   zhouhaihai   活动
431
432
433
  end
  
  function Activity:refreshDailyData(notify)
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
434
435
436
437
  	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   活动
438
439
440
441
442
  			if activityFunc[actType] and activityFunc[actType]['crossDay'] then
  				activityFunc[actType]["crossDay"](self, actType, notify)
  			end
  		end
  	end
9a1c54b2   zhouhaihai   活动
443
444
  end
  
ea40710f   zhouhaihai   活动
445
  function Activity:checkActivity(notNotify, activityType, ...)
9a1c54b2   zhouhaihai   活动
446
  	if not activityType then return end
ea40710f   zhouhaihai   活动
447
448
449
  	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   活动
450
451
452
  	end
  end
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
453
454
455
456
457
458
459
460
461
  -- 获取此次挂机掉落翻倍时长
  function Activity:getActHangDoubleTime(lastTs, nowTs)
  	local type = "DoubleDrop"
  	local actId = checkActivityType(type)
  	local isOpen = self:isOpen(type)
  	local openTs = self:getProperty("actime")[actId] or 0
  	local timeNow = skynet.timex()
  	lastTs =  math.max(lastTs, openTs)
  	if isOpen then
024370be   liuzujun   双倍掉掉落bug
462
  		if nowTs > openTs and nowTs > lastTs then
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
463
464
465
466
467
468
469
470
  			return nowTs - lastTs
  		else
  			return 0
  		end
  	end
  	return 0
  end
  
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
471
472
  -- 获取活动卡池id
  function Activity:getActivityPool(mainType, subType)
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
473
474
475
  	local open, actId = self:isOpen(Activity.ActivityType.SsrUpPoolChange)
  	if not open then
  	--if not self:isOpen(Activity.ActivityType.SsrUpPoolChange) then	
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
476
477
  		return 0
  	end
accf94c4   liuzujun   活动以类型标识,修改双倍活动bug
478
  	local actData = csvdb["activity_ctrlCsv"][actId]
93f6e69b   liuzujun   拾荒选择时间,抽卡增加sr保底
479
480
481
482
483
484
485
486
487
488
489
490
  	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   付费签到,应用市场反馈
491
492
  -- 付费签到可领奖励
  function Activity:getPaySignReward()
7754304d   zhouhaihai   bug
493
  	local actGoodsFlag = self.owner.storeData:getProperty("actGoodsFlag")
51d9d20b   liuzujun   付费签到,应用市场反馈
494
495
496
497
498
499
500
501
  	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   付费签到,抽卡阶段奖励,探索指令
502
  	local curData = self:getActData("PaySignIn")
51d9d20b   liuzujun   付费签到,应用市场反馈
503
  	local reward, change = {}
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
504
  	for day, csvData in pairs(csvdb["pay_signInCsv"]) do
51d9d20b   liuzujun   付费签到,应用市场反馈
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
  		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
  
e51ff6d2   zhouhaihai   冒险~
532
  
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
533
  return Activity