Blame view

src/models/Daily.lua 12.1 KB
be9c9ca6   zhouahaihai   角色评论
1
2
  -- 日常数据
  
fa992c94   liuzujun   添加daily,diner,act...
3
  local Daily = class("Daily", require("shared.ModelBaseMysql"))
be9c9ca6   zhouahaihai   角色评论
4
  
a85b344f   zhangqijia   feat: 挂机图鉴
5
6
  oneDay = 60*60*24
  
be9c9ca6   zhouahaihai   角色评论
7
  function Daily:ctor(properties)
a43410e1   zhengshouren   整理格式,使用tab替代空格
8
  	Daily.super.ctor(self, properties)
be9c9ca6   zhouahaihai   角色评论
9
10
11
  end
  
  Daily.schema = {
fa992c94   liuzujun   添加daily,diner,act...
12
13
  	id 				= {"number", 0, "pri"},		-- 角色id
  	commentHero		= {"string", "", "blob"},		-- 单日评论食灵记录 type=1
87cc3a35   zhengshouren   餐厅建筑升级逻辑
14
15
  	hangQC			= {"number", 0},		-- 挂机快速次数
  	dinerQC			= {"number", 0},		-- 贩卖加速次数
e38b9c49   zhouhaihai   无尽次数
16
  	advElC			= {"number", 0},		-- 无尽次数(消耗体力)
09be9059   zhouhaihai   冒险接口
17
  	advBC			= {"number", 0},		-- 冒险次数购买次数(冒险体力购买次数)
e38b9c49   zhouhaihai   无尽次数
18
  	advElBC			= {"number", 0},		-- 无尽次数购买次数(冒险体力购买次数)
f60b89b1   zhouhaihai   奖励副本
19
  	advWs			= {"table", {}}, 		-- 冒险队工坊
c384626d   zhouhaihai   好友
20
21
22
  	bonusC			= {"table", {}}, 		-- 奖励副本 次数 {[type] = {c = 0, b = 0}}
  	giveFP			= {"table", {}},		-- 给谁送过心心
  	getFP			= {"table", {}},		-- 领过谁的心心
4cf74232   zhouhaihai   pvp
23
  	pvpFree			= {"number", 0},		-- pvp使用免费次数
8641a577   zhangqijia   fix: 增加竞技场门票次数的字段
24
25
  	pvpFreeH		= {"number", 0},		-- 高级pvp使用免费次
  	pvpBought		= {"number", 0},		-- 门票购买次数
cccc9c70   zhouhaihai   商城
26
27
28
  
  	dailySDC		= {"table", {}},		-- daily shop diamond  count {[id] = count} -- 每日商城购买次数统计
  	dailySDD		= {"table", {}},		-- daily shop diamond  disount {[id] = 1} -- 每日商城折扣统计
9ced5432   zhouhaihai   冒险支援效果 保底事件
29
  
d51114bd   wangyujie   完成需求:每日金币购买
30
31
  	advSupRe		= {"number", 0}, 		-- 冒险支援效果刷新次数
  	goldBuyT		= {"number", 0}, 		-- 金币购买次数
317a46a9   liuzujun   添加特权卡
32
  
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
33
34
  	unlockPool		= {"table", {}},		-- 解锁的属性卡池
  	curPool 		= {"number", 0},		-- 属性卡池当前索引
7113ad0c   liuzujun   每日抽卡次数触发礼包
35
  	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
a85b344f   zhangqijia   feat: 挂机图鉴
36
  
f0de8a60   zhangqijia   挖宝跨天,前一天天正在挖的宝被刷掉...
37
  	treasureBase	= {"number", 0}, 		-- 资源值
a85b344f   zhangqijia   feat: 挂机图鉴
38
  	treasureList 	= {"table", {}}, 		--挂机图鉴
be9c9ca6   zhouahaihai   角色评论
39
40
  }
  
be9c9ca6   zhouahaihai   角色评论
41
  function Daily:updateProperty(params)
a43410e1   zhengshouren   整理格式,使用tab替代空格
42
43
44
  	local type, default = table.unpack(self.schema[params.field])
  
  	if params.delta then
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
45
  		self:incrProperty(params.field, params.delta)
440aa055   zhouhaihai   聊天
46
47
48
  		if not params.notNotify then
  			self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
  		end
a43410e1   zhengshouren   整理格式,使用tab替代空格
49
50
51
52
  		return true
  	end
  	if params.value then
  		self:setProperty(params.field, params.value)
440aa055   zhouhaihai   聊天
53
54
55
  		if not params.notNotify then
  			self.owner:notifyUpdateProperty(params.field, self:getProperty(params.field))
  		end
a43410e1   zhengshouren   整理格式,使用tab替代空格
56
57
58
  		return true
  	end
  	return false
be9c9ca6   zhouahaihai   角色评论
59
60
61
  end
  
  function Daily:refreshDailyData(notify)
c384626d   zhouhaihai   好友
62
  	redisproxy:del(FRIEND_POINT:format(self.owner:getProperty("id")))
cccc9c70   zhouhaihai   商城
63
  	local dataMap = {}
a43410e1   zhengshouren   整理格式,使用tab替代空格
64
  	for field, schema in pairs(self.schema) do
fc316d1f   zhouhaihai   冒险体力优化
65
  		if field == "advElC" then
6f3959ce   zhouhaihai   bug
66
  			if self:getProperty(field) > 0 then
0e3ab88d   zhouhaihai   中继层
67
68
  				dataMap[field] = 0
  			end
7104ee66   liuzujun   重复过新手bug, daily错误...
69
70
  		elseif field == "id" then
              -- skip
63c0245e   zhangqijia   fix: 跨天资源值未重置的bug
71
  		elseif field == "treasureBase" then
cea66efd   zhangqijia   fix: 等级效果的bug,
72
  			dataMap[field] = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
a85b344f   zhangqijia   feat: 挂机图鉴
73
74
  		elseif field == "treasureList" then
  			dataMap[field] = self:getTreasrueList()
8641a577   zhangqijia   fix: 增加竞技场门票次数的字段
75
76
  		elseif field == "pvpBought" then
  			dataMap[field] = 0
0e3ab88d   zhouhaihai   中继层
77
  		elseif field ~= "key" then
a43410e1   zhengshouren   整理格式,使用tab替代空格
78
  			local typ, def = table.unpack(schema)
cccc9c70   zhouhaihai   商城
79
80
81
82
83
84
  			dataMap[field] = def
  		end
  	end
  	-- 每日折扣搞一下
  	local dailySDD = {}
  	local sddPool = {}
c5825110   saicom   新增用户商城相关数据
85
86
  	for id, data in pairs(csvdb["shop_normalCsv"]) do
  		if data.shop == 1 and data.disount ~= 0 then
cccc9c70   zhouhaihai   商城
87
  			table.insert(sddPool, id)
a43410e1   zhengshouren   整理格式,使用tab替代空格
88
89
  		end
  	end
cccc9c70   zhouhaihai   商城
90
91
92
93
94
95
96
  	for i = 1, math.min(#sddPool, globalCsv.shop_diamond_disount_count) do
  		local idx = math.randomInt(1, #sddPool)
  		dailySDD[sddPool[idx]] = 1
  		table.remove(sddPool, idx)
  	end
  	dataMap["dailySDD"] = dailySDD
  	self:setProperties(dataMap)
a43410e1   zhengshouren   整理格式,使用tab替代空格
97
98
99
  	if notify then
  		self.owner:notifyUpdateProperties(self:data())
  	end
be9c9ca6   zhouahaihai   角色评论
100
101
  end
  
a85b344f   zhangqijia   feat: 挂机图鉴
102
103
104
105
106
107
  --解锁
  function Daily:checkUnlock(treaval)
  	local role = self.owner
  	local treasureC = treaval.unlock:toArray(true, "=")
  	local show = false
  	if treasureC[1] == 1 then --通关关卡
4d684a8b   zhangqijia   fix: 宝藏图鉴-优化 检查拾荒...
108
  		show = self.owner:checkHangPass(treasureC[2])
a85b344f   zhangqijia   feat: 挂机图鉴
109
  	elseif treasureC[1] == 2 then --通关拾荒章节=x层
4d684a8b   zhangqijia   fix: 宝藏图鉴-优化 检查拾荒...
110
  		show = role:checkAdvChapterPass(treasureC[2])
a85b344f   zhangqijia   feat: 挂机图鉴
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
  	elseif treasureC[1] == 3 then --拥有指定id的角色时
  		local hero = role:getHeroByID(treasureC[2])
  		if hero then show = true end
  	else
  		show = true
      end
  	return show
  end
  
  --CD
  function Daily:checkTreasureExpired(treasureAttr, treasureList)
  	local curInfo = treasureList[treasureAttr.id]
  	if curInfo then
  		-- check finish
  		if curInfo["expire_time"] then
  			if curInfo.cool_time > 1 then
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
127
  				if skynet.timex() >= curInfo["expire_time"] then
a85b344f   zhangqijia   feat: 挂机图鉴
128
  					treasureList[treasureAttr.id] = nil
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
129
130
  					curInfo = clone(treasureAttr)
  				elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
a85b344f   zhangqijia   feat: 挂机图鉴
131
  					curInfo = nil
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
132
133
  				else
  					curInfo = clone(treasureAttr)
a85b344f   zhangqijia   feat: 挂机图鉴
134
135
  				end
  			else
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
136
  				if skynet.timex() >= curInfo["expire_time"] then
a85b344f   zhangqijia   feat: 挂机图鉴
137
138
  					treasureList[treasureAttr.id] = nil
  				end
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
139
  				curInfo = clone(treasureAttr)
a85b344f   zhangqijia   feat: 挂机图鉴
140
  			end
a85b344f   zhangqijia   feat: 挂机图鉴
141
142
143
144
145
146
147
148
149
150
151
  		end
  	else
  		curInfo = clone(treasureAttr)
  	end
  
  	return curInfo
  end
  
  --资源
  function Daily:checkTreasureBase(treasureList, treasureBase, removeId)
  	local tmptreasure = {}
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
152
  	local num = 0
a85b344f   zhangqijia   feat: 挂机图鉴
153
154
  	for k, val in pairs(treasureList) do
  		if removeId and val.id == removeId then
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
155
  			treasureList[k] = nil
a85b344f   zhangqijia   feat: 挂机图鉴
156
157
158
159
  		else
  			if treasureBase >= val.treasure_value then
  				treasureBase = treasureBase - val.treasure_value
  				tmptreasure[val.id] = val
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
160
  				num = num + 1
a85b344f   zhangqijia   feat: 挂机图鉴
161
162
  			end
  		end
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
163
  
a85b344f   zhangqijia   feat: 挂机图鉴
164
  	end
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
165
  	return tmptreasure, num
a85b344f   zhangqijia   feat: 挂机图鉴
166
167
  end
  
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
168
169
170
171
172
  --绑定通关关卡
  function Daily:checkChapters()
  	local  chapters = {}
  	local tmp_chapters = {}
  	local treasureList = self:getProperty("treasureList")
041ee0b2   zhangqijia   fix: 挂机图鉴的bug
173
174
175
176
  	if next(treasureList) then
  		for _, curInfo in pairs(treasureList) do
  			if curInfo["expire_time"] or not curInfo["end_time"] then
  				tmp_chapters[curInfo.chapter_id] = curInfo
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
177
178
179
  			end
  		end
  	end
041ee0b2   zhangqijia   fix: 挂机图鉴的bug
180
  	local hangInfo = self.owner:getProperty("hangInfo") or {}
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
181
  	for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
041ee0b2   zhangqijia   fix: 挂机图鉴的bug
182
183
184
185
186
  		if chapter_id ~= hangInfo.carbonId then
  			if self.owner:checkHangPass(chapter_id) then
  				if next(tmp_chapters) and not tmp_chapters[chapter_id] then
  					chapters[chapter_id] = val
  				else
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
187
188
189
190
  					chapters[chapter_id] = val
  				end
  			end
  		end
041ee0b2   zhangqijia   fix: 挂机图鉴的bug
191
  
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
192
193
194
195
  	end
  	return chapters
  end
  
a85b344f   zhangqijia   feat: 挂机图鉴
196
197
198
  --权重
  function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
  	local removeId
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
199
  	local chapters = self:checkChapters()
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
200
  	local treasure
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
201
202
  	if next(chapters) == nil then return end
  
92b6691c   zhangqijia   fix: 部分账号在加速探索后无法...
203
204
205
206
207
208
209
      --扣除在挖宝列表里未过期宝藏的资源值
  	for _, val in pairs(treasureList) do
  		if not val["expire_time"] then
  			treasureBase = treasureBase - val["treasure_value"]
  		end
  	end
  
a85b344f   zhangqijia   feat: 挂机图鉴
210
  	while next(tmptreasure) do
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
211
212
213
  		local tmp, num = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
  
  		if num == 0 then
a85b344f   zhangqijia   feat: 挂机图鉴
214
  			break
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
215
216
217
218
219
220
221
222
223
224
  		elseif num == 1 then
  			for _, val in pairs(tmp) do
  				treasure = val
  			end
  		else
  			local id = math.randWeight(tmp, "weight") --宝藏id
  			if not id then
  				break
  			end
  			treasure = tmp[id]
a85b344f   zhangqijia   feat: 挂机图鉴
225
  		end
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
226
  	
a85b344f   zhangqijia   feat: 挂机图鉴
227
228
229
230
231
232
  		if treasureBase >= treasure.treasure_value  then
  			--扣除资源值
  			treasureBase =  treasureBase - treasure.treasure_value
  		else
  			break
  		end
e639a6b9   zhangqijia   fix: 挂机图鉴-绑定关卡
233
  		local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
a85b344f   zhangqijia   feat: 挂机图鉴
234
235
236
237
238
  		if not chapterId then
  			break
  		end
  
  		treasure.chapter_id = chapterId
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
239
240
  		treasureList[treasure.id] = treasure
  		removeId = treasure.id
a85b344f   zhangqijia   feat: 挂机图鉴
241
242
243
244
245
246
247
248
  	end
  end
  
  --chapterId
  function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
  	local treasure = nil
  
  	if not curInfo then
a85b344f   zhangqijia   feat: 挂机图鉴
249
250
  		return treasure
  	end
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
251
  	local treasureBase = self:getProperty("treasureBase")
a85b344f   zhangqijia   feat: 挂机图鉴
252
  
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
253
254
255
256
257
  	--开始挖宝关卡ID=挂机关卡ID
  	if chapterId == curInfo.chapter_id then
  		--开始挖宝
  		if not curInfo["end_time"] then
  			curInfo["end_time"] = skynet.timex() + curInfo.working_time
a85b344f   zhangqijia   feat: 挂机图鉴
258
  		else
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
259
260
261
262
  			if skynet.timex() >= curInfo["end_time"] then
  				if curInfo.cool_time > 1 then
  					--宝藏冷却时间
  					if not curInfo["expire_time"] then
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
263
264
265
266
267
268
  						if treasureBase >= curInfo["treasure_value"] then
  							treasureBase = treasureBase - curInfo["treasure_value"]
  
  							treasure = treasureList[curInfo.id]
  							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
  						end
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
269
  					else
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
270
271
272
273
  						--已经领取宝藏 检索宝藏冷却时间
  						if skynet.timex() >= curInfo["expire_time"] then
  							treasureList[curInfo.id] = nil
  						end
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
274
  					end
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
275
  				else
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
276
277
278
279
280
281
  					if treasureBase >= curInfo["treasure_value"] then
  						treasureBase = treasureBase - curInfo["treasure_value"]
  
  						treasure = treasureList[curInfo.id]
  						treasureList[curInfo.id] = nil
  					end
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
282
  				end
a85b344f   zhangqijia   feat: 挂机图鉴
283
284
285
  			end
  		end
  	else
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
286
287
  		--已经开始挖宝
  		if curInfo["end_time"] then
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
288
289
290
291
  			if skynet.timex() >= curInfo["end_time"] then
  				if curInfo.cool_time > 1 then
  					--宝藏冷却时间
  					if not curInfo["expire_time"] then
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
292
293
294
295
296
297
298
  						if treasureBase >= curInfo["treasure_value"] then
  							treasureBase = treasureBase - curInfo["treasure_value"]
  
  							treasure = treasureList[curInfo.id]
  							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
  						end
  						
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
299
  					else
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
300
301
302
303
  						--已经领取宝藏 检索宝藏冷却时间
  						if skynet.timex() >= curInfo["expire_time"] then
  							treasureList[curInfo.id] = nil
  						end
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
304
305
  					end
  				else
e03f9e59   zhangqijia   fix: 修复挂机得到双倍宝藏奖励...
306
307
308
309
310
311
  					if treasureBase >= curInfo["treasure_value"] then
  						treasureBase = treasureBase - curInfo["treasure_value"]
  
  						treasure = treasureList[curInfo.id]
  						treasureList[curInfo.id] = nil
  					end
1199daf9   zhangqijia   fix: 挂机图鉴, 增加宝藏CD检查
312
  				end
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
313
314
  			else
  				curInfo["end_time"]	= nil
a85b344f   zhangqijia   feat: 挂机图鉴
315
316
317
318
319
320
321
322
  			end
  		end
  	end
  	return treasure
  end
  
  function Daily:buyTreasure(treasureList)
  	local boughtTreasurer = {}
f0de8a60   zhangqijia   挖宝跨天,前一天天正在挖的宝被刷掉...
323
  	local treasureBase = self:getProperty("treasureBase")
a85b344f   zhangqijia   feat: 挂机图鉴
324
  	for id, val in pairs(treasureList) do
bfa42833   zhangqijia   feat: 分解铭文返还强化所需铭...
325
  		if treasureBase >= val.treasure_value then
a85b344f   zhangqijia   feat: 挂机图鉴
326
  			boughtTreasurer[id] = val
bfa42833   zhangqijia   feat: 分解铭文返还强化所需铭...
327
  			treasureBase = treasureBase - val.treasure_value
a85b344f   zhangqijia   feat: 挂机图鉴
328
329
  		end
  	end
f0de8a60   zhangqijia   挖宝跨天,前一天天正在挖的宝被刷掉...
330
  	self:updateProperty({field = "treasureBase", value = treasureBase})
a85b344f   zhangqijia   feat: 挂机图鉴
331
332
333
334
335
336
337
338
339
340
  	return boughtTreasurer
  end
  
  --重置宝藏图鉴
  function Daily:resetTreasureList()
  	self:updateProperty({field = "treasureList", value = {}})
  end
  
  --宝藏图鉴
  function Daily:getTreasrueList()
a85b344f   zhangqijia   feat: 挂机图鉴
341
  	local tmpcsv = csvdb["idle_treasureCsv"]
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
342
  	local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
a85b344f   zhangqijia   feat: 挂机图鉴
343
  	local tmptreasure = {}
92b6691c   zhangqijia   fix: 部分账号在加速探索后无法...
344
  	local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
a85b344f   zhangqijia   feat: 挂机图鉴
345
346
347
348
349
350
351
352
353
354
355
356
  	for id, val in pairs(tmpcsv) do
  		if self:checkUnlock(val) == true then
  			local treasure = self:checkTreasureExpired(val, treasureList)
  			if treasure then
  				table.insert(tmptreasure, treasure)
  			end
  		end
  	end
  	table.sort(tmptreasure, function (a,b) return a.treasure_value > b.treasure_value end)
  
  	self:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
  	self:updateProperty({field = "treasureList", value = treasureList})
f0de8a60   zhangqijia   挖宝跨天,前一天天正在挖的宝被刷掉...
357
  	self:updateProperty({field = "treasureBase", value = treasureBase})
a85b344f   zhangqijia   feat: 挂机图鉴
358
359
360
361
362
363
  	return treasureList
  end
  
  
  --检索挖宝列表
  function Daily:checkTreasureList(chapterId)
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
364
  	local treasureList = self:getProperty("treasureList") or {}
a85b344f   zhangqijia   feat: 挂机图鉴
365
366
367
368
369
370
371
372
373
  	local tmptreasure = {}
  	for id, val in pairs(treasureList) do
  		local treasure = self:checkTreasureChapterId(val, treasureList, chapterId)
  		if treasure ~= nil then
  			tmptreasure[id] = treasure
  		end
  	end
  
  	if next(tmptreasure) == nil then
251d8e5e   zhangqijia   fix: 挂机宝鉴,宝藏CD的bug
374
  		self:updateProperty({field = "treasureList", value = treasureList})
a85b344f   zhangqijia   feat: 挂机图鉴
375
376
377
378
379
380
381
  		return nil
  	end
  	local boughtTreasurer = self:buyTreasure(tmptreasure)
  	self:updateProperty({field = "treasureList", value = treasureList})
  	return boughtTreasurer
  end
  
c0c49098   zhangqijia   feat: 竞技场门票购买限制;挂...
382
383
384
385
386
387
388
389
390
391
392
393
394
395
  --宝藏加速
  function Daily:quickTreasureList(chapterId, time)
  	local treasureList = self:getProperty("treasureList") or {}
  	if next(treasureList) then
  		for id, val in pairs(treasureList) do
  			if val["end_time"] and val["chapter_id"] and chapterId == val["chapter_id"] then
  				val["end_time"] = val["end_time"] - time
  			end
  		end
  	end
  	self:updateProperty({field = "treasureList", value = treasureList})
  	return self:checkTreasureList(chapterId)
  end
  
be9c9ca6   zhouahaihai   角色评论
396
  function Daily:data()
a43410e1   zhengshouren   整理格式,使用tab替代空格
397
  	return {
a43410e1   zhengshouren   整理格式,使用tab替代空格
398
  		hangQC = self:getProperty("hangQC"),
87cc3a35   zhengshouren   餐厅建筑升级逻辑
399
  		dinerQC = self:getProperty("dinerQC"),
09be9059   zhouhaihai   冒险接口
400
  		advBC = self:getProperty("advBC"),
e38b9c49   zhouhaihai   无尽次数
401
402
  		advElC = self:getProperty("advElC"),
  		advElBC = self:getProperty("advElBC"),
bab30666   zhouhaihai   增加通用功能等级 字段
403
  		advWs = self:getProperty("advWs"),
f60b89b1   zhouhaihai   奖励副本
404
  		bonusC = self:getProperty("bonusC"),
c384626d   zhouhaihai   好友
405
406
  		giveFP = self:getProperty("giveFP"),
  		getFP = self:getProperty("getFP"),
4cf74232   zhouhaihai   pvp
407
  		pvpFree = self:getProperty("pvpFree"),
4c5d72ab   zhouhaihai   高级pvp
408
  		pvpFreeH = self:getProperty("pvpFreeH"),
8641a577   zhangqijia   fix: 增加竞技场门票次数的字段
409
  		pvpBought = self:getProperty("pvpBought"),
cccc9c70   zhouhaihai   商城
410
411
  		dailySDC = self:getProperty("dailySDC"),
  		dailySDD = self:getProperty("dailySDD"),
9ced5432   zhouhaihai   冒险支援效果 保底事件
412
  		advSupRe = self:getProperty("advSupRe"),
d51114bd   wangyujie   完成需求:每日金币购买
413
  		goldBuyT = self:getProperty("goldBuyT"),
1a0b3c56   liuzujun   抽卡保底,切换定向卡池
414
415
  		unlockPool = self:getProperty("unlockPool"),
  		curPool = self:getProperty("curPool"),
63c0245e   zhangqijia   fix: 跨天资源值未重置的bug
416
  		treasureBase = self:getProperty("treasureBase"),
a85b344f   zhangqijia   feat: 挂机图鉴
417
  		treasureList = self:getProperty("treasureList"),
a43410e1   zhengshouren   整理格式,使用tab替代空格
418
  	}
be9c9ca6   zhouahaihai   角色评论
419
420
421
  end
  
  return Daily