| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 1
2
3
4
5
6 |   
  
  local RolePlugin = {}
  
  function RolePlugin.bind(Role)
  
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 7 |   	function Role:loadAll()
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 8 |   		self:loadDaily()
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 9
10 |   		self:loadEquips()
  		self:loadRunes()
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 11 |   		self:loadHeros()
 | 
| 87cc3a35  zhengshouren
 
餐厅建筑升级逻辑 | 12 |   		self:loadDiner()
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 13
14
15 |   	end
  
  	function Role:reloadWhenLogin()
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 16
17 |   	end
  
 | 
| c384626d  zhouhaihai
 
好友 | 18
19
20
21 |   	function Role:SendPacket(...)
  		SendPacket(...)
  	end
  
 | 
| 5b28342d  zhouahaihai
 
离线方法 | 22 |   	function Role:onOfflineEvent()
 | 
| c384626d  zhouhaihai
 
好友 | 23
24 |   		-- 设置最新的登录时间
  		self:setProperty("ltime", skynet.timex())
 | 
| 5b28342d  zhouahaihai
 
离线方法 | 25 |   	end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 26 |   
 | 
| 312b9db5  zhouahaihai
 
背包 | 27
28
29
30
31
32
33
34 |   	local function checkItemCount(self, itemId, count)
  		local itemData = csvdb["itemCsv"][itemId]
  		-- 种类 类型数量限制
  		local page = globalCsv.store_type[itemData.type]
  		local limit = self:getProperty("bagLimit")[page]
  		if limit and self:getItemCount(itemId) == 0 then
  			local curCount = 0
  			local items = self:getProperty("items"):toNumMap()
 | 
| 9407543b  zhouhaihai
 
限定错误 | 35
36 |   			for id ,_ in pairs(items) do
  				local tempData = csvdb["itemCsv"][id]
 | 
| 514590c2  zhouhaihai
 
容错 | 37
38
39
40
41
42
43 |   				if tempData then
  					if globalCsv.store_type[tempData.type] == page then
  						curCount = curCount + 1
  						if curCount >= limit then
  							count = 0
  							break
  						end
 | 
| 312b9db5  zhouahaihai
 
背包 | 44
45
46
47 |   					end
  				end
  			end
  		end
 | 
| 312b9db5  zhouahaihai
 
背包 | 48
49 |   		return count
  	end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 50
51 |   
  	local function _award(self, itemId, count, params)
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 52 |   		local pms = clone(params)
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 53 |   		local itemData = csvdb["itemCsv"][itemId]
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 54
55
56 |   		if not itemData then  -- 加一层保护
  			return 0, {}
  		end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 57
58
59 |   		local curType = itemData.type
  		local change = {} -- 奖励被转化为了其他奖励 id = count
  
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 60
61 |   		local itemIdAward = {
  			[ItemId.PlayerExp] = function()
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 62 |   				self:addPlayExp(count, pms)
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 63
64
65 |   			end,
  		}
  
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 66
67 |   		local itemTypeAward = {
  			[ItemType.Hero] = function()
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 68 |   				pms.type = itemId - ItemStartId.Hero
 | 
| 1a1a6375  gaofengduan
 
fix lua warning | 69 |   				for _= 1, count do
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 70 |   					self:addHero(pms)
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 71
72 |   				end
  			end,
 | 
| 1c24ba6e  gaofengduan
 
fix equip | 73
74
75 |   			[ItemType.EquipBase] = function()
  				local typ = math.floor((itemId-7000)/100)
      			local lv = (itemId-7000)%100
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 76 |   				self:addEquip(typ, lv, count ,pms)
 | 
| 53e8037e  zhouhaihai
 
任务 | 77
78 |   				local equipCsv = (csvdb["equipCsv"][typ] or {})[lv]
  				self:checkTaskEnter("AddEquip", {equipId = itemId, rarity = equipCsv.rarity}, pms.notNotify)
 | 
| 1c24ba6e  gaofengduan
 
fix equip | 79
80 |   			end,
  			[ItemType.Rune] = function()
 | 
| 3847ba2d  zhouhaihai
 
修改 零件 | 81 |   				local typ =  math.floor((itemId-10000)/1000)
 | 
| 1c24ba6e  gaofengduan
 
fix equip | 82 |   				for _= 1, count do
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 83 |   					self:addRune({type = typ,id = itemId, notNotify = pms.notNotify, log = pms.log})
 | 
| 1c24ba6e  gaofengduan
 
fix equip | 84
85 |   				end
  			end,
 | 
| 00115a7a  zhouahaihai
 
奖励发放 | 86
87
88 |   			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
  				count = 0
  			end,
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 89 |   			[ItemType.FuncOpen] = function()
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 90 |   				self:funcOpen(itemId, count, pms)
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 91 |   			end,
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 92 |   		}
 | 
| 312b9db5  zhouahaihai
 
背包 | 93 |   		-- 对数量筛查
 | 
| 1a1a6375  gaofengduan
 
fix lua warning | 94 |   		count = checkItemCount(self, itemId, count)
 | 
| 312b9db5  zhouahaihai
 
背包 | 95 |   		if count ~= 0 then
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 96
97
98 |   			if itemIdAward[itemId] then
  				itemIdAward[itemId]()
  			elseif itemTypeAward[curType] then
 | 
| 312b9db5  zhouahaihai
 
背包 | 99
100 |   				itemTypeAward[curType]()
  			else
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 101
102
103 |   				pms.itemId = itemId
  				pms.count = count
  				self:addItem(pms)
 | 
| 312b9db5  zhouahaihai
 
背包 | 104 |   			end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 105
106
107
108
109
110
111
112 |   		end
  
  		return count, change --  count 刷新实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
  	end
  
  
  	-- 发奖功能入口  award string id=count or {[id] = count}
  	function Role:award(gift, params)
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 113 |   		params = params or {}
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 114 |   		local tgift = {}
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 115 |   		if type(gift) == "string" then
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 116
117
118
119
120
121
122
123
124 |   			for _, one in pairs(gift:toTableArray(true)) do
  				tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
  			end
  		else
  			tgift = gift
  		end
  		local reward, allChange = {}, {}
  
  		for itemId, count in pairs(tgift) do
 | 
| 8c199cec  zhengshouren
 
简化物品奖励接口,设置默认参数 | 125 |   			local count, change = _award(self, itemId, count, params)
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 126
127
128
129
130
131
132 |   			if next(change) then
  				local cr, cc = self:award(change, params) -- 内部转换忽略
  				for _id, _ct in pairs(cr) do
  					reward[_id] = (reward[_id] or 0) + _ct
  				end
  				table.insert(allChange, {form = {[itemId] = count}, to = cr})
  			else
 | 
| 312b9db5  zhouahaihai
 
背包 | 133
134
135 |   				if count > 0 then
  					reward[itemId] = (reward[itemId] or 0) + count
  				end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 136
137
138
139
140
141 |   			end
  		end
  
  		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
  	end
  
 | 
| bd4fb541  zhouhaihai
 
增加物品过期系统 | 142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
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
183
184
185
186
187
188
189
190
191 |   	function Role:awardExpireItem(expireTime, gift, params)
  		if expireTime <= skynet.timex() then
  			return 
  		end
  		local reward = self:award(gift, params)
  		local expireItem = self:getProperty("expireItem")
  		for itemId, _ in pairs(reward) do
  			expireItem[itemId] = expireTime
  		end
  		self:setProperty("expireItem", expireItem)
  	end
  
  	function Role:checkExpireItem(notNotify)
  		local expireItem = self:getProperty("expireItem")
  		local now = skynet.timex()
  		for itemId, expireTime in pairs(expireItem) do
  			if expireTime <= now then
  				expireItem[itemId] = nil
  				local itemCount = self:getItemCount(itemId)
  				if itemCount > 0 then
  					-- 过期物品删掉
  					self:addItem({itemId = itemId, count = -itemCount, log = {desc = "expire"}, notNotify = notNotify}) --过期
  
  					local itemData = csvdb["itemCsv"][itemId]
  					if itemData then
  						if itemData.type == ItemType.Head then
  							-- 检查头像是不是在穿戴
  							if self:getProperty("headId") == itemId then
  								self:changeHead(globalCsv.defaultHead, notNotify)
  
  								local headData = csvdb["player_iconCsv"][itemId]
  								-- pvp 跨服竞技场奖励
  								if headData and headData.path == 2 then
  									redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
  								end
  							end
  						end
  					end
  				end
  			end
  		end
  		self:setProperty("expireItem", expireItem)
  	end
  
  	function Role:changeHead(id, notNotify)
  		self:updateProperty({field = "headId" ,value = id, notNotify = notNotify})
  		self:changeCrossServerPvpSelfInfo("headId")
  		self:log("role_action", {desc = "changeHead", int1 = id})
  	end
  
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 192 |   	function Role:addPlayExp(addExp, params)
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 193
194
195
196 |   		local level = self:getProperty("level")
  		if not csvdb["player_expCsv"][level + 1] then
  			return
  		end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 197 |   
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 198
199
200
201
202
203
204
205
206
207 |   		local exp = self:getProperty("exp")
  		local newExp = exp + addExp
  		while newExp >= csvdb["player_expCsv"][level].exp do
  			if csvdb["player_expCsv"][level + 1] then -- 有下一级
  				newExp = newExp - csvdb["player_expCsv"][level].exp
  				level = level + 1
  			else
  				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
  			end
  		end
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223 |   
  		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] then
  				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
  			end
  
  			log["cint1"] = addExp
  			log["cint2"] = newExp
  			log["cint3"] = level
  
  			self:log("player_exp", log)
  		else
  			print("addPlayExp no log ", debug.traceback())
  		end
  
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 224 |   		self:updateProperties({level = level, exp = newExp})
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 225 |   		self:changeCrossServerPvpSelfInfo("level")
 | 
| 4b7c7c96  zhouahaihai
 
增加 清空 挂机 冒险gm  角色经验 | 226
227 |   	end
  
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 228
229 |   	function Role:addItem(params)
  		params = params or {}
 | 
| 312b9db5  zhouahaihai
 
背包 | 230
231
232
233 |   		if params.itemId ==  ItemId.Diamond then
  			self:gainDiamond(params)
  			return
  		end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 234
235
236
237
238
239
240
241
242 |   		local items = self:getProperty("items")
  		local origin = items:getv(params.itemId, 0)
  		local nums = origin+params.count
  		if nums <= 0 then
  			items = items:delk(params.itemId)
  			nums = 0
  		else
  			items = items:incrv(params.itemId, params.count)
  		end
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259 |   
  		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] then
  				print("addItem error log have cint1 or cint2  ", debug.traceback())
  			end
  			log["cint1"] = params.itemId
  			log["cint2"] = math.abs(params.count)
  			if params.count <= 0 then
  				self:log("out_item", log)
  			else
  				self:log("in_item", log)
  			end
  		else
  			print("addItem no log ", debug.traceback())
  		end
  
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 260
261
262
263
264
265
266
267 |   		self:setProperty("items", items)
  		if not params.notNotify then
  			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.itemId] = nums}))
  		end
  	end
  
  	function Role:checkItemEnough(itemCountT)
  		local less = {}
 | 
| 87cc3a35  zhengshouren
 
餐厅建筑升级逻辑 | 268
269
270 |   		if not next(itemCountT) then
  			return false, less
  		end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 271 |   		for itemId, count in pairs(itemCountT) do
 | 
| 87cc3a35  zhengshouren
 
餐厅建筑升级逻辑 | 272
273
274
275
276
277
278
279 |   			if count <= 0 then
  				-- 判断物品数量值不应该小于等于0
  				less[itemId] = 0
  			else
  				local last = self:getItemCount(itemId) - count
  				if last < 0 then
  					less[itemId] = -last
  				end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 280
281
282
283
284
285 |   			end
  		end
  		return (not next(less)), less -- 是否足够,,缺什么缺多少
  	end
  
  	function Role:costItems(itemCountT, params)
 | 
| 36204e3c  zhengshouren
 
贩卖逻辑 | 286 |   		local pms = clone(params or {})
 | 
| 312b9db5  zhouahaihai
 
背包 | 287 |   		if itemCountT[ItemId.Diamond] then  --优先扣除钻石
 | 
| 312b9db5  zhouahaihai
 
背包 | 288
289
290
291
292
293 |   			pms.count = itemCountT[ItemId.Diamond]
  			if not self:costDiamond(pms) then
  				return
  			end
  			itemCountT[ItemId.Diamond] = nil
  		end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 294 |   		for itemId, count in pairs(itemCountT) do
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 295
296
297
298 |   			pms.itemId = itemId
  			pms.count = - count
  			self:addItem(pms)
  		end
 | 
| 312b9db5  zhouahaihai
 
背包 | 299 |   		return true
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 300
301
302 |   	end
  
  	function Role:getItemCount(itemId)
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 303 |   		if itemId == ItemId.Diamond then
 | 
| 312b9db5  zhouahaihai
 
背包 | 304
305 |   			return self:getAllDiamond()
  		end
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 306
307
308 |   		return self:getProperty("items"):getv(itemId, 0)
  	end
  
 | 
| 312b9db5  zhouahaihai
 
背包 | 309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326 |   	function Role:getAllDiamond()
  		return self:getProperty("diamond") + self:getProperty("reDiamond")
  	end
  
  	function Role:gainDiamond(params)
  		if not params or type(params) ~= "table" then return false end
  		local count = tonum(params.count)
  		if isnan(count) then
  			return false
  		end
  		local origind = self:getProperty("diamond")
  		local originr = self:getProperty("reDiamond")
  		local origin = origind + originr
  		if params.isRecharge then
  			self:incrProperty("reDiamond", count)
  		else
  			self:incrProperty("diamond", count)
  		end
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 327
328
329
330
331
332
333
334
335
336
337
338
339 |   
  		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  			log["cint1"] = origin
  			log["cint2"] = count
  			self:log("in_diamond", log)
  		else
  			print("gainDiamond no log ", debug.traceback())
  		end
  
 | 
| 312b9db5  zhouahaihai
 
背包 | 340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375 |   		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
  	function Role:costDiamond(params)
  		if not params or type(params) ~= "table" then return false end
  		local count = tonum(params.count)
  		if isnan(count) then
  			return false
  		end
  		if count <= 0 then
  			return false
  		end
  		local origind = self:getProperty("diamond")
  		local originr = self:getProperty("reDiamond")
  		local origin = origind + originr
  
  		if origin < 0 then
  			return false
  		end
  		if origin < count then
  			return false
  		end
  		local last = count
  		local costFirst = {"diamond", "reDiamond"}
  		if params.isRecharge then
  			costFirst = {"reDiamond", "diamond"}
  		end
  		last  = math.max(last - self:getProperty(costFirst[1]), 0)
  		if last < count then
  			self:incrProperty(costFirst[1], last - count)
  		end
  		if last > 0 then
  			self:incrProperty(costFirst[2], -last)
  		end
  
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 376
377
378
379
380
381
382
383
384
385
386
387 |   		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  			log["cint1"] = origin
  			log["cint2"] = count
  			self:log("out_diamond", log)
  		else
  			print("costDiamond no log ", debug.traceback())
  		end
  
 | 
| 312b9db5  zhouahaihai
 
背包 | 388
389
390
391 |   		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 392
393 |   	function Role:addHero(params)
  		local roleId = self:getProperty("id")
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 394 |   		local heroType = params.type
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 395 |   		if self:isHaveHero(heroType) then return end
 | 
| 53e8037e  zhouhaihai
 
任务 | 396
397 |   		local unitData = csvdb["unitCsv"][heroType] 
  		if not unitData then return false end
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 398
399
400 |   
  		local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
  		
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 401 |   
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 402
403
404
405
406
407
408 |   		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
  
  		local heroInfo = {
  			key = string.format(R_HERO, roleId, heroId),
  			id 	= heroId,
  			type= heroType,
  		}
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 409 |   
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 410
411
412 |   		local newHero = require("models.Hero").new(heroInfo)
  		newHero:create()
  		newHero.owner = self
 | 
| 8c74292c  zhouahaihai
 
增加item 以及 角色突破 | 413 |   		newHero:saveBattleValue()
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 414 |   		self.heros[heroId] = newHero
 | 
| 53e8037e  zhouhaihai
 
任务 | 415 |   		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job}, params.notNotify)
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 416
417
418
419
420
421 |   		if not params.notNotify then
  			local heroResponse = {}
  			table.insert(heroResponse, newHero:data())
  			local bin = MsgPack.pack(heroResponse)
  			SendPacket(actionCodes.Hero_loadInfos, bin)
  		end
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 422
423
424
425
426
427
428
429
430
431
432 |   		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("addHero error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  			log["cint1"] = heroId
  			log["cint2"] = heroType
  			self:log("in_hero", log)
  		else
  			print("addHero no log ", debug.traceback())
  		end
 | 
| c7ecb87f  zhouhaihai
 
添加 测试账号 方法 | 433 |   		return true, newHero
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 434
435
436
437
438
439 |   	end
  
  	function Role:isHaveHero(heroType)
  		if not csvdb["unitCsv"][heroType] then return false end
  		for _, hero in pairs(self.heros) do
  			if hero:getProperty("type") == heroType then
 | 
| c7ecb87f  zhouhaihai
 
添加 测试账号 方法 | 440 |   				return hero
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 441
442 |   			end
  		end
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 443
444 |   	end
  
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 445
446 |   	function Role:delHero(heroId, params)
  		params = params or {}
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 447
448 |   		local roleId = self:getProperty('id')
  		local hero = self.heros[heroId]
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 449 |   		local heroType = hero:getProperty("type")
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 450
451
452
453
454
455
456 |   		if not hero then return end
  
  		self.heros[heroId] = nil
  		redisproxy:pipelining(function (red)
  			red:del(string.format(R_HERO, roleId, heroId))
  			red:srem(string.format(R_HEROS, roleId), heroId)
  		end)
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 457
458
459
460
461
462
463
464
465
466
467
468
469 |   
  		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("delHero error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  			log["cint1"] = heroId
  			log["cint2"] = heroType
  			self:log("out_hero", log)
  		else
  			print("delHero no log ", debug.traceback())
  		end
  
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 470
471 |   		SendPacket(actionCodes.Hero_loadInfos, MsgPack.pack({{id = heroId, bDel = true}}))
  	end
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 472 |   
 | 
| 0a07bdd9  zhouahaihai
 
角色升级 。gm | 473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489 |   	function Role:loadHeros()
  		local roleId = self:getProperty("id")
  		local heroIds = redisproxy:smembers(string.format(R_HEROS, roleId))
  		local redret = redisproxy:pipelining(function (red)
  			for _, heroId in ipairs(heroIds) do
  				red:hgetall(string.format(R_HERO, roleId, heroId))
  			end
  		end)
  		for index, heroId in ipairs(heroIds) do
  			local hero = require("models.Hero").new({key = string.format(R_HERO, roleId, heroId)})
  			if hero:load(table.array2Table(redret[index])) then
  				hero.owner = self
  				self.heros[tonumber(heroId)] = hero
  			end
  		end
  	end
  
 | 
| be9c9ca6  zhouahaihai
 
角色评论 | 490
491
492
493
494
495
496
497
498
499
500 |   	function Role:loadDaily()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_DAILY, roleId)
  		self.dailyData = require("models.Daily").new({key = dataKey})
  		self.dailyData.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.dailyData:create()
  		else
  			self.dailyData:load()
  		end
  	end
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 501 |   
 | 
| 87cc3a35  zhengshouren
 
餐厅建筑升级逻辑 | 502
503
504
505
506
507
508
509
510
511
512
513 |   	function Role:loadDiner()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_DINER, roleId)
  		self.dinerData = require("models.Diner").new({key = dataKey})
  		self.dinerData.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.dinerData:create()
  		else
  			self.dinerData:load()
  		end
  	end
  
 | 
| 440aa055  zhouhaihai
 
聊天 | 514 |   
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 515 |   	function Role:loadEquips()
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 516 |   		-- 放role 里面了
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 517
518 |   	end
  
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534 |   	function Role:addEquip(equipType, equipLv, count, pms)
  		pms = pms or {}
  		if count ~= count then return end
  		local equipCsv = (csvdb["equipCsv"][equipType] or {})[equipLv]
  		if not equipCsv then return end
  		local equips = self:getProperty("equips")
  		local curTypeEquips = equips[equipType] or {}
  		local curCount = (curTypeEquips[equipLv] or 0) + count
  
  		-- 是否足够上层判断
  		if curCount < 0 then
  			curCount = 0
  			curTypeEquips[equipLv] = nil
  		else
  			curTypeEquips[equipLv] = curCount
  		end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 535 |   
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 536
537
538
539
540
541
542 |   		if next(curTypeEquips) then
  			equips[equipType] = curTypeEquips
  		else
  			equips[equipType] = nil
  		end
  
  		self:setProperty("equips", equips)
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560 |   
  		if pms.log then
  			local log = clone(pms.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("addEquip error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  			log["cint1"] = equipType
  			log["cint2"] = equipLv
  			log["cint3"] = math.abs(count)
  			if count < 0 then
  				self:log("out_equip", log)
  			else
  				self:log("in_equip", log)
  			end
  		else
  			print("addEquip no log ", debug.traceback())
  		end
  
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 561
562 |   		if not pms.notNotify then
  			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 563
564
565
566 |   		end
  	end
  
  	function Role:getEquipCount(typ,lv)
 | 
| 056c01a0  zhouhaihai
 
简化装备 | 567 |   		return (self:getProperty("equips")[typ] or {})[lv] or 0
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 568
569
570 |   	end
  
  	function Role:loadRunes()
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 571 |   		local roleId = self:getProperty("id")
 | 
| ad484303  gaofengduan
 
add rune | 572
573
574
575
576
577
578
579
580
581
582
583 |   		local runeIds = redisproxy:smembers(string.format(R_RUNEIDS, roleId))
  		local redret = redisproxy:pipelining(function (red)
  			for _, runeId in ipairs(runeIds) do
  				red:hgetall(string.format(R_RUNE, roleId, runeId))
  			end
  		end)
  		for index, runeId in ipairs(runeIds) do
  			local rune = require("models.Rune").new({key = string.format(R_RUNE, roleId, runeId)})
  			if rune:load(table.array2Table(redret[index])) then
  				rune.owner = self
  				self.runeBag[tonumber(runeId)] = rune
  			end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 584
585
586 |   		end
  	end
  
 | 
| ad484303  gaofengduan
 
add rune | 587 |   	-- 0 为操作成功
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 588 |   	function Role:addRune(params)
 | 
| ad484303  gaofengduan
 
add rune | 589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611 |   		if params.type and params.id then
  			local set  = csvdb["runeCsv"][params.type]
  			if not set then return 2 end
  			local data = set[params.id]
  			if not data then return 3 end
  
  			local roleId = self:getProperty("id")
  			local runeUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "rune", 1))
  
  			redisproxy:sadd(string.format(R_RUNEIDS, roleId), runeUid)
  
  			local heroInfo = {
  				key = string.format(R_RUNE, roleId, runeUid),
  				uid = runeUid,
  				type = params.type,
  				id = params.id,
  			}
  
  			local newRune = require("models.Rune").new(heroInfo)
  			newRune:create()
  			newRune:generateAttrs()
  			newRune.owner = self
  			self.runeBag[runeUid] = newRune
 | 
| ee999bde  zhouhaihai
 
零件优化 | 612
613
614
615
616 |   			if not params.notNotify then
  				local response = {}
  				table.insert(response, newRune:data())
  				SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  			end
 | 
| 89338c47  zhouhaihai
 
技能目标 | 617 |   			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633 |   
  			if params.log then
  				local log = clone(params.log)
  				if log["cint1"] or log["cint2"] or log["cint3"] then
  					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
  				end
  
  				log["cint1"] = runeUid
  				log["cint2"] = params.type
  				log["cint3"] = params.id
  
  				self:log("in_rune", log)
  			else
  				print("addRune no log ", debug.traceback())
  			end
  
 | 
| c7ecb87f  zhouhaihai
 
添加 测试账号 方法 | 634 |   			return 0, newRune
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 635 |   		else
 | 
| ad484303  gaofengduan
 
add rune | 636 |   			return 1
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 637 |   		end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 638
639 |   	end
  
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 640
641 |   	function Role:delRunes(runeIds, params) -- 批量删除 {id, }
  		params = params or {}
 | 
| 497f9a67  zhouhaihai
 
卖零件 | 642
643 |   		local roleId = self:getProperty('id')
  		local bDel = {}
 | 
| 2445248d  zhouhaihai
 
去掉热门料理 | 644 |   		for _, runeId in pairs(runeIds) do
 | 
| 497f9a67  zhouhaihai
 
卖零件 | 645
646 |   			local rune = self.runeBag[runeId]
  			if rune and rune:getProperty("refer") == 0 then
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662 |   
  				if params.log then
  					local log = clone(params.log)
  					if log["cint1"] or log["cint2"] or log["cint3"] then
  						print("delRunes error log have cint1 or cint2 or cint3 ", debug.traceback())
  					end
  
  					log["cint1"] = runeId
  					log["cint2"] = rune:getProperty("type")
  					log["cint3"] = rune:getProperty("id")
  
  					self:log("out_rune", log)
  				else
  					print("delRunes no log ", debug.traceback())
  				end
  
 | 
| 497f9a67  zhouhaihai
 
卖零件 | 663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680 |   				self.runeBag[runeId] = nil
  				table.insert(bDel, runeId)
  			end
  		end
  
  		redisproxy:pipelining(function (red)
  			for _, runeId in pairs(bDel) do
  				red:del(string.format(R_RUNE, roleId, runeId))
  				red:srem(string.format(R_RUNEIDS, roleId), runeId)
  			end
  		end)
  		local response = {}
  		for _, runeId in pairs(bDel) do
  			table.insert(response, {uid = runeId, bDel = true})
  		end
  		SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  	end
  
 | 
| ee3ac0b5  gaofengduan
 
fix magic | 681
682
683
684
685 |   	function Role:getRuneByType(typ)
  		local runeSet = {}
  		for _,v in pairs(self.runeBag) do
  			if v.type == typ then
  				table.insert(runeSet,v)
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 686 |   			end
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 687 |   		end
 | 
| ee3ac0b5  gaofengduan
 
fix magic | 688 |   		return runeSet
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 689
690 |   	end
  
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 691 |   	function Role:getAdvData()
 | 
| 43cc5f51  gaofengduan
 
调整 equip 数据结构 | 692 |   		if not self.advData then
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 693 |   			self.advData = require("adv.Adv").new(self)
 | 
| 46fac6f1  zhouahaihai
 
酱料 | 694
695
696 |   		end
  		return self.advData
  	end
 | 
| bd15e9bc  zhouhaihai
 
购买剧情 | 697
698
699
700
701
702
703
704
705
706
707
708 |   
  	function Role:getHeroMaxField(field, hType)
  		local max = 0
  		for _, hero in pairs(self.heros) do
  			if not hType or hero:getProperty("type") == hType then
  				if hero:getProperty(field) > max then
  					max = hero:getProperty(field)
  				end
  			end
  		end
  		return max
  	end
 | 
| ece975b6  zhouhaihai
 
属性计算 | 709
710
711 |   
  	function Role:warningHeartTooQuick()
  		-- 加速器检测
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 712
713
714
715 |   		local heartWarning = self:getProperty("heartWarning")
  		heartWarning = heartWarning + 1
  		self:setProperty("heartWarning", heartWarning)
  		if heartWarning == 50 then
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 716 |   			self:setBan(30, 1) --封禁 30天
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 717 |   			self:sendGmMsg("server_accountBanned_inGame_1")
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 718
719
720
721 |   			return
  		end
  		if heartWarning < 50 and heartWarning % 5 == 0 then
  			self:sendGmMsg("server_accountBanned_warning")
 | 
| 3133cb76  zhouhaihai
 
日志 | 722 |   			self:log("role_action",{desc = "heartWarning", int1 = heartWarning})
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 723
724
725
726
727
728
729
730
731
732
733
734 |   		end
  	end
  
  	function Role:setBan(time, banType)
  		time = time or 0
  		banType = banType or 0
  		local now = skynet.timex()
  		if time == 0 then
  			self:setProperty("banTime", 0)
  			self:setProperty("banType", 0)
  			self:setProperty("heartWarning", 0)
  			
 | 
| 3133cb76  zhouhaihai
 
日志 | 735 |   			self:log("role_action", {desc = "ban_rm"})
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 736
737
738 |   		else
  			self:setProperty("banTime", now + 86400 * time)
  			self:setProperty("banType", banType)
 | 
| 3133cb76  zhouhaihai
 
日志 | 739 |   			self:log("role_action", {desc = "ban", int1 = time, int2 = banType})
 | 
| e3c5cc5e  zhouhaihai
 
跨服竞技场over | 740
741
742
743
744 |   		end
  	end
  
  	function Role:sendGmMsg(text, isNotKey)
  		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
 | 
| ece975b6  zhouhaihai
 
属性计算 | 745 |   	end
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 746 |   
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 747 |   	function Role:getHeroActiveRelationData(heros)
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 748
749
750
751 |   		local relations = {} 
  		for _, id in pairs(heros or {}) do
  			local hero = self.heros[id]
  			if hero then
 | 
| ff52882d  zhouhaihai
 
羁绊 | 752
753 |   				local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
  				relations[camp] = (relations[camp] or 0) + 1
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 754
755 |   			end
  		end
 | 
| ff52882d  zhouhaihai
 
羁绊 | 756 |   		local curData = csvdb["unit_relationCsv"][0]
 | 
| 18323af7  zhouhaihai
 
羁绊 bug | 757
758 |   		if not next(relations) then return curData end
  		
 | 
| ff52882d  zhouhaihai
 
羁绊 | 759 |   		for _, data in ipairs(csvdb["unit_relationCsv"]) do
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 760
761
762
763
764
765
766
767
768
769 |   			local had = {}
  			local isDone = true
  			for _, count in pairs(data.relation:toArray(true, "=")) do
  				local find = false
  				for camp, _count in pairs(relations) do
  					if count == _count and not had[camp] then
  						had[camp] = true
  						find = true
  						break
  					end
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 770 |   				end
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 771
772
773 |   				if not find then
  					isDone = false
  					break
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 774
775 |   				end
  			end
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 776
777 |   			if isDone then
  				curData = data
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 778
779
780
781
782
783
784
785 |   			end
  		end
  		return curData
  	end
  
  	function Role:getHeroActiveRelation(heros)
  		local data = self:getHeroActiveRelationData(heros)
  		local result = {}
 | 
| a8f91e83  zhouhaihai
 
羁绊 | 786
787 |   		for attr, value in pairs(data.effect:toNumMap()) do
  			result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
 | 
| a41b9076  zhouhaihai
 
增加羁绊方法 | 788
789
790 |   		end
  		return result
  	end
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 791 |   
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810 |   	function Role:getHerosCamp(heros)
  		local had = {}
  		for _, id in pairs(heros or {}) do
  			local hero = self.heros[id]
  			if hero then
  				local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
  				had[camp] = (had[camp] or 0) + 1
  			end
  		end
  		local curCamp = 0
  		for camp , count in pairs(had) do
  			if count >= 3 then
  				curCamp = camp
  				break
  			end
  		end
  		return curCamp
  	end
  
 | 
| c384626d  zhouhaihai
 
好友 | 811 |   	function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
 | 
| f317b790  zhouhaihai
 
pvp 遗留 | 812 |   		heros = heros or {}
 | 
| c384626d  zhouhaihai
 
好友 | 813 |   		local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
 | 
| b53593b5  zhouhaihai
 
羁绊加成 | 814
815
816
817
818
819
820
821
822 |   		local battleValue = 0
  		for _, id in pairs(heros) do
  			local hero = self.heros[id]
  			if hero then
  				battleValue = battleValue + hero:getBattleValue(activeRelation)
  			end
  		end
  		return battleValue
  	end
 | 
| 09be9059  zhouhaihai
 
冒险接口 | 823
824
825
826
827 |   
  	function Role:getAdvHangLimit()
  		-- todo 
  		return globalCsv.adv_daily_cross_count
  	end
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 828 |   
 | 
| 7828ffd0  zhouhaihai
 
冒险 连续选择点 和 地图因子 | 829
830
831
832
833 |   	function Role:getAdvElLimit()
  		-- todo 
  		return globalCsv.adv_endless_daily_cross_count
  	end
  
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 834
835
836
837
838
839 |   	-- 走 guide_unlock 表的 被动解锁
  	function Role:isFuncUnlock(func)
  		if not func then return true end -- 没有就是解锁了
  		local data = csvdb["guide_unlockCsv"][func]
  		if not data then return true end  -- 没有就是解锁了
  
 | 
| 9bf57456  zhouhaihai
 
bug | 840 |   		local hangPass = self:getProperty("hangPass")
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 841
842
843
844
845
846 |   		if hangPass[data.carbonId] then 
  			return true
  		else
  			return false
  		end 
  	end
 | 
| 7828ffd0  zhouhaihai
 
冒险 连续选择点 和 地图因子 | 847 |   
 | 
| d232676a  zhouhaihai
 
功能解锁  冒险返回 | 848 |   	-- 走 unlock 表的主动解锁
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 849
850
851
852 |   	function Role:isFuncOpen(func)
  		return self:getProperty("funcOpen")[func] == 1
  	end
  
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 853
854 |   	function Role:getFuncLv(func)
  		return self:getProperty("funcLv")[func] or 1
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 855
856 |   	end
  
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 857
858
859
860
861
862
863
864
865 |   	-- 参数有level 则是检查是否可以升级
  	function Role:isArtifactOpen(id, isEndless, level)
  		local isCheckLevel = not not level 
  		level = level or 1
  		local curData = (csvdb["adv_artifactCsv"][id] or {})[level]
  		if not curData then return false end
  
  		if curData.unlock == 1 then -- 获得解锁
  			return self:getProperty("advAFOpen")[id] and true or false
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 866 |   		elseif curData.unlock == 2 then  -- 特殊神器 不可解锁
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 867 |   			return isCheckLevel
 | 
| d3da3368  zhouhaihai
 
冒险地图被动技, buff  神器 | 868 |   		elseif curData.unlock == 3 then
 | 
| ccbafe67  zhouhaihai
 
冒险神器和buff | 869
870
871
872
873 |   			return isEndless
  		end
  		return true
  	end
  
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 874
875
876 |   	function Role:funcOpen(func, count, params)
  		params = params or {}
  		
 | 
| ad88ba14  zhouhaihai
 
工坊 bug | 877 |   		count = count or 1
 | 
| 44c6e479  zhouhaihai
 
增加部分日志 | 878
879
880
881
882
883
884
885
886
887
888
889
890
891
892 |   
  		if params.log then
  			local log = clone(params.log)
  			if log["cint1"] or log["cint2"] or log["cint3"] then
  				print("funcOpen error log have cint1 or cint2 or cint3 ", debug.traceback())
  			end
  
  			log["cint1"] = func
  			log["cint2"] = count
  
  			self:log("func_open", log)
  		else
  			print("funcOpen no log ", debug.traceback())
  		end
  
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 893 |   		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 894 |   			local unlockData = csvdb["unlockCsv"][func]
 | 
| db3c56ad  zhouhaihai
 
冒险相关 | 895 |   			if unlockData.type == 4 then -- 解锁神器
 | 
| f45d3a7b  zhouhaihai
 
adv_unlock | 896
897
898 |   				if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
  					self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
  				end
 | 
| 4b61215f  zhouhaihai
 
语法错误 | 899 |   			elseif TypeIsFunc[unlockData.type] then
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 900 |   				if unlockData.value1 == 0 or unlockData.value1 == 1 then
 | 
| f45d3a7b  zhouhaihai
 
adv_unlock | 901
902
903 |   					if self:getProperty("funcOpen")[unlockData.type] ~= 1 then
  						self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
  					end
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 904
905 |   				else
  					local oldV = self:getFuncLv(unlockData.type)
 | 
| 59835765  zhouhaihai
 
排行榜 | 906 |   					local newLv = math.min(oldV + count, unlockData.value2)
 | 
| f45d3a7b  zhouhaihai
 
adv_unlock | 907
908
909 |   					if oldV ~= newLv then
  						self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
  					end
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 910
911 |   				end
  			else
 | 
| f45d3a7b  zhouhaihai
 
adv_unlock | 912
913
914 |   				if self:getProperty("funcOpen")[func] ~= 1 then
  					self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
  				end
 | 
| bab30666  zhouhaihai
 
增加通用功能等级 字段 | 915 |   			end
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 916
917
918
919 |   		end
  	end
  
  	function Role:advChapterIsOpen(chapterId, layer)
 | 
| 5f44bcc3  zhouhaihai
 
bug | 920 |   		layer = layer or 1
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 921
922
923
924
925
926
927
928
929
930
931
932
933 |   		local exlayer = math.floor((layer - 1)  / 10) * 10 + 1
  
  		if exlayer == 1 then --第一层判断前置
  			local advPass = self:getProperty("advPass")
  			local chapterData = csvdb["adv_chapterCsv"][chapterId]
  			for id, l in pairs(chapterData.prepose:toNumMap()) do
  				if (advPass[id] or 0) < l then return false end -- 前置
  			end
  			return true
  		end
  
  		local unlock = {}
  		for func , data in pairs(csvdb["unlockCsv"]) do
 | 
| 4d943586  zhouhaihai
 
直通 advt gm | 934 |   			if data.type == 1 and chapterId == data.value1 and exlayer == data.value2 then
 | 
| 4faef572  zhouhaihai
 
冒险任务,冒险扫荡, 冒险中继 | 935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950 |   				return self:isFuncOpen(func)
  			end
  		end
  	end
  
  	function Role:advEventOpenStatus()
  		local openStatus = {}
  		for func , data in pairs(csvdb["unlockCsv"]) do
  			if data.type == 5  then
  				openStatus[data.value1] = openStatus[data.value1] or {}
  				openStatus[data.value1][data.value2] = self:isFuncOpen(func)
  			end
  		end
  		return openStatus
  	end
  
 | 
| 8da953a7  zhouhaihai
 
无尽模式 | 951 |   	-- 赛季检查
 | 
| 1b20cfdb  zhouhaihai
 
赛季更新完善 无尽冒险排行榜 | 952
953
954
955 |   	function Role:advEndlessSeasonCheck(notNotify)
  		--  重置一下冒险
  		local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
  		if self:getProperty("advElS") ~= nowSeason then
 | 
| 0e3ab88d  zhouhaihai
 
中继层 | 956
957
958
959 |   			-- 胡博文让注释掉 衰减 从0开始
  			-- local ml = self:getProperty("advElM")
  			-- local nl = math.max(0, ml - (math.floor(ml / 50) + 2) * 10)
  			-- self:setProperty("advElM", math.floor(nl / 10) * 10)
 | 
| 1b20cfdb  zhouhaihai
 
赛季更新完善 无尽冒险排行榜 | 960
961
962
963
964
965
966 |   
  			-- 正在无尽冒险清掉
  			local adv = self:getAdvData()
  			if adv:isRunning() and adv:isEndless() then
  				adv:forceOver()
  			end
  
 | 
| 6dc482bb  zhouhaihai
 
中继层完成, 新增两个冒险物品使用效果 | 967
968
969 |   			-- 路过的中继层重置掉
  			local advRelay = self:getProperty("advRelay")
  			advRelay[-1] = nil
 | 
| 1b20cfdb  zhouhaihai
 
赛季更新完善 无尽冒险排行榜 | 970
971
972 |   			-- 清掉冒险手册
  			self:updateProperties({
  				advEAchiev = {},
 | 
| 0e3ab88d  zhouhaihai
 
中继层 | 973
974 |   				advElM = 0,
  				advElS = nowSeason,
 | 
| 6dc482bb  zhouhaihai
 
中继层完成, 新增两个冒险物品使用效果 | 975 |   				advRelay = advRelay,
 | 
| 1b20cfdb  zhouhaihai
 
赛季更新完善 无尽冒险排行榜 | 976 |   			}, notNotify)
 | 
| e1355da3  zhouhaihai
 
神器 被动 | 977
978
979
980
981
982
983
984
985
986
987 |   
  
  			-- 重新设定冒险章节和冒险结束时间
  			self.advElChapter = tonum(redisproxy:hget("adv_season", "chapter"), globalCsv.adv_endless_default_chapter)
  			self.advOverTime = tonum(redisproxy:hget("adv_season", "overTime"))
  			if not notNotify then
  				SendPacket(actionCodes.Role_updateProperties, MsgPack.pack({
  					advElChapter = self.advElChapter,
  					advOverTime = self.advOverTime,
  				}))
  			end
 | 
| 8da953a7  zhouhaihai
 
无尽模式 | 988
989 |   		end
  	end
 | 
| 59835765  zhouhaihai
 
排行榜 | 990 |   
 | 
| 9ced5432  zhouhaihai
 
冒险支援效果 保底事件 | 991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045 |   	-- 获得激活的冒险效果
  	function Role:getAdvActiveSupportEffect()
  		local effect = {}
  		local advEAchiev = self:getProperty("advEAchiev")
  		for id, status in pairs(advEAchiev[self.advElChapter] or {}) do
  			if status == -1 then
  				local achvData = csvdb["adv_achievementCsv"][id]
  				if achvData.support ~= 0 then
  					effect[achvData.support] = 1
  				end
  			end
  		end
  		return effect
  	end
  
  	--获取冒险支援效果免费刷新次数
  	function Role:getAdvSupportFreeCount()
  		local count = 1  --默认每天有1次
  		local openEffects = self:getAdvActiveSupportEffect()
  		for aId, _ in pairs(openEffects) do
  			local curData = csvdb["adv_supportCsv"][aId]
  			if curData.type == 2 then
  				for _, effect in ipairs(curData.effect:toArray()) do
  					local cur = effect:toArray(true, "=")
  					if cur[1] == 8 then
  						count = count + cur[2]
  					end
  				end
  			end
  		end
  		return count
  	end
  
  	-- 冒险随机新的支援效果 
  	function Role:advRandomSupportEffect(notNotify)
  		local pool = {}
  		local openEffects = self:getAdvActiveSupportEffect()
  		for id, data in pairs(csvdb["adv_supportCsv"]) do
  			if data.type == 0 then
  				if openEffects[id] then
  					table.insert(pool, data)
  				end
  			elseif data.type == 1 then
  				table.insert(pool, data)
  			end
  		end
  
  		local advSup = {}
  		for i = 1, math.min(3, #pool) do
  			local idx = math.randWeight(pool, "showup")
  			table.insert(advSup, pool[idx].id)
  			table.remove(pool, idx)
  		end
  		self:updateProperty({field = "advSup", value = advSup, notNotify = notNotify})
  	end
 | 
| 59835765  zhouhaihai
 
排行榜 | 1046 |   
 | 
| cfd68b3a  zhouhaihai
 
时间重置 新逻辑 | 1047 |   	
 | 
| 59835765  zhouhaihai
 
排行榜 | 1048 |   	function Role:getCurDinerRankKey()
 | 
| bd4fb541  zhouhaihai
 
增加物品过期系统 | 1049 |   		local round = self:getTimeResetRound(TimeReset.DinerRank)
 | 
| 59835765  zhouhaihai
 
排行榜 | 1050 |   		local idx = 1
 | 
| bd4fb541  zhouhaihai
 
增加物品过期系统 | 1051 |   		if round % 2 == 1 then
 | 
| 59835765  zhouhaihai
 
排行榜 | 1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071 |   			idx = 2 
  		end
  		return RANK_DINER[idx]
  	end
  
  	local StdTowerRankTime = toUnixtime("2019010100")
  	function Role:setTowerRank(level)
  		local now = skynet.timex()
  		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
  		local ct = 10000 - ct  -- 越早的排名越靠前
  		local towerTeam = self:getProperty("towerF")
  		local battleV = self:getTeamBattleValue(towerTeam.heros)
  		local score = (level * 10000 + ct) * 10000000 + battleV
  
  		local curInfo = {
  			name = self:getProperty("name"),
  			headId = self:getProperty("headId"),
  			lv = self:getProperty("level"),
  			batteV = battleV,
  			level = level,
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1072 |   			format = self:getTeamHerosInfo(towerTeam.heros),
 | 
| 59835765  zhouhaihai
 
排行榜 | 1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114 |   		}
  		local roleId = self:getProperty("id")
  		redisproxy:pipelining(function (red)
  			red:zadd(RANK_TOWER, score, roleId)	--更新分数
  			red:hset(RANK_TOWER_INFO, roleId,  MsgPack.pack(curInfo))
  		end)
  	end
  
  	function Role:getTowerRank()
  		local list = {}
  		local ids = redisproxy:zrevrange(RANK_TOWER, 0 , 99)
  		local redret = {}
  		if ids and next(ids) then
  			redret = redisproxy:pipelining(function (red)
  				for i = 1, #ids do
  					local roleId = ids[i]
  					table.insert(list, {roleId = tonumber(roleId)})
  					red:hget(RANK_TOWER_INFO, roleId)
  				end
  			end)
  		end
  		for i = 1, #redret do
  			local player = MsgPack.unpack(redret[i])
  			player.format = nil
  			list[i].player = player
  		end
  		local rank = redisproxy:ZREVRANK(RANK_TOWER, self:getProperty("id"))
  		if not rank then
  			rank = -1
  		else
  			rank = rank + 1
  		end
  		return {list = list, rank = rank}
  	end
  
  	function Role:getTowerRankOneInfo(roleId)
  		local data = redisproxy:hget(RANK_TOWER_INFO, roleId)
  		if data then
  			local player = MsgPack.unpack(data)
  			return player.format
  		end
  	end
 | 
| f60b89b1  zhouhaihai
 
奖励副本 | 1115 |   
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1116 |   	function Role:addAdvLvExp(exp)
 | 
| f60b89b1  zhouhaihai
 
奖励副本 | 1117 |   		local advL = self:getProperty("advL")
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130 |   		local level = advL[1]
  		local newExp = (advL[2] or 0) + exp
  
  		if not csvdb["adv_level_fundCsv"][level + 1] then
  			return
  		end
  
  		while newExp >= csvdb["adv_level_fundCsv"][level].exp do
  			if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
  				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
  				level = level + 1
  			else
  				newExp = csvdb["adv_level_fundCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
 | 
| f60b89b1  zhouhaihai
 
奖励副本 | 1131
1132 |   			end
  		end
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1133
1134
1135 |   
  		if level > advL[1] then
  			self:checkTaskEnter("AdvLevel", {level = level})
 | 
| f60b89b1  zhouhaihai
 
奖励副本 | 1136 |   		end
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1137
1138 |   		advL[1] = level
  		advL[2] = newExp
 | 
| f60b89b1  zhouhaihai
 
奖励副本 | 1139
1140 |   		self:updateProperty({field = "advL", value = advL})
  	end
 | 
| c384626d  zhouhaihai
 
好友 | 1141 |   
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155 |   	function Role:getAdvWheelSurfLv(ptype)
  		local level = 1
  		for i = 0, self:getProperty("advL")[1] do
  			local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
  			for _, one in ipairs(effects) do
  				local effect = one:toArray(true, "=")
  				if effect[1] == 2 and ptype == effect[2] then
  					level = effect[3]
  				end
  			end
  		end
  		return level
  	end
  
 | 
| 9f956e88  zhouhaihai
 
资助对积分的影响 | 1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166 |   	function Role:fixAdvScoreChange(score)
  		local change = 0
  		for i = 0, self:getProperty("advL")[1] do
  			local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
  			for _, one in ipairs(effects) do
  				local effect = one:toArray(true, "=")
  				if effect[1] == 3 then
  					change = change + effect[2]
  				end
  			end
  		end
 | 
| bbf64622  zhouhaihai
 
冒险 | 1167 |   		return math.floor(score * (1 + change / 100))
 | 
| 9f956e88  zhouhaihai
 
资助对积分的影响 | 1168
1169 |   	end
  
 | 
| 6b5c9206  zhouhaihai
 
冒险资助升级属性奖励 | 1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184 |   	function Role:getAdvLvAddAttrs()
  		-- 1=冒险队属性;1=点数/百分比=属性枚举=参数;属性枚举(1=生命上限/2=魔法上限/3=攻击/4=防御);点数/百分比(0=点数/1=百分比)
  		local attrs = {}
  		for i = 0, self:getProperty("advL")[1] do
  			local effects = csvdb["adv_level_fundCsv"][i].effect:toArray()
  			for _, one in ipairs(effects) do
  				local effect = one:toArray(true, "=")
  				if effect[1] == 1 then
  					attrs[effect[2]] = (attrs[effect[2]] or 0) + effect[3]
  				end
  			end
  		end
  		return attrs
  	end
  
 | 
| c384626d  zhouhaihai
 
好友 | 1185 |   	function Role:getTeamBattleInfo(team)
 | 
| f603a60f  zhouhaihai
 
支援技实装 | 1186 |   		local teamInfo = {heros = {}, supports = {}}
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1187 |   		local activeRelation = self:getHeroActiveRelation(team.heros)
 | 
| c384626d  zhouhaihai
 
好友 | 1188
1189 |   
  		for slot, id in pairs(team.heros or {}) do
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1190
1191 |   			local info = {}
  			local hero = self.heros[id]
 | 
| c384626d  zhouhaihai
 
好友 | 1192 |   			if not hero then
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1193
1194
1195
1196
1197 |   				print("error heroid " .. id)
  			end
  			local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
  			for k, v in pairs(AttsEnumEx) do
  				info[v] = (attrs[v] or 0)
 | 
| c384626d  zhouhaihai
 
好友 | 1198 |   			end
 | 
| c384626d  zhouhaihai
 
好友 | 1199
1200 |   			info.type = hero:getProperty("type")
  			info.level = hero:getProperty("level")
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1201
1202
1203
1204 |   			info.blockLevel = hero:getSkillLevel(4)
  			info.specialLevel = hero:getSkillLevel(1)
  			teamInfo.heros[slot] = info
  		end
 | 
| f603a60f  zhouhaihai
 
支援技实装 | 1205
1206
1207 |   		for slot, id in pairs(team.supports or {}) do
  			teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
  		end
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219 |   		return teamInfo
  	end
  
  	function Role:getTeamHerosInfo(heroIds)
  		local heros = {}
  		for slot, heroId in pairs(heroIds or {}) do
  			local hero = self.heros[heroId]
  			heros[slot] = {
  				type = hero:getProperty("type"),
  				level = hero:getProperty("level"),
  				wakeL = hero:getProperty("wakeL"),
  			}
 | 
| c384626d  zhouhaihai
 
好友 | 1220
1221
1222
1223 |   		end
  		return heros
  	end
  
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1224 |   	function Role:getTeamBattleValue(heros)
 | 
| 3dbbc9f3  zhouhaihai
 
加上新的任务 | 1225
1226
1227
1228
1229
1230
1231 |   		-- local battleV = 0
  		-- for _, heroId in pairs(heros or {}) do
  		-- 	local hero = self.heros[heroId]
  		-- 	battleV = battleV + hero:getProperty("battleV")
  		-- end
  		-- return battleV
  		return self:getRealBattleValue(heros)
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1232
1233 |   	end
  
 | 
| 4cf74232  zhouhaihai
 
pvp | 1234 |   	-- 不传参数 只修改保存的阵容信息
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1235 |   	function Role:saveHangTeam(team)	
 | 
| 4cf74232  zhouhaihai
 
pvp | 1236 |   		if not team then
 | 
| 3dbbc9f3  zhouhaihai
 
加上新的任务 | 1237 |   			team = self:getProperty("hangTeam")
 | 
| 4cf74232  zhouhaihai
 
pvp | 1238
1239
1240 |   		else
  			self:updateProperty({field = "hangTeam", value = team})
  		end
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1241
1242
1243
1244
1245
1246
1247
1248 |   		self:setProperties({
  			hangTS = self:getTeamHerosInfo(team.heros),
  			hangTB = self:getTeamBattleInfo(team),
  			hangTBV = self:getTeamBattleValue(team.heros),
  		})
  	end
  
  	function Role:savePvpCTeam(team)
 | 
| 4cf74232  zhouhaihai
 
pvp | 1249 |   		if not team then
 | 
| 3dbbc9f3  zhouhaihai
 
加上新的任务 | 1250 |   			team = self:getProperty("pvpTC")
 | 
| 4cf74232  zhouhaihai
 
pvp | 1251 |   		else
 | 
| 3dbbc9f3  zhouhaihai
 
加上新的任务 | 1252 |   			self:updateProperty({field = "pvpTC", value = team})
 | 
| 4cf74232  zhouhaihai
 
pvp | 1253 |   		end
 | 
| fa565e0c  zhouhaihai
 
优化结构 | 1254
1255
1256
1257
1258 |   		self:setProperties({
  			pvpTSC = self:getTeamHerosInfo(team.heros),
  			pvpTBC = self:getTeamBattleInfo(team),
  			pvpTBVC = self:getTeamBattleValue(team.heros),
  		})
 | 
| c384626d  zhouhaihai
 
好友 | 1259 |   	end
 | 
| dc9d814f  zhouhaihai
 
邮件 | 1260 |   
 | 
| ab9f5400  zhouhaihai
 
临时代码 | 1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281 |   	function Role:savePvpHTeam(team)
  		if not team then
  			team = self:getProperty("pvpTH")
  		else
  			self:updateProperty({field = "pvpTH", value = team})
  		end
  
  		local pvpTSH, pvpTBH, pvpTBVH = {}, {}, {}
  		for i = 1, 3 do
  			pvpTSH[i] = self:getTeamHerosInfo(team[i].heros)
  			pvpTBH[i] = self:getTeamBattleInfo(team[i])
  			pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
  		end
  
  		self:setProperties({
  			pvpTSH = pvpTSH,
  			pvpTBH = pvpTBH,
  			pvpTBVH = pvpTBVH,
  		})
  	end
  
 | 
| dc9d814f  zhouhaihai
 
邮件 | 1282
1283 |   	-- update
  	function Role:onRecoverTimer(now)
 | 
| cfd68b3a  zhouhaihai
 
时间重置 新逻辑 | 1284 |   		self:updateTimeReset(now, true)
 | 
| dc9d814f  zhouhaihai
 
邮件 | 1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365 |   		self:checkNewEvent(now)
  	end
  
  	local function breath(sec)
  		local last_breath = 0
  		return function (now)
  			if now >= last_breath then
  				last_breath = now + sec
  				return true
  			end
  			return false
  		end
  	end
  	local breathes = {
  		["email"] = breath(120), -- email
  	}
  	function Role:checkNewEvent(now)
  		if now - self:getProperty("ltime") < 5 then
  			return
  		end
  
  		local checks = {}
  		-- 检查全局邮件 -- 增加邮件红点
  		checks["email"] = function()
  			local mid = self:getProperty("sid")
  			local result = redisproxy:hmget("autoincrement_set", "email", "emailTimestamp")
  			local globalEmail = tonum(result[1])
  			local timestamp = tonum(result[2])
  			local emailSync = self:getProperty("emailSync")
  			if globalEmail > emailSync and timestamp > self:getProperty("ctime") then
  				local emailSync = math.max(emailSync + 1, globalEmail - EMAIL_LIMIT + 1)
  				local redret = redisproxy:pipelining(function (red)
  					for id = emailSync, globalEmail do
  						red:hgetall(string.format("globalEmail:%s", id))		
  					end
  				end)
  				for _, data in ipairs(redret) do
  					local email = tarr2tab(data)
  					if tonum(email.createtime) > self:getProperty("ctime") 
  						and ( not email.mid or tonum(email.mid) == mid ) 
  						and ( not email.endtime or tonum(email.endtime) > now )then
  						return true
  					end
  				end
  			end
  
  			local roleId = self:getProperty("id")
  			local email_rds = string.format(R_EMAIL, roleId)
  
  			local emailIds = redisproxy:lrange(email_rds, 0, EMAIL_LIMIT - 1) or {}
  			local redret = redisproxy:pipelining(function (red)
  				for _, id in ipairs(emailIds) do
  					red:hget(string.format(R_EMAIL_ITEM, roleId, id), "status")
  				end
  			end)
  			for index, id in ipairs(emailIds) do
  				if tonumber(redret[index]) == 0 then
  					return true
  				end
  			end
  		end
  		
  		local events = {}
  		for name, breath in pairs(breathes) do
  			if breath(now) and checks[name] then
  				local status = checks[name]()
  				if status then
  					if status == true then
  						events[name] = 1
  					else
  						events[name] = status
  					end
  				end
  			end
  		end
  
  		if next(events) then
  			SendPacket(actionCodes.Role_notifyNewEvent, MsgPack.pack({events = events}))
  		end
  	end
  
 | 
| bd4fb541  zhouhaihai
 
增加物品过期系统 | 1366
1367
1368
1369
1370
1371
1372
1373
1374 |   	function Role:getAdvRankKey()
  		local round = self:getProperty("advElS")
  		local idx = 1
  		if round % 2 == 1 then
  			idx = 2 
  		end
  		return RANK_ADV[idx]
  	end
  
 | 
| be83d162  zhouahaihai
 
登陆成功。 增加数据结构修正功能 | 1375
1376
1377 |   end
  
  return RolePlugin
 |