Blame view

src/models/RolePlugin.lua 23.1 KB
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
1
2
3
4
5
6
7
8
9
10
11
  
  
  local RolePlugin = {}
  
  function RolePlugin.bind(Role)
  
  	function Role:log()
  
  	end
  
  	function Role:loadAll()
be9c9ca6   zhouahaihai   角色评论
12
  		self:loadDaily()
43cc5f51   gaofengduan   调整 equip 数据结构
13
14
  		self:loadEquips()
  		self:loadRunes()
0a07bdd9   zhouahaihai   角色升级 。gm
15
  		self:loadHeros()
87cc3a35   zhengshouren   餐厅建筑升级逻辑
16
  		self:loadDiner()
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
17
18
19
  	end
  
  	function Role:reloadWhenLogin()
0a07bdd9   zhouahaihai   角色升级 。gm
20
21
  	end
  
c384626d   zhouhaihai   好友
22
23
24
25
  	function Role:SendPacket(...)
  		SendPacket(...)
  	end
  
be9c9ca6   zhouahaihai   角色评论
26
  	function Role:onCrossDay(now, notify)
be9c9ca6   zhouahaihai   角色评论
27
28
29
30
  		local ltime = self:getProperty("ltime")
  
  		if isCrossDay(ltime, now) then
  			local response = {}
0a07bdd9   zhouahaihai   角色升级 。gm
31
  
be9c9ca6   zhouahaihai   角色评论
32
  			self.dailyData:refreshDailyData(notify)
87cc3a35   zhengshouren   餐厅建筑升级逻辑
33
  			self.dinerData:refreshDailyData(notify)
53e8037e   zhouhaihai   任务
34
35
36
37
38
39
40
41
  			self:setProperty("dTask", {})
  			response.dTask = {}
  
  
  			if isCrossWeek(ltime, now) then
  				self:setProperty("wTask", {})
  				response.wTask = {}
  			end
be9c9ca6   zhouahaihai   角色评论
42
43
44
45
  
  			if notify then
  				self:notifyUpdateProperties(response)
  			end
53e8037e   zhouhaihai   任务
46
  
59835765   zhouhaihai   排行榜
47
48
49
50
  			if RESET_TIME == RESET_RANK_TIME then
  				self:onResetRank_raw(ltime, now, notify)
  			end
  			self:setProperty("ltime", now)
53e8037e   zhouhaihai   任务
51
  
be9c9ca6   zhouahaihai   角色评论
52
53
  			return true
  		end
0a07bdd9   zhouahaihai   角色升级 。gm
54
  	end
59835765   zhouhaihai   排行榜
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
  
  	function Role:onResetRank(now, notify)
  		local ltime = self:getProperty("ltime")
  		if isCrossDay(ltime, now, RESET_RANK_TIME) then
  			local response = self:onResetRank_raw(ltime, now, notify)
  			
  			if notify and next(response) then
  				self:notifyUpdateProperties(response)
  			end
  
  			self:setProperty("ltime", now)
  			return true
  		end
  	end
  
  	function Role:onResetRank_raw(ltime, now, notify)
  		local response = {}
  
  		self.dinerData:rankResetData(notify)
  
  		return response
  	end
  
5b28342d   zhouahaihai   离线方法
78
  	function Role:onOfflineEvent()
c384626d   zhouhaihai   好友
79
80
  		-- 设置最新的登录时间
  		self:setProperty("ltime", skynet.timex())
5b28342d   zhouahaihai   离线方法
81
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
82
  
312b9db5   zhouahaihai   背包
83
84
85
86
87
88
89
90
  	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   限定错误
91
92
93
  			for id ,_ in pairs(items) do
  				local tempData = csvdb["itemCsv"][id]
  				if globalCsv.store_type[tempData.type] == page then
312b9db5   zhouahaihai   背包
94
  					curCount = curCount + 1
43cc5f51   gaofengduan   调整 equip 数据结构
95
  					if curCount >= limit then
312b9db5   zhouahaihai   背包
96
97
98
99
100
101
  						count = 0
  						break
  					end
  				end
  			end
  		end
312b9db5   zhouahaihai   背包
102
103
  		return count
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
104
105
  
  	local function _award(self, itemId, count, params)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
106
  		local pms = clone(params)
8c74292c   zhouahaihai   增加item 以及 角色突破
107
  		local itemData = csvdb["itemCsv"][itemId]
056c01a0   zhouhaihai   简化装备
108
109
110
  		if not itemData then  -- 加一层保护
  			return 0, {}
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
111
112
113
  		local curType = itemData.type
  		local change = {} -- 奖励被转化为了其他奖励 id = count
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
114
115
116
117
118
119
  		local itemIdAward = {
  			[ItemId.PlayerExp] = function()
  				self:addPlayExp(count)
  			end,
  		}
  
be9c9ca6   zhouahaihai   角色评论
120
121
  		local itemTypeAward = {
  			[ItemType.Hero] = function()
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
122
  				pms.type = itemId - ItemStartId.Hero
1a1a6375   gaofengduan   fix lua warning
123
  				for _= 1, count do
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
124
  					self:addHero(pms)
be9c9ca6   zhouahaihai   角色评论
125
126
  				end
  			end,
1c24ba6e   gaofengduan   fix equip
127
128
129
  			[ItemType.EquipBase] = function()
  				local typ = math.floor((itemId-7000)/100)
      			local lv = (itemId-7000)%100
056c01a0   zhouhaihai   简化装备
130
  				self:addEquip(typ, lv, count ,pms)
53e8037e   zhouhaihai   任务
131
132
  				local equipCsv = (csvdb["equipCsv"][typ] or {})[lv]
  				self:checkTaskEnter("AddEquip", {equipId = itemId, rarity = equipCsv.rarity}, pms.notNotify)
1c24ba6e   gaofengduan   fix equip
133
134
135
136
  			end,
  			[ItemType.Rune] = function()
  				local typ = math.floor((itemId-2000)/100)
  				for _= 1, count do
53e8037e   zhouhaihai   任务
137
  					self:addRune({type = typ,id = itemId, pms.notNotify})
1c24ba6e   gaofengduan   fix equip
138
139
  				end
  			end,
00115a7a   zhouahaihai   奖励发放
140
141
142
  			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
  				count = 0
  			end,
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
143
  			[ItemType.FuncOpen] = function()
ad88ba14   zhouhaihai   工坊 bug
144
  				self:funcOpen(itemId, count)
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
145
  			end,
be9c9ca6   zhouahaihai   角色评论
146
  		}
312b9db5   zhouahaihai   背包
147
  		-- 对数量筛查
1a1a6375   gaofengduan   fix lua warning
148
  		count = checkItemCount(self, itemId, count)
312b9db5   zhouahaihai   背包
149
  		if count ~= 0 then
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
150
151
152
  			if itemIdAward[itemId] then
  				itemIdAward[itemId]()
  			elseif itemTypeAward[curType] then
312b9db5   zhouahaihai   背包
153
154
  				itemTypeAward[curType]()
  			else
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
155
156
157
  				pms.itemId = itemId
  				pms.count = count
  				self:addItem(pms)
312b9db5   zhouahaihai   背包
158
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
159
160
161
162
163
164
165
166
  		end
  
  		return count, change --  count 刷新实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
  	end
  
  
  	-- 发奖功能入口  award string id=count or {[id] = count}
  	function Role:award(gift, params)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
167
  		params = params or {}
8c74292c   zhouahaihai   增加item 以及 角色突破
168
  		local tgift = {}
46fac6f1   zhouahaihai   酱料
169
  		if type(gift) == "string" then
8c74292c   zhouahaihai   增加item 以及 角色突破
170
171
172
173
174
175
176
177
178
  			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   简化物品奖励接口,设置默认参数
179
  			local count, change = _award(self, itemId, count, params)
8c74292c   zhouahaihai   增加item 以及 角色突破
180
181
182
183
184
185
186
  			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   背包
187
188
189
  				if count > 0 then
  					reward[itemId] = (reward[itemId] or 0) + count
  				end
8c74292c   zhouahaihai   增加item 以及 角色突破
190
191
192
193
194
195
  			end
  		end
  
  		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
  	end
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
196
197
198
199
200
  	function Role:addPlayExp(addExp)
  		local level = self:getProperty("level")
  		if not csvdb["player_expCsv"][level + 1] then
  			return
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
201
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
202
203
204
205
206
207
208
209
210
211
212
213
214
  		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
  		self:updateProperties({level = level, exp = newExp})
  	end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
215
216
  	function Role:addItem(params)
  		params = params or {}
312b9db5   zhouahaihai   背包
217
218
219
220
  		if params.itemId ==  ItemId.Diamond then
  			self:gainDiamond(params)
  			return
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
  		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
  		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   餐厅建筑升级逻辑
238
239
240
  		if not next(itemCountT) then
  			return false, less
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
241
  		for itemId, count in pairs(itemCountT) do
87cc3a35   zhengshouren   餐厅建筑升级逻辑
242
243
244
245
246
247
248
249
  			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 以及 角色突破
250
251
252
253
254
255
  			end
  		end
  		return (not next(less)), less -- 是否足够,,缺什么缺多少
  	end
  
  	function Role:costItems(itemCountT, params)
36204e3c   zhengshouren   贩卖逻辑
256
  		local pms = clone(params or {})
312b9db5   zhouahaihai   背包
257
  		if itemCountT[ItemId.Diamond] then  --优先扣除钻石
312b9db5   zhouahaihai   背包
258
259
260
261
262
263
  			pms.count = itemCountT[ItemId.Diamond]
  			if not self:costDiamond(pms) then
  				return
  			end
  			itemCountT[ItemId.Diamond] = nil
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
264
  		for itemId, count in pairs(itemCountT) do
8c74292c   zhouahaihai   增加item 以及 角色突破
265
266
267
268
  			pms.itemId = itemId
  			pms.count = - count
  			self:addItem(pms)
  		end
312b9db5   zhouahaihai   背包
269
  		return true
8c74292c   zhouahaihai   增加item 以及 角色突破
270
271
272
  	end
  
  	function Role:getItemCount(itemId)
43cc5f51   gaofengduan   调整 equip 数据结构
273
  		if itemId == ItemId.Diamond then
312b9db5   zhouahaihai   背包
274
275
  			return self:getAllDiamond()
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
276
277
278
  		return self:getProperty("items"):getv(itemId, 0)
  	end
  
312b9db5   zhouahaihai   背包
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
  	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
  		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
  
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
0a07bdd9   zhouahaihai   角色升级 。gm
337
338
  	function Role:addHero(params)
  		local roleId = self:getProperty("id")
0a07bdd9   zhouahaihai   角色升级 。gm
339
  		local heroType = params.type
056c01a0   zhouhaihai   简化装备
340
  		if self:isHaveHero(heroType) then return end
53e8037e   zhouhaihai   任务
341
342
  		local unitData = csvdb["unitCsv"][heroType] 
  		if not unitData then return false end
056c01a0   zhouhaihai   简化装备
343
344
345
  
  		local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
  		
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
346
  
0a07bdd9   zhouahaihai   角色升级 。gm
347
348
349
350
351
352
353
  		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
  
  		local heroInfo = {
  			key = string.format(R_HERO, roleId, heroId),
  			id 	= heroId,
  			type= heroType,
  		}
43cc5f51   gaofengduan   调整 equip 数据结构
354
  
0a07bdd9   zhouahaihai   角色升级 。gm
355
356
357
  		local newHero = require("models.Hero").new(heroInfo)
  		newHero:create()
  		newHero.owner = self
8c74292c   zhouahaihai   增加item 以及 角色突破
358
  		newHero:saveBattleValue()
0a07bdd9   zhouahaihai   角色升级 。gm
359
  		self.heros[heroId] = newHero
53e8037e   zhouhaihai   任务
360
  		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job}, params.notNotify)
0a07bdd9   zhouahaihai   角色升级 。gm
361
362
363
364
365
366
  		if not params.notNotify then
  			local heroResponse = {}
  			table.insert(heroResponse, newHero:data())
  			local bin = MsgPack.pack(heroResponse)
  			SendPacket(actionCodes.Hero_loadInfos, bin)
  		end
056c01a0   zhouhaihai   简化装备
367
368
369
370
371
372
373
374
375
376
  		return true
  	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
  				return true
  			end
  		end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
377
378
  	end
  
1a1a6375   gaofengduan   fix lua warning
379
  	function Role:delHero(heroId)
0a07bdd9   zhouahaihai   角色升级 。gm
380
381
382
383
384
385
386
387
388
389
390
  		local roleId = self:getProperty('id')
  		local hero = self.heros[heroId]
  		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)
  		SendPacket(actionCodes.Hero_loadInfos, MsgPack.pack({{id = heroId, bDel = true}}))
  	end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
391
  
0a07bdd9   zhouahaihai   角色升级 。gm
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
  	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   角色评论
409
410
411
412
413
414
415
416
417
418
419
  	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   酱料
420
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
421
422
423
424
425
426
427
428
429
430
431
432
  	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
  
43cc5f51   gaofengduan   调整 equip 数据结构
433
  	function Role:loadEquips()
056c01a0   zhouhaihai   简化装备
434
  		-- 放role 里面了
43cc5f51   gaofengduan   调整 equip 数据结构
435
436
  	end
  
056c01a0   zhouhaihai   简化装备
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
  	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 数据结构
453
  
056c01a0   zhouhaihai   简化装备
454
455
456
457
458
459
460
461
462
  		if next(curTypeEquips) then
  			equips[equipType] = curTypeEquips
  		else
  			equips[equipType] = nil
  		end
  
  		self:setProperty("equips", equips)
  		if not pms.notNotify then
  			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
43cc5f51   gaofengduan   调整 equip 数据结构
463
464
465
466
  		end
  	end
  
  	function Role:getEquipCount(typ,lv)
056c01a0   zhouhaihai   简化装备
467
  		return (self:getProperty("equips")[typ] or {})[lv] or 0
43cc5f51   gaofengduan   调整 equip 数据结构
468
469
470
  	end
  
  	function Role:loadRunes()
43cc5f51   gaofengduan   调整 equip 数据结构
471
  		local roleId = self:getProperty("id")
ad484303   gaofengduan   add rune
472
473
474
475
476
477
478
479
480
481
482
483
  		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 数据结构
484
485
486
  		end
  	end
  
ad484303   gaofengduan   add rune
487
  	-- 0 为操作成功
43cc5f51   gaofengduan   调整 equip 数据结构
488
  	function Role:addRune(params)
ad484303   gaofengduan   add rune
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
  		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   零件优化
512
513
514
515
516
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newRune:data())
  				SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  			end
89338c47   zhouhaihai   技能目标
517
  			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
ad484303   gaofengduan   add rune
518
  			return 0
43cc5f51   gaofengduan   调整 equip 数据结构
519
  		else
ad484303   gaofengduan   add rune
520
  			return 1
43cc5f51   gaofengduan   调整 equip 数据结构
521
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
522
523
  	end
  
497f9a67   zhouhaihai   卖零件
524
525
526
  	function Role:delRunes(runeIds) -- 批量删除 {id, }
  		local roleId = self:getProperty('id')
  		local bDel = {}
2445248d   zhouhaihai   去掉热门料理
527
  		for _, runeId in pairs(runeIds) do
497f9a67   zhouhaihai   卖零件
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
  			local rune = self.runeBag[runeId]
  			if rune and rune:getProperty("refer") == 0 then
  				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
548
549
550
551
552
  	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 数据结构
553
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
554
  		end
ee3ac0b5   gaofengduan   fix magic
555
  		return runeSet
43cc5f51   gaofengduan   调整 equip 数据结构
556
557
  	end
  
46fac6f1   zhouahaihai   酱料
558
  	function Role:getAdvData()
43cc5f51   gaofengduan   调整 equip 数据结构
559
  		if not self.advData then
46fac6f1   zhouahaihai   酱料
560
  			self.advData = require("adv.Adv").new(self)
46fac6f1   zhouahaihai   酱料
561
562
563
  		end
  		return self.advData
  	end
bd15e9bc   zhouhaihai   购买剧情
564
565
566
567
568
569
570
571
572
573
574
575
  
  	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   属性计算
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
  
  	function Role:warningHeartTooQuick()
  		-- 加速器检测
  		-- local heartWarning = self:getProperty("heartWarning")
  		-- heartWarning = heartWarning + 1
  		-- self:setProperty("heartWarning", heartWarning)
  		-- if heartWarning == 50 then
  		-- 	self:setProperty("delete", 1)
  		-- 	self:sendGmMsg("系统检测到你多次使用加速器,已经将你封杀,请联系管理员。")
  		-- 	self:log("gmAction",{desc = "ban"})
  		-- 	return
  		-- end
  		-- if heartWarning < 50 and heartWarning % 5 == 0 then
  		-- 	self:sendGmMsg("警告!系统检测到你使用加速器,请立即停止使用!否则我们将封杀此账号!")
  		-- 	self:log("gmAction",{desc = "heartWarning", count = heartWarning})
  		-- end
  	end
a41b9076   zhouhaihai   增加羁绊方法
593
594
595
596
597
598
599
600
601
602
603
604
  
  	function Role:getHeroActiveRelation(heros)
  		local relations = {} 
  		for _, id in pairs(heros or {}) do
  			local hero = self.heros[id]
  			if hero then
  				local job = csvdb["unitCsv"][hero:getProperty("type")].job
  				relations[job] = (relations[job] or 0) + 1
  			end
  		end
  		if not next(relations) then return {} end
  		local result = {}
912f7d2c   zhouhaihai   bug
605
  		for _, data in pairs(csvdb["unit_relationCsv"]) do
a41b9076   zhouhaihai   增加羁绊方法
606
607
608
609
610
611
612
613
614
615
616
617
618
619
  			local ok = true
  			for typ, count in pairs(data.relation:toNumMap()) do
  				if (relations[typ] or 0) < count then
  					ok = false
  				end
  			end
  			if ok then
  				for attr, value in pairs(data.effect:toNumMap()) do
  					result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
  				end
  			end
  		end
  		return result
  	end
b53593b5   zhouhaihai   羁绊加成
620
  
c384626d   zhouhaihai   好友
621
622
  	function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
  		local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
b53593b5   zhouhaihai   羁绊加成
623
624
625
626
627
628
629
630
631
  		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   冒险接口
632
633
634
635
636
  
  	function Role:getAdvHangLimit()
  		-- todo 
  		return globalCsv.adv_daily_cross_count
  	end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
637
  
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
638
639
640
641
642
643
  	function Role:getAdvElLimit()
  		-- todo 
  		return globalCsv.adv_endless_daily_cross_count
  	end
  
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
644
645
646
647
  	function Role:isFuncOpen(func)
  		return self:getProperty("funcOpen")[func] == 1
  	end
  
bab30666   zhouhaihai   增加通用功能等级 字段
648
649
  	function Role:getFuncLv(func)
  		return self:getProperty("funcLv")[func] or 1
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
650
651
  	end
  
ad88ba14   zhouhaihai   工坊 bug
652
653
  	function Role:funcOpen(func, count)
  		count = count or 1
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
654
  		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
bab30666   zhouhaihai   增加通用功能等级 字段
655
656
657
658
659
660
  			local unlockData = csvdb["unlockCsv"][func]
  			if TypeIsFunc[unlockData.type] then
  				if unlockData.value1 == 0 or unlockData.value1 == 1 then
  					self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
  				else
  					local oldV = self:getFuncLv(unlockData.type)
59835765   zhouhaihai   排行榜
661
662
  					local newLv = math.min(oldV + count, unlockData.value2)
  					self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
bab30666   zhouhaihai   增加通用功能等级 字段
663
664
665
666
  				end
  			else
  				self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
  			end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
667
668
669
670
  		end
  	end
  
  	function Role:advChapterIsOpen(chapterId, layer)
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
671
672
673
674
675
676
677
678
679
680
681
682
683
  		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
684
  			if data.type == 1 and chapterId == data.value1 and exlayer == data.value2 then
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
  				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   无尽模式
701
702
703
704
705
706
707
708
709
  	-- 赛季检查
  	function Role:advEndlessSeasonCheck()
  		if self:getProperty("advElS") ~= globalCsv.adv_endless_season then
  			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)
  			self:setProperty("advElS", globalCsv.adv_endless_season)
  		end
  	end
59835765   zhouhaihai   排行榜
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
  
  	function Role:getTeamBattleValue(heros)
  		local battleV = 0
  		for _, heroId in pairs(heros) do
  			local hero = self.heros[heroId]
  			battleV = battleV + hero:getProperty("battleV")
  		end
  		return battleV
  	end
  
  	function Role:recordRankTeam(heroIds)
  		local heros = {}
  		for slot, heroId in pairs(heroIds) do
  			local hero = self.heros[heroId]
  			heros[slot] = {
  				htype = hero:getProperty("type"),
  				lv = hero:getProperty("level"),
c384626d   zhouhaihai   好友
727
  				wakeL = hero:getProperty("wakeL"),
59835765   zhouhaihai   排行榜
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
  			}
  		end
  		return heros
  	end
  
  	local StdDinerRankTime = toUnixtime("20190101"..string.format("%02x", RESET_RANK_TIME)) --跨天时间
  	function Role:getCurDinerRankKey()
  		local now  = skynet.timex()
  		local idx = 1
  		if math.floor((now - StdDinerRankTime) / 86400) % 2 == 1 then
  			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,
  			format = self:recordRankTeam(towerTeam.heros),
  		}
  		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   奖励副本
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
  
  	function Role:checkAdvLvByAddWin(winCount)
  		winCount = winCount or 1
  		local advL = self:getProperty("advL")
  		local oldL = advL[1]
  		advL[2] = (advL[2] or 0) + winCount
  		for level = ((advL[1] or 0) + 1), #csvdb["adv_rankCsv"] do
  			local ldata = csvdb["adv_rankCsv"][level]
  			if ldata.unlock <= advL[2] then
  				advL[1] = level
  				self:award(ldata.reward)
  			end
  		end
  		if advL[1] > oldL then
  			self:checkTaskEnter("AdvLevel", {level = advL[1]})
  		end
  		self:updateProperty({field = "advL", value = advL})
  	end
c384626d   zhouhaihai   好友
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
  	-- 好友列表简约信息
  	function Role:friendSInfo()
  		local info = {
  			name = self:getProperty("name"),
  			level = self:getProperty("level"),
  			headId = self:getProperty("headId"),
  			ltime = self:getProperty("ltime"),
  			battleV = self:getTeamBattleValue(self:getProperty("hangTeam").heros or {}), -- Todo
  		}
  		return info
  	end
  
  	local slotToPos = {
  		[1] = 6,
  		[2] = 2,
  		[3] = 35,
  		[4] = 32,
  		[5] = 29,
  	}	
  	function Role:getTeamBattleInfo(team)
  		local heros = {}
  		-- local activeRelation = self:getHeroActiveRelation(team.heros)
  
  		for slot, id in pairs(team.heros or {}) do
  			local info = {id = id}
  			local hero = self.heros[info.id]
  			if not hero then
  				print("error heroid " .. info.id)
  			end
  			-- local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
  			-- for k, v in pairs(AttsEnumEx) do
  			-- 	info[v] = (attrs[v] or 0)
  			-- end
  			-- info.blockLevel = hero:getSkillLevel(4)
  			-- info.specialLevel = hero:getSkillLevel(1)
  
  			info.type = hero:getProperty("type")
  			info.level = hero:getProperty("level")
  			info.wakeL = hero:getProperty("wakeL")
  			heros[slot] = info
  		end
  		return heros
  	end
  
  	-- 角色详细信息
  	function Role:friendInfo()
  		local info = self:friendSInfo()
  		local heros = self:getTeamBattleInfo(self:getProperty("hangTeam"))
  		info.heros = heros
  		return info
  	end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
870
871
872
  end
  
  return RolePlugin