Blame view

src/models/RolePlugin.lua 62.8 KB
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
1
  
ffb3e2c5   zhouhaihai   支付bug
2
  local serverId = tonumber(skynet.getenv("servId"))
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
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()
9a1c54b2   zhouhaihai   活动
13
  		self:loadActivity()
c5825110   saicom   新增用户商城相关数据
14
  		self:loadStoreInfo()
a12bfcce   测试   添加英雄表
15
  		self:loadRoleIncre()
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
16
17
18
  	end
  
  	function Role:reloadWhenLogin()
0a07bdd9   zhouahaihai   角色升级 。gm
19
20
  	end
  
c384626d   zhouhaihai   好友
21
22
23
24
  	function Role:SendPacket(...)
  		SendPacket(...)
  	end
  
5b28342d   zhouahaihai   离线方法
25
  	function Role:onOfflineEvent()
c384626d   zhouhaihai   好友
26
27
  		-- 设置最新的登录时间
  		self:setProperty("ltime", skynet.timex())
5b28342d   zhouahaihai   离线方法
28
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
29
  
312b9db5   zhouahaihai   背包
30
31
32
33
34
35
36
37
  	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   限定错误
38
39
  			for id ,_ in pairs(items) do
  				local tempData = csvdb["itemCsv"][id]
514590c2   zhouhaihai   容错
40
41
42
43
44
45
46
  				if tempData then
  					if globalCsv.store_type[tempData.type] == page then
  						curCount = curCount + 1
  						if curCount >= limit then
  							count = 0
  							break
  						end
312b9db5   zhouahaihai   背包
47
48
49
50
  					end
  				end
  			end
  		end
312b9db5   zhouahaihai   背包
51
52
  		return count
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
53
54
  
  	local function _award(self, itemId, count, params)
0719a220   zhouhaihai   数据保护
55
  		local count = math.floor(count)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
56
  		local pms = clone(params)
8c74292c   zhouahaihai   增加item 以及 角色突破
57
  		local itemData = csvdb["itemCsv"][itemId]
056c01a0   zhouhaihai   简化装备
58
59
60
  		if not itemData then  -- 加一层保护
  			return 0, {}
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
61
62
63
  		local curType = itemData.type
  		local change = {} -- 奖励被转化为了其他奖励 id = count
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
64
65
  		local itemIdAward = {
  			[ItemId.PlayerExp] = function()
44c6e479   zhouhaihai   增加部分日志
66
  				self:addPlayExp(count, pms)
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
67
  			end,
e1b238dd   zhouhaihai   拾荒体力
68
69
70
  			[ItemId.AdvPower] = function()
  				self:changeAdvCount(-count)
  			end,
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
71
72
  		}
  
be9c9ca6   zhouahaihai   角色评论
73
74
  		local itemTypeAward = {
  			[ItemType.Hero] = function()
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
75
  				pms.type = itemId - ItemStartId.Hero
a7b69ec2   zhouhaihai   完善道具转换
76
77
78
79
80
81
82
83
  				local status = self:addHero(pms)
  				local gcount = 1
  				if not status then
  					gcount = 0
  				end
  				if count - gcount > 0 then
  					local heroData = csvdb["unitCsv"][pms.type]
  					change[pms.type] = (change[pms.type] or 0) + (count - gcount) * globalCsv.draw_unit_tofragment[heroData.rare]
be9c9ca6   zhouahaihai   角色评论
84
  				end
a7b69ec2   zhouhaihai   完善道具转换
85
  				count = gcount
be9c9ca6   zhouahaihai   角色评论
86
  			end,
1c24ba6e   gaofengduan   fix equip
87
88
89
  			[ItemType.EquipBase] = function()
  				local typ = math.floor((itemId-7000)/100)
      			local lv = (itemId-7000)%100
056c01a0   zhouhaihai   简化装备
90
  				self:addEquip(typ, lv, count ,pms)
53e8037e   zhouhaihai   任务
91
92
  				local equipCsv = (csvdb["equipCsv"][typ] or {})[lv]
  				self:checkTaskEnter("AddEquip", {equipId = itemId, rarity = equipCsv.rarity}, pms.notNotify)
1c24ba6e   gaofengduan   fix equip
93
94
  			end,
  			[ItemType.Rune] = function()
3847ba2d   zhouhaihai   修改 零件
95
  				local typ =  math.floor((itemId-10000)/1000)
1c24ba6e   gaofengduan   fix equip
96
  				for _= 1, count do
44c6e479   zhouhaihai   增加部分日志
97
  					self:addRune({type = typ,id = itemId, notNotify = pms.notNotify, log = pms.log})
1c24ba6e   gaofengduan   fix equip
98
99
  				end
  			end,
00115a7a   zhouahaihai   奖励发放
100
101
102
  			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
  				count = 0
  			end,
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
103
  			[ItemType.FuncOpen] = function()
44c6e479   zhouhaihai   增加部分日志
104
  				self:funcOpen(itemId, count, pms)
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
105
  			end,
993def2f   zhouhaihai   碎片直接转换为其他碎片
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
  			[ItemType.HeroFCommon] = function()
  				if itemData.use_type == 2 then
  					local randomData = csvdb["item_randomCsv"][tonumber(itemData.use_effect)]
  					for _i = 1, count do
  						for i = 1, 10 do
  							local num = randomData["num" .. i] 
  							local gift = randomData["gift" .. i]
  							if num and gift and num > 0 and gift ~= "" then
  								local pool = {}
  								for _, temp in ipairs(gift:toArray()) do
  									table.insert(pool, temp:toArray(true, "="))
  								end
  								local needCount = math.min(#pool, num)
  								for j = 1, needCount do
  									local idx = math.randWeight(pool, 3)
  									change[pool[idx][1]] = (change[pool[idx][1]] or 0) + pool[idx][2]
  									table.remove(pool, idx)
  								end
  							end
  						end
  					end
  					change[0] = nil
  					count = 0
  				else
  					pms.itemId = itemId
  					pms.count = count
  					self:addItem(pms)
  				end
  			end,
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
135
136
137
  			[ItemType.Potion] = function ()
  				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
  			end,
be9c9ca6   zhouahaihai   角色评论
138
  		}
dfa9ae5e   测试   战令任务活动
139
140
141
142
143
144
145
146
147
  
  		if count > 0 then
  			local itemCfg = csvdb["itemCsv"][itemId]
  			local itemType = 0
  			if itemCfg then
  				itemType = itemCfg.type
  			end
  			self:checkTaskEnter("AddItem", {id = itemId, count = count, type = itemType})
  		end
312b9db5   zhouahaihai   背包
148
  		-- 对数量筛查
1a1a6375   gaofengduan   fix lua warning
149
  		count = checkItemCount(self, itemId, count)
312b9db5   zhouahaihai   背包
150
  		if count ~= 0 then
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
151
152
153
  			if itemIdAward[itemId] then
  				itemIdAward[itemId]()
  			elseif itemTypeAward[curType] then
312b9db5   zhouahaihai   背包
154
155
  				itemTypeAward[curType]()
  			else
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
156
157
158
  				pms.itemId = itemId
  				pms.count = count
  				self:addItem(pms)
312b9db5   zhouahaihai   背包
159
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
160
161
  		end
  
a7b69ec2   zhouhaihai   完善道具转换
162
  		return count, change --  count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
8c74292c   zhouahaihai   增加item 以及 角色突破
163
164
165
166
167
  	end
  
  
  	-- 发奖功能入口  award string id=count or {[id] = count}
  	function Role:award(gift, params)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
168
  		params = params or {}
8c74292c   zhouahaihai   增加item 以及 角色突破
169
  		local tgift = {}
46fac6f1   zhouahaihai   酱料
170
  		if type(gift) == "string" then
8c74292c   zhouahaihai   增加item 以及 角色突破
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 = {}, {}
  
a7b69ec2   zhouhaihai   完善道具转换
179
180
181
182
183
  		for itemId, rcount in pairs(tgift) do
  			local count, change = _award(self, itemId, rcount, params)
  			if count > 0 then
  				reward[itemId] = (reward[itemId] or 0) + count
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
184
  			if next(change) then
a7b69ec2   zhouhaihai   完善道具转换
185
186
187
188
189
190
  				local cr, _ = self:award(change, params) -- 内部转换忽略 防止死循环
  				if next(cr) then
  					for _id, _ct in pairs(cr) do
  						reward[_id] = (reward[_id] or 0) + _ct
  					end
  					table.insert(allChange, {form = {[itemId] = rcount - count}, to = cr})
312b9db5   zhouahaihai   背包
191
  				end
8c74292c   zhouahaihai   增加item 以及 角色突破
192
193
  			end
  		end
7bb30dca   zhouhaihai   修改发奖
194
  		if not next(allChange) then allChange = nil end
8c74292c   zhouahaihai   增加item 以及 角色突破
195
196
197
  		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
  	end
  
7bb30dca   zhouhaihai   修改发奖
198
199
200
201
202
203
  
  	function Role:packReward(reward, change)
  		if not reward then return nil end
  		return {reward = reward, change = change}
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
  	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")
8e524d41   zhouhaihai   优化
251
  		self:mylog("role_action", {desc = "changeHead", int1 = id})
bd4fb541   zhouhaihai   增加物品过期系统
252
253
  	end
  
44c6e479   zhouhaihai   增加部分日志
254
  	function Role:addPlayExp(addExp, params)
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
255
  		local level = self:getProperty("level")
39bcd7ca   zhouhaihai   LOG
256
  		local oldLevel = level
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
257
258
259
  		if not csvdb["player_expCsv"][level + 1] then
  			return
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
260
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
261
262
263
264
265
266
  		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
9ea0c502   测试   限时礼包
267
  				self:checkTaskEnter("RoleLevelUp", {level = level})
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
268
269
270
271
  			else
  				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
  			end
  		end
39bcd7ca   zhouhaihai   LOG
272
  		if level > oldLevel then
c6f3e36c   zhouhaihai   错误的语法
273
274
275
276
277
  			if params.log then
  				local log = params.log
  				self:log("setLevel", {
  					level_before = oldLevel, 
  					level_changemain = log.desc,
43293781   zhouhaihai   日志bug
278
  					level_changedetail = log.int1 or 0,
f3eb34b1   测试   删除无用日志
279
  					level_reward = {},
c6f3e36c   zhouhaihai   错误的语法
280
281
282
283
  				})
  			else
  				print("addPlayExp no log ", debug.traceback())
  			end
f22a33af   zhouhaihai   自己的日志
284
285
286
  		end
  
  		if params.log then
7d31daa8   zhouhaihai   调整压测
287
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
288
289
290
  			if log["cint1"] or log["cint2"] then
  				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
  			end
c6f3e36c   zhouhaihai   错误的语法
291
  			
f22a33af   zhouhaihai   自己的日志
292
293
294
295
296
297
298
299
  
  			log["cint1"] = addExp
  			log["cint2"] = newExp
  			log["cint3"] = level
  
  			self:mylog("player_exp", log)
  		else
  			print("addPlayExp no log ", debug.traceback())
44c6e479   zhouhaihai   增加部分日志
300
301
  		end
  
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
302
  		self:updateProperties({level = level, exp = newExp}, params.notNotify)
e3c5cc5e   zhouhaihai   跨服竞技场over
303
  		self:changeCrossServerPvpSelfInfo("level")
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
304
305
  	end
  
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
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:addPotion(params)
  		dump(params)
  		local pId = globalCsv.adv_item_potion[params.id]
  		local potionBag = self:getProperty("potionBag")
  		local origin = potionBag[pId] or 0
  		local nums = origin + params.count
  		potionBag[pId] = nums
  
  		self:logItems(params.id, origin, nums, params.log)
  		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.id
  			log["cint2"] = math.abs(params.count)
  			if params.count <= 0 then
  				self:mylog("out_item", log)
  			else
  				self:mylog("in_item", log)
  			end
  		else
  			print("addItem no log ", debug.traceback())
  		end
  
  		self:updateProperty({field = "potionBag", value = potionBag})
  		if not params.notNotify then
  			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.id] = params.count}))
  		end
  	end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
337
338
  	function Role:addItem(params)
  		params = params or {}
d02368d3   zhouhaihai   数据保护
339
  		params.count = math.floor(params.count or 0)
312b9db5   zhouahaihai   背包
340
341
342
343
  		if params.itemId ==  ItemId.Diamond then
  			self:gainDiamond(params)
  			return
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
344
345
346
347
348
349
350
351
352
  		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   增加部分日志
353
  
c59e058b   zhouhaihai   新一批日志记录
354
  		self:logItems(params.itemId, origin, nums, params.log)
f22a33af   zhouhaihai   自己的日志
355
  		if params.log then
7d31daa8   zhouhaihai   调整压测
356
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
357
358
359
360
361
362
363
364
365
366
367
368
369
  			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:mylog("out_item", log)
  			else
  				self:mylog("in_item", log)
  			end
  		else
  			print("addItem no log ", debug.traceback())
  		end
44c6e479   zhouhaihai   增加部分日志
370
  
8c74292c   zhouahaihai   增加item 以及 角色突破
371
372
373
374
  		self:setProperty("items", items)
  		if not params.notNotify then
  			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.itemId] = nums}))
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
375
376
377
378
  	end
  
  	function Role:checkItemEnough(itemCountT)
  		local less = {}
87cc3a35   zhengshouren   餐厅建筑升级逻辑
379
  		if not next(itemCountT) then
7d31daa8   zhouhaihai   调整压测
380
  			return true, less
87cc3a35   zhengshouren   餐厅建筑升级逻辑
381
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
382
  		for itemId, count in pairs(itemCountT) do
87cc3a35   zhengshouren   餐厅建筑升级逻辑
383
384
385
386
387
388
389
390
  			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 以及 角色突破
391
392
393
394
395
396
  			end
  		end
  		return (not next(less)), less -- 是否足够,,缺什么缺多少
  	end
  
  	function Role:costItems(itemCountT, params)
36204e3c   zhengshouren   贩卖逻辑
397
  		local pms = clone(params or {})
312b9db5   zhouahaihai   背包
398
  		if itemCountT[ItemId.Diamond] then  --优先扣除钻石
312b9db5   zhouahaihai   背包
399
400
401
402
  			pms.count = itemCountT[ItemId.Diamond]
  			if not self:costDiamond(pms) then
  				return
  			end
312b9db5   zhouahaihai   背包
403
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
404
  		for itemId, count in pairs(itemCountT) do
0a6fcddc   zhouhaihai   log 发现的bug
405
406
407
408
409
410
  			if itemId ~= ItemId.Diamond then
  				pms.itemId = itemId
  				pms.count = - count
  				self:addItem(pms)
  				self:itemDeltaEvent(pms)
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
411
  		end
312b9db5   zhouahaihai   背包
412
  		return true
8c74292c   zhouahaihai   增加item 以及 角色突破
413
414
  	end
  
89760dbe   chenyueqi   拆解室功能重写
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
  	function Role:itemDeltaEvent(pms)
  		self:eventBoxL(pms)
  	end
  
  	-- 拆解室的生产线启动
  	function Role:eventBoxL(pms)
  		local limit = globalCsv.box_key_max[pms.itemId]
  		if not limit then return end
  
  		local update = false
  		local boxL = self:getProperty("boxL") or {}
  		for slot, data in pairs(boxL) do
  			if data.time == 0 and data.id == pms.itemId and self:getItemCount(pms.itemId) < limit then
  				update = true
  				data.time = skynet.timex()
  			end
  		end
  
  		if update then
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
434
  			self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
89760dbe   chenyueqi   拆解室功能重写
435
436
437
  		end
  	end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
438
  	function Role:getItemCount(itemId)
43cc5f51   gaofengduan   调整 equip 数据结构
439
  		if itemId == ItemId.Diamond then
312b9db5   zhouahaihai   背包
440
441
  			return self:getAllDiamond()
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
442
443
444
  		return self:getProperty("items"):getv(itemId, 0)
  	end
  
312b9db5   zhouahaihai   背包
445
  	function Role:getAllDiamond()
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
446
447
  		local diamond = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
  		return self:getProperty("diamond") + diamond
312b9db5   zhouahaihai   背包
448
449
450
451
452
453
454
455
456
  	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")
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
457
  		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
312b9db5   zhouahaihai   背包
458
459
  		local origin = origind + originr
  		if params.isRecharge then
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
460
461
462
463
464
  			if params.sid == IOS_SID then
  				self:incrProperty("reDiamondIos", count)
  			else
  				self:incrProperty("reDiamond", count)
  			end
312b9db5   zhouahaihai   背包
465
466
467
  		else
  			self:incrProperty("diamond", count)
  		end
44c6e479   zhouhaihai   增加部分日志
468
  
c59e058b   zhouhaihai   新一批日志记录
469
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
470
  		if params.log then
7d31daa8   zhouhaihai   调整压测
471
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
472
473
474
475
476
477
478
479
480
481
  			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:mylog("in_diamond", log)
  		else
  			print("gainDiamond no log ", debug.traceback())
  		end
  
312b9db5   zhouahaihai   背包
482
483
484
485
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
312b9db5   zhouahaihai   背包
486
487
488
489
490
491
492
493
494
  	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
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
495
  		local isIos = self:getProperty("sid") == IOS_SID
312b9db5   zhouahaihai   背包
496
  		local origind = self:getProperty("diamond")
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
497
  		local originr = isIos and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
312b9db5   zhouahaihai   背包
498
499
500
501
502
503
504
505
506
  		local origin = origind + originr
  
  		if origin < 0 then
  			return false
  		end
  		if origin < count then
  			return false
  		end
  		local last = count
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
507
  		local costFirst = isIos and {"diamond", "reDiamondIos"} or {"diamond", "reDiamond"}
312b9db5   zhouahaihai   背包
508
  		if params.isRecharge then
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
509
  			costFirst = isIos and {"reDiamondIos", "diamond"} or {"reDiamond", "diamond"}
312b9db5   zhouahaihai   背包
510
511
512
513
514
515
516
517
518
  		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
  
c59e058b   zhouhaihai   新一批日志记录
519
520
  
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
521
  		if params.log then
7d31daa8   zhouhaihai   调整压测
522
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
523
524
525
526
527
528
529
530
531
  			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:mylog("out_diamond", log)
  		else
  			print("costDiamond no log ", debug.traceback())
  		end
44c6e479   zhouhaihai   增加部分日志
532
  
312b9db5   zhouahaihai   背包
533
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
dfa9ae5e   测试   战令任务活动
534
535
  
  		self:checkTaskEnter("CostDiamond", {count = count})
312b9db5   zhouahaihai   背包
536
537
538
  		return true
  	end
  
0a07bdd9   zhouahaihai   角色升级 。gm
539
540
  	function Role:addHero(params)
  		local roleId = self:getProperty("id")
0a07bdd9   zhouahaihai   角色升级 。gm
541
  		local heroType = params.type
056c01a0   zhouhaihai   简化装备
542
  		if self:isHaveHero(heroType) then return end
53e8037e   zhouhaihai   任务
543
544
  		local unitData = csvdb["unitCsv"][heroType] 
  		if not unitData then return false end
056c01a0   zhouhaihai   简化装备
545
  
a12bfcce   测试   添加英雄表
546
  		local heroId = self.roleIncre:increBy("heroId" , 1)
0a07bdd9   zhouahaihai   角色升级 。gm
547
  
0a07bdd9   zhouahaihai   角色升级 。gm
548
  		local heroInfo = {
a12bfcce   测试   添加英雄表
549
550
551
  			key = string.format("%d",roleId * MAX_HERO_NUM + heroId),
  			id 	= roleId * MAX_HERO_NUM + heroId,
  			roleid = roleId,
0a07bdd9   zhouahaihai   角色升级 。gm
552
  			type= heroType,
fb73effd   wangyujie   英雄初始觉醒等级从GD取
553
  			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
0a07bdd9   zhouahaihai   角色升级 。gm
554
  		}
bcbb0c7b   zhouhaihai   3星解锁 cg
555
  		if heroInfo.wakeL == 3 then
3ed95697   zhouhaihai   成就 参数错误
556
  			self:checkTaskEnter("WakeCG", {heroType = heroType})
bcbb0c7b   zhouhaihai   3星解锁 cg
557
  		end
0a07bdd9   zhouahaihai   角色升级 。gm
558
559
560
  		local newHero = require("models.Hero").new(heroInfo)
  		newHero:create()
  		newHero.owner = self
8c74292c   zhouahaihai   增加item 以及 角色突破
561
  		newHero:saveBattleValue()
0a07bdd9   zhouahaihai   角色升级 。gm
562
  		self.heros[heroId] = newHero
00bf6029   测试   限时礼包,抽卡ssr广播
563
564
565
566
567
  		local ssrCount = 0
  		if unitData.rare == HeroQuality.SSR then
  			ssrCount = self:getSSRHeroCount()
  		end
  		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
190e1415   测试   英雄帖活动初始化
568
  		self:checkTaskEnter("HeroQualityCollect", {})
0a07bdd9   zhouahaihai   角色升级 。gm
569
570
571
572
573
574
  		if not params.notNotify then
  			local heroResponse = {}
  			table.insert(heroResponse, newHero:data())
  			local bin = MsgPack.pack(heroResponse)
  			SendPacket(actionCodes.Hero_loadInfos, bin)
  		end
c59e058b   zhouhaihai   新一批日志记录
575
576
577
  
  		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
f22a33af   zhouhaihai   自己的日志
578
  		if params.log then
7d31daa8   zhouhaihai   调整压测
579
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
580
581
582
583
584
585
586
587
588
  			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:mylog("in_hero", log)
  		else
  			print("addHero no log ", debug.traceback())
  		end
c7ecb87f   zhouhaihai   添加 测试账号 方法
589
  		return true, newHero
056c01a0   zhouhaihai   简化装备
590
591
592
593
594
595
  	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   添加 测试账号 方法
596
  				return hero
056c01a0   zhouhaihai   简化装备
597
598
  			end
  		end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
599
600
  	end
  
00bf6029   测试   限时礼包,抽卡ssr广播
601
602
603
604
605
606
607
608
609
610
  	function Role:getSSRHeroCount()
  		local count = 0
  		for _, hero in pairs(self.heros) do
  			if hero:getRare() == HeroQuality.SSR then
  				count = count + 1
  			end
  		end
  		return count
  	end
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
611
  
0a07bdd9   zhouahaihai   角色升级 。gm
612
613
  	function Role:loadHeros()
  		local roleId = self:getProperty("id")
a12bfcce   测试   添加英雄表
614
615
616
617
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Hero` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
  			local hero = require("models.Hero").new({key = string.format("%d",data.id), id=data.id})
  			if hero:load(data) then
0a07bdd9   zhouahaihai   角色升级 。gm
618
  				hero.owner = self
52249374   测试   添加铭文表
619
  				self.heros[hero:getSimpleHeroId()] = hero
0a07bdd9   zhouahaihai   角色升级 。gm
620
621
622
623
  			end
  		end
  	end
  
be9c9ca6   zhouahaihai   角色评论
624
625
  	function Role:loadDaily()
  		local roleId = self:getProperty("id")
fa992c94   测试   添加daily,diner,act...
626
627
  		local dataKey = string.format("%d", roleId)
  		self.dailyData = require("models.Daily").new({key = dataKey, id = roleId})
be9c9ca6   zhouahaihai   角色评论
628
  		self.dailyData.owner = self
fa992c94   测试   添加daily,diner,act...
629
  		if not self.dailyData:checkKeyExists(dataKey) then
be9c9ca6   zhouahaihai   角色评论
630
631
632
633
634
  			self.dailyData:create()
  		else
  			self.dailyData:load()
  		end
  	end
46fac6f1   zhouahaihai   酱料
635
  
9a1c54b2   zhouhaihai   活动
636
637
  	function Role:loadActivity()
  		local roleId = self:getProperty("id")
fa992c94   测试   添加daily,diner,act...
638
639
  		local dataKey = string.format("%d", roleId)
  		self.activity = require("models.Activity").new({key = dataKey, id = roleId})
9a1c54b2   zhouhaihai   活动
640
  		self.activity.owner = self
fa992c94   测试   添加daily,diner,act...
641
  		if not self.activity:checkKeyExists(dataKey) then
9a1c54b2   zhouhaihai   活动
642
643
644
645
646
647
  			self.activity:create()
  		else
  			self.activity:load()
  		end
  	end
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
648
649
  	function Role:loadDiner()
  		local roleId = self:getProperty("id")
fa992c94   测试   添加daily,diner,act...
650
651
  		local dataKey = string.format("%d", roleId)
  		self.dinerData = require("models.Diner").new({key = dataKey, id = roleId})
87cc3a35   zhengshouren   餐厅建筑升级逻辑
652
  		self.dinerData.owner = self
fa992c94   测试   添加daily,diner,act...
653
  		if not self.dinerData:checkKeyExists(dataKey) then
87cc3a35   zhengshouren   餐厅建筑升级逻辑
654
655
656
657
658
659
  			self.dinerData:create()
  		else
  			self.dinerData:load()
  		end
  	end
  
440aa055   zhouhaihai   聊天
660
  
43cc5f51   gaofengduan   调整 equip 数据结构
661
  	function Role:loadEquips()
056c01a0   zhouhaihai   简化装备
662
  		-- 放role 里面了
43cc5f51   gaofengduan   调整 equip 数据结构
663
664
  	end
  
c5825110   saicom   新增用户商城相关数据
665
666
  	function Role:loadStoreInfo()
  		local roleId = self:getProperty("id")
fa992c94   测试   添加daily,diner,act...
667
668
  		local dataKey = string.format("%d", roleId)
  		self.storeData = require("models.Store").new({key = dataKey, id = roleId})
c5825110   saicom   新增用户商城相关数据
669
  		self.storeData.owner = self
fa992c94   测试   添加daily,diner,act...
670
  		if not self.storeData:checkKeyExists(dataKey) then
c5825110   saicom   新增用户商城相关数据
671
672
673
674
675
676
  			self.storeData:create()
  		else
  			self.storeData:load()
  		end
  	end
  
a12bfcce   测试   添加英雄表
677
678
679
680
681
682
683
684
685
686
687
688
  	function Role:loadRoleIncre()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format("%d", roleId)
  		self.roleIncre = require("models.RoleIncre").new({key = dataKey, id = roleId})
  		self.roleIncre.owner = self
  		if not self.roleIncre:checkKeyExists(dataKey) then
  			self.roleIncre:create()
  		else
  			self.roleIncre:load()
  		end
  	end
  
056c01a0   zhouhaihai   简化装备
689
690
691
692
693
694
695
  	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 {}
c59e058b   zhouhaihai   新一批日志记录
696
697
  		local oldCount = curTypeEquips[equipLv] or 0
  		local curCount = oldCount + count
056c01a0   zhouhaihai   简化装备
698
699
700
701
702
703
704
705
  
  		-- 是否足够上层判断
  		if curCount < 0 then
  			curCount = 0
  			curTypeEquips[equipLv] = nil
  		else
  			curTypeEquips[equipLv] = curCount
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
706
  
056c01a0   zhouhaihai   简化装备
707
708
709
710
711
712
713
  		if next(curTypeEquips) then
  			equips[equipType] = curTypeEquips
  		else
  			equips[equipType] = nil
  		end
  
  		self:setProperty("equips", equips)
44c6e479   zhouhaihai   增加部分日志
714
  
c59e058b   zhouhaihai   新一批日志记录
715
  		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
f22a33af   zhouhaihai   自己的日志
716
  		if pms.log then
7d31daa8   zhouhaihai   调整压测
717
  			local log = clone(pms.log)
f22a33af   zhouhaihai   自己的日志
718
719
720
721
722
723
724
725
726
727
728
729
730
731
  			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:mylog("out_equip", log)
  			else
  				self:mylog("in_equip", log)
  			end
  		else
  			print("addEquip no log ", debug.traceback())
  		end
44c6e479   zhouhaihai   增加部分日志
732
  
056c01a0   zhouhaihai   简化装备
733
734
  		if not pms.notNotify then
  			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
43cc5f51   gaofengduan   调整 equip 数据结构
735
736
737
738
  		end
  	end
  
  	function Role:getEquipCount(typ,lv)
056c01a0   zhouhaihai   简化装备
739
  		return (self:getProperty("equips")[typ] or {})[lv] or 0
43cc5f51   gaofengduan   调整 equip 数据结构
740
741
742
  	end
  
  	function Role:loadRunes()
43cc5f51   gaofengduan   调整 equip 数据结构
743
  		local roleId = self:getProperty("id")
a12bfcce   测试   添加英雄表
744
745
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Rune` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
52249374   测试   添加铭文表
746
747
748
749
  			local rune = require("models.Rune").new({key = string.format("%d",data.uid), uid=data.uid})
  			if rune:load(data) then
  				rune.owner = self
  				self.runeBag[data.uid] = rune
ad484303   gaofengduan   add rune
750
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
751
752
753
  		end
  	end
  
ad484303   gaofengduan   add rune
754
  	-- 0 为操作成功
43cc5f51   gaofengduan   调整 equip 数据结构
755
  	function Role:addRune(params)
ad484303   gaofengduan   add rune
756
757
758
759
760
761
762
  		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")
a12bfcce   测试   添加英雄表
763
  			local runeUid = self.roleIncre:increBy("runeId" , 1)
ad484303   gaofengduan   add rune
764
  
a12bfcce   测试   添加英雄表
765
766
767
768
  			local runeInfo = {
  				key = string.format("%d",roleId * MAX_RUNE_NUM + runeUid),
  				uid = roleId * MAX_RUNE_NUM + runeUid,
  				roleid = roleId,
ad484303   gaofengduan   add rune
769
770
771
772
  				type = params.type,
  				id = params.id,
  			}
  
a12bfcce   测试   添加英雄表
773
  			local newRune = require("models.Rune").new(runeInfo)
ad484303   gaofengduan   add rune
774
775
776
777
  			newRune:create()
  			newRune:generateAttrs()
  			newRune.owner = self
  			self.runeBag[runeUid] = newRune
ee999bde   zhouhaihai   零件优化
778
779
780
781
782
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newRune:data())
  				SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  			end
89338c47   zhouhaihai   技能目标
783
  			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
44c6e479   zhouhaihai   增加部分日志
784
  
c59e058b   zhouhaihai   新一批日志记录
785
  			self:logItems(params.id, 0, 1, params.log)
f22a33af   zhouhaihai   自己的日志
786
  			if params.log then
7d31daa8   zhouhaihai   调整压测
787
  				local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
788
789
790
791
792
793
794
795
796
797
798
799
  				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:mylog("in_rune", log)
  			else
  				print("addRune no log ", debug.traceback())
  			end
44c6e479   zhouhaihai   增加部分日志
800
  
c7ecb87f   zhouhaihai   添加 测试账号 方法
801
  			return 0, newRune
43cc5f51   gaofengduan   调整 equip 数据结构
802
  		else
ad484303   gaofengduan   add rune
803
  			return 1
43cc5f51   gaofengduan   调整 equip 数据结构
804
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
805
806
  	end
  
44c6e479   zhouhaihai   增加部分日志
807
808
  	function Role:delRunes(runeIds, params) -- 批量删除 {id, }
  		params = params or {}
497f9a67   zhouhaihai   卖零件
809
810
  		local roleId = self:getProperty('id')
  		local bDel = {}
2445248d   zhouhaihai   去掉热门料理
811
  		for _, runeId in pairs(runeIds) do
497f9a67   zhouhaihai   卖零件
812
813
  			local rune = self.runeBag[runeId]
  			if rune and rune:getProperty("refer") == 0 then
44c6e479   zhouhaihai   增加部分日志
814
  
c59e058b   zhouhaihai   新一批日志记录
815
  				self:logItems(rune:getProperty("id"), 1, 0, params.log)
f22a33af   zhouhaihai   自己的日志
816
  				if params.log then
7d31daa8   zhouhaihai   调整压测
817
  					local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
818
819
820
821
822
823
824
825
826
827
828
829
  					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:mylog("out_rune", log)
  				else
  					print("delRunes no log ", debug.traceback())
  				end
44c6e479   zhouhaihai   增加部分日志
830
  
497f9a67   zhouhaihai   卖零件
831
832
833
834
835
  				self.runeBag[runeId] = nil
  				table.insert(bDel, runeId)
  			end
  		end
  
a12bfcce   测试   添加英雄表
836
  		-- delete rune
497f9a67   zhouhaihai   卖零件
837
838
839
840
841
842
843
844
845
846
847
848
849
  		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
850
851
852
853
854
  	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 数据结构
855
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
856
  		end
ee3ac0b5   gaofengduan   fix magic
857
  		return runeSet
43cc5f51   gaofengduan   调整 equip 数据结构
858
859
  	end
  
70cc72d7   zhouhaihai   拾荒bug
860
  	function Role:getAdvData(notNotify)
43cc5f51   gaofengduan   调整 equip 数据结构
861
  		if not self.advData then
46fac6f1   zhouahaihai   酱料
862
  			self.advData = require("adv.Adv").new(self)
70cc72d7   zhouhaihai   拾荒bug
863
864
865
866
867
868
869
  			local status, err = pcall(function()
  				self.advData:initByInfo()
  			end)
  			if not status then
  				self.advData:forceOver(notNotify, true)
  				skynet.error("getAdvData error adv initByInfo " .. err)
  			end
46fac6f1   zhouahaihai   酱料
870
871
872
  		end
  		return self.advData
  	end
bd15e9bc   zhouhaihai   购买剧情
873
874
875
876
877
878
879
880
881
882
883
884
  
  	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   属性计算
885
886
887
  
  	function Role:warningHeartTooQuick()
  		-- 加速器检测
e3c5cc5e   zhouhaihai   跨服竞技场over
888
889
890
891
  		local heartWarning = self:getProperty("heartWarning")
  		heartWarning = heartWarning + 1
  		self:setProperty("heartWarning", heartWarning)
  		if heartWarning == 50 then
44c6e479   zhouhaihai   增加部分日志
892
  			self:setBan(30, 1) --封禁 30天
e3c5cc5e   zhouhaihai   跨服竞技场over
893
894
895
896
  			return
  		end
  		if heartWarning < 50 and heartWarning % 5 == 0 then
  			self:sendGmMsg("server_accountBanned_warning")
8e524d41   zhouhaihai   优化
897
  			self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
e3c5cc5e   zhouhaihai   跨服竞技场over
898
899
900
901
902
903
904
  		end
  	end
  
  	function Role:setBan(time, banType)
  		time = time or 0
  		banType = banType or 0
  		local now = skynet.timex()
edf2ee12   zhouhaihai   防作弊
905
  		if time <= 0 then
e3c5cc5e   zhouhaihai   跨服竞技场over
906
907
908
  			self:setProperty("banTime", 0)
  			self:setProperty("banType", 0)
  			self:setProperty("heartWarning", 0)
8e524d41   zhouhaihai   优化
909
  			self:mylog("role_action", {desc = "ban_rm"})
e3c5cc5e   zhouhaihai   跨服竞技场over
910
  		else
edf2ee12   zhouhaihai   防作弊
911
  			self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
edf2ee12   zhouhaihai   防作弊
912
  			self:setProperty("banTime", math.ceil(now + 86400 * time))
e3c5cc5e   zhouhaihai   跨服竞技场over
913
  			self:setProperty("banType", banType)
edf2ee12   zhouhaihai   防作弊
914
915
  			self:resetRank()
  			self:mylog("role_action", {desc = "ban", int1 = math.ceil(time), int2 = banType})
e3c5cc5e   zhouhaihai   跨服竞技场over
916
917
918
  		end
  	end
  
edf2ee12   zhouhaihai   防作弊
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
  	-- 清掉所有排行榜
  	function Role:resetRank()
  		local roleId = self:getProperty("id")
  		redisproxy:pipelining(function (red)
  			red:zrem(RANK_TOWER, roleId)
  			for _, rk in pairs(RANK_ADV) do
  				red:zrem(rk, roleId)
  			end
  			for _, rk in pairs(RANK_DINER) do
  				red:zrem(rk, roleId)
  			end
  			for _, rk in pairs(RANK_PVP_COMMON_KEY) do
  				red:zrem(rk, roleId)
  			end
  			for _, rk in pairs(RANK_PVP_HIGHT_KEY) do
  				red:zrem(rk, roleId)
  			end
  			for _, ct in pairs(RANK_TYPE) do
  				red:zrem(RANK_COMMON .. ct, roleId)
  			end
  		end)
  	end
  
e3c5cc5e   zhouhaihai   跨服竞技场over
942
943
  	function Role:sendGmMsg(text, isNotKey)
  		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
edf2ee12   zhouhaihai   防作弊
944
945
946
947
948
949
950
  		
  		local agent = datacenter.get("agent", self:getProperty("id"))
  		if agent then
  			skynet.timeout(50, function ()
  				skynet.call(agent.gate_serv, "lua", "forcekick", agent.fd)
  			end)
  		end
ece975b6   zhouhaihai   属性计算
951
  	end
a41b9076   zhouhaihai   增加羁绊方法
952
  
e8ca14c4   zhouhaihai   羁绊加成去掉
953
954
955
956
957
958
959
960
961
962
963
  	-- function Role:getHeroActiveRelationData(heros)
  	-- 	local relations = {} 
  	-- 	for _, id in pairs(heros or {}) do
  	-- 		local hero = self.heros[id]
  	-- 		if hero then
  	-- 			local camp = csvdb["unitCsv"][hero:getProperty("type")].camp
  	-- 			relations[camp] = (relations[camp] or 0) + 1
  	-- 		end
  	-- 	end
  	-- 	local curData = csvdb["unit_relationCsv"][0]
  	-- 	if not next(relations) then return curData end
18323af7   zhouhaihai   羁绊 bug
964
  		
e8ca14c4   zhouhaihai   羁绊加成去掉
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
  	-- 	for _, data in ipairs(csvdb["unit_relationCsv"]) do
  	-- 		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
  	-- 			end
  	-- 			if not find then
  	-- 				isDone = false
  	-- 				break
  	-- 			end
  	-- 		end
  	-- 		if isDone then
  	-- 			curData = data
  	-- 		end
  	-- 	end
  	-- 	return curData
  	-- end
  
  	-- function Role:getHeroActiveRelation(heros)
  	-- 	local data = self:getHeroActiveRelationData(heros)
  	-- 	local result = {}
  	-- 	for attr, value in pairs(data.effect:toNumMap()) do
  	-- 		result[AttsEnumEx[attr]] = (result[AttsEnumEx[attr]] or 0) + value
  	-- 	end
  	-- 	return result
  	-- end
b53593b5   zhouhaihai   羁绊加成
997
  
ccbafe67   zhouhaihai   冒险神器和buff
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
  	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
  
e8ca14c4   zhouhaihai   羁绊加成去掉
1017
1018
  	-- function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
  	function Role:getRealBattleValue(heros) -- 获取队伍战斗力  羁绊加成
f317b790   zhouhaihai   pvp 遗留
1019
  		heros = heros or {}
e8ca14c4   zhouhaihai   羁绊加成去掉
1020
  		-- local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
b53593b5   zhouhaihai   羁绊加成
1021
1022
1023
1024
  		local battleValue = 0
  		for _, id in pairs(heros) do
  			local hero = self.heros[id]
  			if hero then
e8ca14c4   zhouhaihai   羁绊加成去掉
1025
1026
  				-- battleValue = battleValue + hero:getBattleValue(activeRelation)
  				battleValue = battleValue + hero:getBattleValue()
b53593b5   zhouhaihai   羁绊加成
1027
1028
1029
1030
  			end
  		end
  		return battleValue
  	end
09be9059   zhouhaihai   冒险接口
1031
1032
  
  	function Role:getAdvHangLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1033
  		return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
09be9059   zhouhaihai   冒险接口
1034
  	end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1035
  
fc316d1f   zhouhaihai   冒险体力优化
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
  	function Role:checkAdvCount(need)
  		local oldCount = self:getProperty("advC")
  		local oldTime = self:getProperty("advCT")
  		local newCount = oldCount
  		if oldCount > 0 then
  			local add = math.max(math.floor((skynet.timex() - oldTime) / (globalCsv.adv_daily_regain_min * 60)), 0)
  			newCount = math.max(oldCount - add, 0)
  		end
  
  		return newCount + need <= self:getAdvHangLimit()
  	end
  
  	--忽略上限
  	function Role:changeAdvCount(change)
60fff866   zhouhaihai   微调 结算返还
1050
  		if change == 0 then return end
fc316d1f   zhouhaihai   冒险体力优化
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
  		local count = self:getProperty("advC")
  		local ctime = self:getProperty("advCT")
  		if ctime == 0 then
  			ctime = skynet.timex()
  		end
  		local add = math.max(math.floor((skynet.timex() - ctime) / (globalCsv.adv_daily_regain_min * 60)), 0)
  		local nextTime = ctime + add * (globalCsv.adv_daily_regain_min * 60)
  		if count > 0 then
  			count = math.max(count - add, 0)
  		end
fc316d1f   zhouhaihai   冒险体力优化
1061
1062
  		self:updateProperties({
  			advC = count + change,
92ef9591   zhouhaihai   冒险次数
1063
  			advCT = nextTime,
fc316d1f   zhouhaihai   冒险体力优化
1064
1065
1066
  		})
  	end
  
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1067
  	function Role:getAdvElLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1068
  		return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1069
1070
  	end
  
d232676a   zhouhaihai   功能解锁 冒险返回
1071
1072
1073
1074
1075
1076
  	-- 走 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  -- 没有就是解锁了
  
33be3111   zhouhaihai   修改hangPass 结构
1077
  		if self:checkHangPass(data.carbonId) then 
d232676a   zhouhaihai   功能解锁 冒险返回
1078
1079
1080
1081
1082
  			return true
  		else
  			return false
  		end 
  	end
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1083
  
d232676a   zhouhaihai   功能解锁 冒险返回
1084
  	-- 走 unlock 表的主动解锁
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1085
1086
1087
1088
  	function Role:isFuncOpen(func)
  		return self:getProperty("funcOpen")[func] == 1
  	end
  
bab30666   zhouhaihai   增加通用功能等级 字段
1089
1090
  	function Role:getFuncLv(func)
  		return self:getProperty("funcLv")[func] or 1
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1091
1092
  	end
  
ccbafe67   zhouhaihai   冒险神器和buff
1093
1094
1095
1096
1097
1098
1099
1100
1101
  	-- 参数有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 神器
1102
  		elseif curData.unlock == 2 then  -- 特殊神器 不可解锁
ccbafe67   zhouhaihai   冒险神器和buff
1103
  			return isCheckLevel
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
1104
  		elseif curData.unlock == 3 then
ccbafe67   zhouhaihai   冒险神器和buff
1105
1106
1107
1108
1109
  			return isEndless
  		end
  		return true
  	end
  
44c6e479   zhouhaihai   增加部分日志
1110
1111
1112
  	function Role:funcOpen(func, count, params)
  		params = params or {}
  		
ad88ba14   zhouhaihai   工坊 bug
1113
  		count = count or 1
44c6e479   zhouhaihai   增加部分日志
1114
  
887c1843   zhouhaihai   日志新一批
1115
  		self:logItems(func, 0, count, params.log)
f22a33af   zhouhaihai   自己的日志
1116
  		if params.log then
7d31daa8   zhouhaihai   调整压测
1117
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
  			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:mylog("func_open", log)
  		else
  			print("funcOpen no log ", debug.traceback())
  		end
44c6e479   zhouhaihai   增加部分日志
1129
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1130
  		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
bab30666   zhouhaihai   增加通用功能等级 字段
1131
  			local unlockData = csvdb["unlockCsv"][func]
9be3f3ea   zhouhaihai   日志需求
1132
  			self:log("function_open", {function_id = func})
db3c56ad   zhouhaihai   冒险相关
1133
  			if unlockData.type == 4 then -- 解锁神器
f45d3a7b   zhouhaihai   adv_unlock
1134
1135
1136
  				if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
  					self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
  				end
4b61215f   zhouhaihai   语法错误
1137
  			elseif TypeIsFunc[unlockData.type] then
bab30666   zhouhaihai   增加通用功能等级 字段
1138
  				if unlockData.value1 == 0 or unlockData.value1 == 1 then
f45d3a7b   zhouhaihai   adv_unlock
1139
1140
1141
  					if self:getProperty("funcOpen")[unlockData.type] ~= 1 then
  						self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1142
1143
  				else
  					local oldV = self:getFuncLv(unlockData.type)
59835765   zhouhaihai   排行榜
1144
  					local newLv = math.min(oldV + count, unlockData.value2)
f45d3a7b   zhouhaihai   adv_unlock
1145
1146
1147
  					if oldV ~= newLv then
  						self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1148
1149
  				end
  			else
f45d3a7b   zhouhaihai   adv_unlock
1150
1151
1152
  				if self:getProperty("funcOpen")[func] ~= 1 then
  					self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
  				end
bab30666   zhouhaihai   增加通用功能等级 字段
1153
  			end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1154
1155
1156
  		end
  	end
  
e51ff6d2   zhouhaihai   冒险~
1157
  	function Role:advChapterIsOpen(chapterId)
e51ff6d2   zhouhaihai   冒险~
1158
  		local chapterData = csvdb["adv_chapterCsv"][chapterId]
33be3111   zhouhaihai   修改hangPass 结构
1159
  		if chapterData.prepose ~= 0 and not self:checkHangPass(chapterData.prepose) then return false end
e51ff6d2   zhouhaihai   冒险~
1160
  		return true
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
  	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   无尽模式
1174
  	-- 赛季检查
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1175
1176
1177
1178
  	function Role:advEndlessSeasonCheck(notNotify)
  		--  重置一下冒险
  		local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
  		if self:getProperty("advElS") ~= nowSeason then
0e3ab88d   zhouhaihai   中继层
1179
1180
1181
1182
  			-- 胡博文让注释掉 衰减 从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   赛季更新完善 无尽冒险排行榜
1183
1184
1185
1186
1187
1188
1189
  
  			-- 正在无尽冒险清掉
  			local adv = self:getAdvData()
  			if adv:isRunning() and adv:isEndless() then
  				adv:forceOver()
  			end
  
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1190
1191
1192
  			-- 路过的中继层重置掉
  			local advRelay = self:getProperty("advRelay")
  			advRelay[-1] = nil
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1193
1194
1195
  			-- 清掉冒险手册
  			self:updateProperties({
  				advEAchiev = {},
0e3ab88d   zhouhaihai   中继层
1196
1197
  				advElM = 0,
  				advElS = nowSeason,
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1198
  				advRelay = advRelay,
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1199
  			}, notNotify)
e1355da3   zhouhaihai   神器 被动
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
  
  
  			-- 重新设定冒险章节和冒险结束时间
  			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   无尽模式
1211
1212
  		end
  	end
59835765   zhouhaihai   排行榜
1213
  
9ced5432   zhouhaihai   冒险支援效果 保底事件
1214
1215
1216
1217
1218
1219
1220
  	-- 获得激活的冒险效果
  	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]
1e33ae30   zhouhaihai   数据保护
1221
  				if achvData and achvData.support ~= 0 then
9ced5432   zhouhaihai   冒险支援效果 保底事件
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
  					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   排行榜
1269
  
cfd68b3a   zhouhaihai   时间重置 新逻辑
1270
  	
59835765   zhouhaihai   排行榜
1271
  	function Role:getCurDinerRankKey()
bd4fb541   zhouhaihai   增加物品过期系统
1272
  		local round = self:getTimeResetRound(TimeReset.DinerRank)
59835765   zhouhaihai   排行榜
1273
  		local idx = 1
bd4fb541   zhouhaihai   增加物品过期系统
1274
  		if round % 2 == 1 then
59835765   zhouhaihai   排行榜
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
  			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  -- 越早的排名越靠前
98d32f92   测试   多编队
1285
  		local towerTeam = self:getTeamFormatByType(TeamSystemType.Tower)
59835765   zhouhaihai   排行榜
1286
1287
1288
1289
1290
1291
1292
1293
1294
  		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,
821e2704   zhouhaihai   heros 增加 supports
1295
  			format = self:getTeamHerosInfo(towerTeam).heros,
59835765   zhouhaihai   排行榜
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
  		}
  		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   奖励副本
1338
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1339
  	function Role:addAdvLvExp(exp)
f60b89b1   zhouhaihai   奖励副本
1340
  		local advL = self:getProperty("advL")
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1341
  		local level = advL[1]
97807511   zhouhaihai   增加日志
1342
  		local oldLevel = level
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1343
1344
1345
1346
1347
1348
1349
  		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
aff85733   测试   资助升级等级限制放开
1350
1351
  			--if csvdb["adv_level_fundCsv"][level + 1] and self:advChapterIsOpen(100 + csvdb["adv_level_fundCsv"][level + 1].chapter) then -- 有下一级
  			if csvdb["adv_level_fundCsv"][level + 1] then -- 有下一级
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1352
1353
1354
1355
  				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
  				level = level + 1
  			else
  				newExp = csvdb["adv_level_fundCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
f60b89b1   zhouhaihai   奖励副本
1356
1357
  			end
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1358
1359
1360
  
  		if level > advL[1] then
  			self:checkTaskEnter("AdvLevel", {level = level})
f60b89b1   zhouhaihai   奖励副本
1361
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1362
1363
  		advL[1] = level
  		advL[2] = newExp
f60b89b1   zhouhaihai   奖励副本
1364
  		self:updateProperty({field = "advL", value = advL})
97807511   zhouhaihai   增加日志
1365
  		return oldLevel, level
f60b89b1   zhouhaihai   奖励副本
1366
  	end
c384626d   zhouhaihai   好友
1367
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
  	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   资助对积分的影响
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
  	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   冒险
1393
  		return math.floor(score * (1 + change / 100))
9f956e88   zhouhaihai   资助对积分的影响
1394
1395
  	end
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
  	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   好友
1411
  	function Role:getTeamBattleInfo(team)
f603a60f   zhouhaihai   支援技实装
1412
  		local teamInfo = {heros = {}, supports = {}}
e8ca14c4   zhouhaihai   羁绊加成去掉
1413
  		-- local activeRelation = self:getHeroActiveRelation(team.heros)
c384626d   zhouhaihai   好友
1414
1415
  
  		for slot, id in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1416
1417
  			local info = {}
  			local hero = self.heros[id]
c384626d   zhouhaihai   好友
1418
  			if not hero then
fa565e0c   zhouhaihai   优化结构
1419
1420
  				print("error heroid " .. id)
  			end
e8ca14c4   zhouhaihai   羁绊加成去掉
1421
1422
  			-- local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
  			local attrs = hero:getTotalAttrs()
fa565e0c   zhouhaihai   优化结构
1423
1424
  			for k, v in pairs(AttsEnumEx) do
  				info[v] = (attrs[v] or 0)
c384626d   zhouhaihai   好友
1425
  			end
c384626d   zhouhaihai   好友
1426
1427
  			info.type = hero:getProperty("type")
  			info.level = hero:getProperty("level")
42f465e5   suhongyang   战斗参数传传入觉醒等级
1428
  			info.wakeL = hero:getProperty("wakeL")
fa565e0c   zhouhaihai   优化结构
1429
1430
  			info.blockLevel = hero:getSkillLevel(4)
  			info.specialLevel = hero:getSkillLevel(1)
aad10fac   suhongyang   战斗获取被动技能等级参数
1431
  			info.passiveLevel = hero:getSkillLevel(3)
a6508219   zhouhaihai   挂机奖励
1432
  			info.runeSkill = hero:getRuneSkill(102)
73db53c3   zhouhaihai   天赋技能
1433
  			info.talentSkills = hero:getTalentSkill()
fa565e0c   zhouhaihai   优化结构
1434
1435
  			teamInfo.heros[slot] = info
  		end
f603a60f   zhouhaihai   支援技实装
1436
1437
1438
  		for slot, id in pairs(team.supports or {}) do
  			teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
  		end
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
1439
  		teamInfo.tactics = globalCsv.tactics_skill_passive_cell[team.tactics] and team.tactics or nil
fa565e0c   zhouhaihai   优化结构
1440
1441
1442
  		return teamInfo
  	end
  
821e2704   zhouhaihai   heros 增加 supports
1443
1444
  	function Role:getTeamHerosInfo(team)
  		local format = {}
fa565e0c   zhouhaihai   优化结构
1445
  		local heros = {}
821e2704   zhouhaihai   heros 增加 supports
1446
  		for slot, heroId in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1447
1448
1449
1450
1451
1452
  			local hero = self.heros[heroId]
  			heros[slot] = {
  				type = hero:getProperty("type"),
  				level = hero:getProperty("level"),
  				wakeL = hero:getProperty("wakeL"),
  			}
c384626d   zhouhaihai   好友
1453
  		end
821e2704   zhouhaihai   heros 增加 supports
1454
1455
  		format.heros = heros
  		format.supports = team.supports or {}
57e52b3d   zhouhaihai   空的是nil
1456
  		format.tactics = team.tactics or nil
821e2704   zhouhaihai   heros 增加 supports
1457
  		return format
c384626d   zhouhaihai   好友
1458
1459
  	end
  
fa565e0c   zhouhaihai   优化结构
1460
  	function Role:getTeamBattleValue(heros)
3dbbc9f3   zhouhaihai   加上新的任务
1461
1462
1463
1464
1465
1466
1467
  		-- 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   优化结构
1468
1469
  	end
  
98d32f92   测试   多编队
1470
1471
1472
1473
1474
  	function Role:updateHangTeamInfo()
  		local team = self:getTeamFormatByType(TeamSystemType.Hang)
  		if not team then return end
  
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
1475
  			hangTS = self:getTeamHerosInfo(team),
98d32f92   测试   多编队
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
  			hangTB = self:getTeamBattleInfo(team),
  			hangTBV = self:getTeamBattleValue(team.heros),
  		})
  	end
  
  	-- 设置pve阵容
  	function Role:getTeamFormat(index)
  		local teams = self:getProperty("hangTeams") or {}
  		local team = teams[index] or {}
  		return team
  	end
  
  	function Role:getTeamFormatByType(type)
  		local teamIndex = self:getProperty("teamIndex") or {}
  		local index = teamIndex[type]
  		if not index then return {} end
  
  		return self:getTeamFormat(index)
  	end
  
  	function Role:setTeamFormat(index, team)
  		local teams = self:getProperty("hangTeams") or {}
  		teams[index] = team
  		self:updateProperty({field = "hangTeams", value = teams, notNotify = false})
  	end
  
  	-- 设置拾荒编队阵容
  	function Role:getAdvTeamFormat(index)
  		local teams = self:getProperty("advTeams") or {}
  		local team = teams[index] or {}
  		return team
  	end
  
  	function Role:setAdvTeamFormat(index, team)
  		local teams = self:getProperty("advTeams") or {}
  		teams[index] = team
  		self:updateProperty({field = "advTeams", value = teams, notNotify = false})
  	end
  
  
fa565e0c   zhouhaihai   优化结构
1516
  	function Role:savePvpCTeam(team)
4cf74232   zhouhaihai   pvp
1517
  		if not team then
3dbbc9f3   zhouhaihai   加上新的任务
1518
  			team = self:getProperty("pvpTC")
4cf74232   zhouhaihai   pvp
1519
  		else
3dbbc9f3   zhouhaihai   加上新的任务
1520
  			self:updateProperty({field = "pvpTC", value = team})
4cf74232   zhouhaihai   pvp
1521
  		end
fa565e0c   zhouhaihai   优化结构
1522
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
1523
  			pvpTSC = self:getTeamHerosInfo(team),
fa565e0c   zhouhaihai   优化结构
1524
1525
1526
  			pvpTBC = self:getTeamBattleInfo(team),
  			pvpTBVC = self:getTeamBattleValue(team.heros),
  		})
c384626d   zhouhaihai   好友
1527
  	end
dc9d814f   zhouhaihai   邮件
1528
  
ab9f5400   zhouhaihai   临时代码
1529
1530
1531
1532
1533
1534
1535
1536
1537
  	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
c6940d28   zhouhaihai   报错
1538
  			if team[i] then
821e2704   zhouhaihai   heros 增加 supports
1539
  				pvpTSH[i] = self:getTeamHerosInfo(team[i])
c6940d28   zhouhaihai   报错
1540
1541
1542
  				pvpTBH[i] = self:getTeamBattleInfo(team[i])
  				pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
  			end
ab9f5400   zhouhaihai   临时代码
1543
1544
1545
1546
1547
1548
1549
1550
1551
  		end
  
  		self:setProperties({
  			pvpTSH = pvpTSH,
  			pvpTBH = pvpTBH,
  			pvpTBVH = pvpTBVH,
  		})
  	end
  
dc9d814f   zhouhaihai   邮件
1552
1553
  	-- update
  	function Role:onRecoverTimer(now)
cfd68b3a   zhouhaihai   时间重置 新逻辑
1554
  		self:updateTimeReset(now, true)
dc9d814f   zhouhaihai   邮件
1555
1556
1557
  		self:checkNewEvent(now)
  	end
  
fb3d084d   测试   月卡赛季卡发送邮件奖励
1558
  	local function breath(sec, name)
dc9d814f   zhouhaihai   邮件
1559
  		local last_breath = 0
fb3d084d   测试   月卡赛季卡发送邮件奖励
1560
1561
1562
  		return function (now, role)
  			if name == "email" and role.sendMailFlag then
  				last_breath = now + sec
0d892cdf   测试   发送邮件清标记
1563
  				role.sendMailFlag = false
fb3d084d   测试   月卡赛季卡发送邮件奖励
1564
1565
  				return true
  			end
dc9d814f   zhouhaihai   邮件
1566
1567
1568
1569
1570
1571
1572
1573
  			if now >= last_breath then
  				last_breath = now + sec
  				return true
  			end
  			return false
  		end
  	end
  	local breathes = {
fb3d084d   测试   月卡赛季卡发送邮件奖励
1574
1575
  		["email"] = breath(120, "email"), -- email
  		["pvphg"] = breath(300, "pvphg"), -- 高级竞技场 奖励满的红点
dc9d814f   zhouhaihai   邮件
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
  	}
  	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)
62ed4275   测试   添加新的延時類型郵件
1599
1600
1601
1602
1603
1604
1605
1606
1607
  					-- 0 需要判斷創角時間小於郵件創建時間 1 只需要在時間段內登陸即可領取
  					local delayType = tonum(email.delayType)
  					local flag = false
  					if delayType == 1 then
  						flag = skynet.timex() > tonum(email.createtime)
  					else
  						flag = tonum(email.createtime) > self:getProperty("ctime")
  					end
  					if flag and ( not email.mid or tonum(email.mid) == mid )
dc9d814f   zhouhaihai   邮件
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
  						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)
706b517e   测试   翻倍掉落活动,商城免费宝箱
1623
1624
  
  			self.SendMailFlag = false
dc9d814f   zhouhaihai   邮件
1625
1626
  			for index, id in ipairs(emailIds) do
  				if tonumber(redret[index]) == 0 then
dc9d814f   zhouhaihai   邮件
1627
1628
1629
1630
  					return true
  				end
  			end
  		end
42327de8   zhouhaihai   高级竞技场红点
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
  
  		checks["pvphg"] = function()
  			if not self:isTimeResetOpen(TimeReset.PvpHight) then return end
  
  			local pvpHGTime = self:getProperty("pvpHGTime")
  			if pvpHGTime == 0 then return end
  			local division = self:getPvpHDivision()
  			local divisionData = csvdb["pvp_group_divisionCsv"][division]
  
  			local newTime, newReward = self:calculatePvpHGift(division)
  			if table.pack(next(newReward))[2] >= divisionData.limit then
  				return true
  			end
091912ed   chenyueqi   未测试版好友能量助力活动
1644
  		end
dc9d814f   zhouhaihai   邮件
1645
1646
1647
  		
  		local events = {}
  		for name, breath in pairs(breathes) do
fb3d084d   测试   月卡赛季卡发送邮件奖励
1648
  			if breath(now, self) and checks[name] then
dc9d814f   zhouhaihai   邮件
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
  				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
  
33be3111   zhouhaihai   修改hangPass 结构
1665
1666
1667
1668
1669
1670
  	function Role:checkHangPass(carbonId)
  		local hangPass = self:getProperty("hangPass")
  		local diff = math.floor(carbonId / 10000)
  		return (hangPass[diff] or 0) >= carbonId
  	end
  
15e1f084   zhouhaihai   挂机gm
1671
  	function Role:hangFinish(carbonId)
33be3111   zhouhaihai   修改hangPass 结构
1672
1673
  		local hangPass = self:getProperty("hangPass")
  		local diff = math.floor(carbonId / 10000)
15e1f084   zhouhaihai   挂机gm
1674
  		if (hangPass[diff] or 0) < carbonId then
33be3111   zhouhaihai   修改hangPass 结构
1675
1676
1677
1678
1679
  			hangPass[diff] = carbonId
  			self:updateProperty({field = "hangPass", value = hangPass})
  		end
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
1680
1681
1682
1683
1684
1685
1686
1687
1688
  	function Role:getAdvRankKey()
  		local round = self:getProperty("advElS")
  		local idx = 1
  		if round % 2 == 1 then
  			idx = 2 
  		end
  		return RANK_ADV[idx]
  	end
  
9cede2e2   zhouhaihai   主推红点 和冒险次数
1689
1690
1691
1692
1693
1694
1695
  	-- 消除指定tag 红点
  	function Role:clearRedPTag(tag)
  		local redp = self:getProperty("redp")
  		redp[tag] = nil
  		self:updateProperty({field = "redp", value = redp})
  	end
  
2bf99d62   zhouhaihai   充值mycard
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
  	-- 网页支付获取订单号
  	function Role:getPurchaseOrderByPlatform(params)
  		local checkPlatform = {
  			["mycard"] = "mycard_product_id",
  		}
  		local pidField = checkPlatform[params.payMode or ""]
  		if not pidField or not params.product_id or params.product_id == "" then
  			return "no product"
  		end
  
  		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
  			if not v[pidField] then return "no product" end
  			if v[pidField] == params.product_id then
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
1709
  				if v.twd * 100 ~= tonumber(params.money) then
2bf99d62   zhouhaihai   充值mycard
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
  					return "error money"
  				end
  				-- 发现需要的id
  				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId)
  				if partnerOrderId == "" then
  					return "no product"
  				end
  				return json.encode({order = partnerOrderId})
  			end
  		end
  	end
  
d705a315   zhouhaihai   充值 整理
1722
  	-- 获取充值订单号
2bf99d62   zhouhaihai   充值mycard
1723
  	function Role:getPurchaseOrder(rechargeId, transactionId)
d705a315   zhouhaihai   充值 整理
1724
1725
1726
1727
1728
1729
1730
  		local roleId = self:getProperty("id")
  		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
  		if not rechargeData then
  			skynet.error("recharge id not exist", rechargeId)
  			return ""
  		end
  		local limit = rechargeData.limit
eb5ffd1c   测试   世界boss翻牌奖励 活动卡池保底...
1731
  	    local rechargeRecord = self.storeData:getProperty("payR") or {}
d705a315   zhouhaihai   充值 整理
1732
1733
  	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
  	        return ""
8e892c71   测试   挑战关卡活动打完再扣门票
1734
1735
1736
  		end
  		
  		--判断是否是活动商品
eb5ffd1c   测试   世界boss翻牌奖励 活动卡池保底...
1737
1738
1739
1740
1741
  		if rechargeData.activity_id ~= 0 then
  			local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
  			if not actCfg then return "" end
  			if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
  		end
d705a315   zhouhaihai   充值 整理
1742
  
913e070e   测试   添加订单表,全局id定时回写数据库
1743
1744
1745
1746
  		local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
  		if orderId then
  			local uid = orderId * MAX_SVR_ID + serverId
  			local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
d705a315   zhouhaihai   充值 整理
1747
  			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
913e070e   测试   添加订单表,全局id定时回写数据库
1748
  				return string.format("%d", uid)
d705a315   zhouhaihai   充值 整理
1749
  			end
913e070e   测试   添加订单表,全局id定时回写数据库
1750
  		end
d705a315   zhouhaihai   充值 整理
1751
1752
  
  		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
913e070e   测试   添加订单表,全局id定时回写数据库
1753
1754
  		local uid = orderId * MAX_SVR_ID + serverId
  		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
d705a315   zhouhaihai   充值 整理
1755
1756
1757
  		local orderKey = string.format(R_ORDER, roleId, orderId)
  		redisproxy:del(orderKey) -- 删掉可能有了
  		local order = require("models.Order").new({ 
913e070e   测试   添加订单表,全局id定时回写数据库
1758
1759
  			key = partnerOrderId, 
  			id = tonum(partnerOrderId), 
d705a315   zhouhaihai   充值 整理
1760
  			rechargeId = rechargeId, 
1ce3adac   zhouhaihai   充值
1761
  			createTime = skynet.timex(),
2bf99d62   zhouhaihai   充值mycard
1762
  			transactionId = transactionId,
913e070e   测试   添加订单表,全局id定时回写数据库
1763
  			roleid = roleId,
e4ff71cd   测试   去除sql语句日志
1764
  			sid = self:getProperty("sid"),
d705a315   zhouhaihai   充值 整理
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
  		})
  		order:create()
  		-- 正在进行中的订单 缓存
  		redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
  		return partnerOrderId
  	end
  
  	-- 更新订单信息
  	--[[
  
  	status
  
  	success
  	fail
  	finsh
  	unknow
  
  	--]]
  	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
  		if not partnerOrderStr then return false end
d705a315   zhouhaihai   充值 整理
1785
  		local roleId = self:getProperty("id")
913e070e   测试   添加订单表,全局id定时回写数据库
1786
  		local orderObject = require("models.Order").new({ key = string.format("%d", partnerOrderStr), id = tonum(partnerOrderStr)})
d705a315   zhouhaihai   充值 整理
1787
1788
1789
1790
1791
1792
  		if not orderObject:load() then
  			return false
  		end
  
  		local rechargeId = orderObject:getProperty("rechargeId")
  		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
1793
  		local sid = orderObject:getProperty("sid")
d705a315   zhouhaihai   充值 整理
1794
  
913e070e   测试   添加订单表,全局id定时回写数据库
1795
1796
1797
1798
1799
1800
1801
1802
  		if roleId ~= orderObject:getProperty("roleid") then
  			skynet.error(string.format("[recharge] with a different role id,  current roleId:%d, order role Id:%d, order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
  				roleId, orderObject:getProperty("roleid"),
  				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
  			))
  			return false, "unknow"
  		end
  
d705a315   zhouhaihai   充值 整理
1803
  		if orderObject:getProperty("finishTime") > 0 then
d778335c   zhouhaihai   同单号充值输出
1804
1805
1806
  			skynet.error(string.format("[recharge] is a finish order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
  				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
  			))
d705a315   zhouhaihai   充值 整理
1807
1808
1809
  			return false, "finsh"
  		end
  		
ffb3e2c5   zhouhaihai   支付bug
1810
1811
  		if platformOrder then
  			orderObject:setProperty("transactionId", platformOrder)
d705a315   zhouhaihai   充值 整理
1812
  		end
ffb3e2c5   zhouhaihai   支付bug
1813
  		orderObject:setProperty("status", status)
d705a315   zhouhaihai   充值 整理
1814
1815
1816
1817
  
  		-- 开始下单
  		if status == "success" then
  		elseif status == "fail" then
cd597363   zhouhaihai   充值重复
1818
  			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
1819
1820
  		elseif status == "finsh" then
  			orderObject:setProperty("finishTime", skynet.time())
ffb3e2c5   zhouhaihai   支付bug
1821
  			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
  		end
  
  		if status ~= "unknow" then
  			self:log("setOrder", {
  				order_status = ({success = 100, finsh = 200, fail = 300})[status] or 1000, -- "订单状态:100 - 开始下单(玩家还未开始付费行为记录)200 - 支付完成并发货(SDK通知可以发货时记录),300 - 订单被取消,1000 - 其他"
  				item_id = rechargeId, -- 道具id
  				item_type = dataSet.type, -- 购买的道具类型,具体见"onItems"方法中道具类型枚举表
  				item_name = dataSet.title, -- 购买的道具名
  				item_number = 1, -- 购买的道具数量
  				item_level = 1, -- 购买的道具等级
  				order_cost = dataSet.rmb * 100, -- 此次消费的现金金额(单位:分),如 51800即未518元,对应客户端SDK传入的'total_fee'
  				order_currency = "CNY", -- 货币类型,默认为"CNY"(人民币),遵循ISO 4217规范
  				order_type = self:getProperty("rmbC") > 0 and 0 or 1, -- 订单类型,首充记录为1,否则为0
  				order_id = platformOrder, -- 本条记录的订单号,对应客户端SDK返回的'bs_trade_no'
  			})
  		end
  
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
1839
  		return true, rechargeId, sid
d705a315   zhouhaihai   充值 整理
1840
  	end
192b96d3   zhouhaihai   重置
1841
1842
  
  	-- 充值 --
b6ed652b   zhouhaihai   充值
1843
1844
  	--[[
  	request.order = data.out_trade_no
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
1845
  	request.amount = data.money
b6ed652b   zhouhaihai   充值
1846
1847
1848
1849
  	request.game_money = data.game_money
  	request.product_id = data.product_id
  	request.pay_time = data.pay_time
  	request.transactionId = data.order_no
2bf99d62   zhouhaihai   充值mycard
1850
  	request.extension_info = data.extension_info
6df9d5e1   zhouhaihai   mycard twd
1851
  	request.is_mycard = 1
b6ed652b   zhouhaihai   充值
1852
  	]]
192b96d3   zhouhaihai   重置
1853
1854
1855
1856
  	function Role:handlePurchase(params)
  		local roleId = self:getProperty("id")
  		local partnerOrderStr = params.order
  
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
1857
  		local status, back, sid = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
d705a315   zhouhaihai   充值 整理
1858
1859
1860
1861
1862
  		if not status then
  			if back == "finsh" then
  				-- 订单已经处理
  				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
  			end
192b96d3   zhouhaihai   重置
1863
1864
  			return
  		end
d705a315   zhouhaihai   充值 整理
1865
  		local rechargeId = back
39bcd7ca   zhouhaihai   LOG
1866
  		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
1867
  		if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and rechargeData.rmb * 100 ~= tonumber(params.amount)) then
d705a315   zhouhaihai   充值 整理
1868
  			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
ec8caae5   zhouhaihai   多一点输出
1869
  				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
192b96d3   zhouhaihai   重置
1870
1871
1872
1873
  			))
  			return
  		end
  
39bcd7ca   zhouhaihai   LOG
1874
  		local status, reward = self:recharge({ 
f22a33af   zhouhaihai   自己的日志
1875
1876
1877
1878
  			id = rechargeId,
  			transactionId = params.transactionId,
  			pay_time = params.pay_time,
  			order = partnerOrderStr,
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
1879
  			sid = sid,
192b96d3   zhouhaihai   重置
1880
  		})
39bcd7ca   zhouhaihai   LOG
1881
1882
  
  		if not status then
2bf99d62   zhouhaihai   充值mycard
1883
  			if params.extension_info == "mycard_web" then
2d046fcb   zhouhaihai   通知邮件
1884
  				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
2bf99d62   zhouhaihai   充值mycard
1885
  			end
d705a315   zhouhaihai   充值 整理
1886
1887
1888
  			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
  				result = "success", reward = reward}))
  		end
192b96d3   zhouhaihai   重置
1889
  
d705a315   zhouhaihai   充值 整理
1890
  		return rechargeId
192b96d3   zhouhaihai   重置
1891
1892
1893
1894
1895
1896
1897
  	end
  
  
  	function Role:recharge(params)
  		local id = tonumber(params.id)
  		local rechargeData = csvdb["shop_rechargeCsv"][id]
  		if not rechargeData then
d705a315   zhouhaihai   充值 整理
1898
  			skynet.error("[recharge] recharge id not exist", id)
39bcd7ca   zhouhaihai   LOG
1899
  			return 1
192b96d3   zhouhaihai   重置
1900
1901
  		end
  
3e20f499   测试   完善商城相关协议
1902
  		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
39bcd7ca   zhouhaihai   LOG
1903
  			return 2
c5825110   saicom   新增用户商城相关数据
1904
1905
  		end
  
192b96d3   zhouhaihai   重置
1906
  		local diamondCount = 0
c5825110   saicom   新增用户商城相关数据
1907
1908
  		local reward = {}
  		if rechargeData.shop == 1 then -- 钻石
573d5ade   zhouhaihai   充值
1909
  			local rechargeF = self:getProperty("rechargeF")
192b96d3   zhouhaihai   重置
1910
1911
1912
1913
  			diamondCount = rechargeData.diamond + rechargeData.diamondExtra
  			if not rechargeF[id] then
  				diamondCount = diamondCount + rechargeData.diamondFirst
  				rechargeF[id] = 1
573d5ade   zhouhaihai   充值
1914
  				self:updateProperty({field = "rechargeF", value = rechargeF})
192b96d3   zhouhaihai   重置
1915
  			end
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
1916
  			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
3e20f499   测试   完善商城相关协议
1917
  		elseif rechargeData.shop == 2 then  --通行证商店
39bcd7ca   zhouhaihai   LOG
1918
  			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
b620581a   测试   战令活动,战令相关的任务活动
1919
  			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
3e20f499   测试   完善商城相关协议
1920
  		elseif rechargeData.shop == 3 then  -- 礼包商店
39bcd7ca   zhouhaihai   LOG
1921
  			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
192b96d3   zhouhaihai   重置
1922
  		else
d705a315   zhouhaihai   充值 整理
1923
  			skynet.error("[recharge] invalid recharge shop type " .. id)
39bcd7ca   zhouhaihai   LOG
1924
  			return 3
192b96d3   zhouhaihai   重置
1925
1926
  		end
  
3e20f499   测试   完善商城相关协议
1927
  		if diamondCount > 0 then
706b517e   测试   翻倍掉落活动,商城免费宝箱
1928
  			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
3e20f499   测试   完善商城相关协议
1929
1930
  		end
  
e52c384f   测试   探索指令bug, 充值返利活动
1931
1932
  		self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})
  
192b96d3   zhouhaihai   重置
1933
1934
  		-- 累充
  		local rmb = rechargeData.rmb
573d5ade   zhouhaihai   充值
1935
  		self:updateProperty({field = "rmbC", delta = rmb})
e52c384f   测试   探索指令bug, 充值返利活动
1936
1937
  		self:updateProperty({field = "twdC", delta = rechargeData.twd})
  
8e524d41   zhouhaihai   优化
1938
  		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
192b96d3   zhouhaihai   重置
1939
  
39bcd7ca   zhouhaihai   LOG
1940
  		return nil, reward
192b96d3   zhouhaihai   重置
1941
1942
  	end
  
fb3d084d   测试   月卡赛季卡发送邮件奖励
1943
  	--直接给玩家发送邮件,立即推送小红点
7f9f002d   测试   循环周活动
1944
  	function Role:sendMail(mailId, createTime, reward, contentPms)
fb3d084d   测试   月卡赛季卡发送邮件奖励
1945
1946
1947
1948
1949
1950
  		local tgift = {}
  		if type(reward) == "string" then
  			for _, one in pairs(reward:toTableArray(true)) do
  				tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
  			end
  		else
706b517e   测试   翻倍掉落活动,商城免费宝箱
1951
  			tgift = reward or {}
fb3d084d   测试   月卡赛季卡发送邮件奖励
1952
1953
1954
1955
1956
  		end
  		local gift = ""
  		for k, v in pairs(tgift) do
  			gift = gift .. k.."="..v.." "
  		end
7f9f002d   测试   循环周活动
1957
  		redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
fb3d084d   测试   月卡赛季卡发送邮件奖励
1958
1959
1960
  		self.sendMailFlag = true
  	end
  
1e9cb217   chenyueqi   服务器记录控制引导过程
1961
1962
1963
1964
1965
1966
1967
1968
1969
  	-- 是否需要进行引导
  	function Role:checkOverGuide(guideId,slave)
  		local funcGuide = self:getProperty("funcGuide")
  		if funcGuide:getv(guideId * 1000 + (slave or 0), 0) > 0 then
  			return true
  		end
  		return false
  	end
  
a608cccb   chenyueqi   引导服务端记录
1970
  	-- 保存引导步骤
1e9cb217   chenyueqi   服务器记录控制引导过程
1971
  	function Role:saveGuide(master,slave,force)
a608cccb   chenyueqi   引导服务端记录
1972
1973
1974
1975
  		local newerGuide = self:getProperty("newerGuide")
  		local guide = newerGuide:toArray(true,"=")
  		local sMaster, sSlave = guide[1], guide[2]
  
1e9cb217   chenyueqi   服务器记录控制引导过程
1976
1977
  		if not force and master < sMaster then return end
  		if not force and master <= sMaster and slave < sSlave then return end
a608cccb   chenyueqi   引导服务端记录
1978
  
a7b824ac   chenyueqi   记录新手引导步骤的代码存在bug
1979
1980
1981
1982
1983
1984
1985
  		local funcGuide = self:getProperty("funcGuide")
  		funcGuide = funcGuide:setv(master * 1000 + slave, 1)
  		if funcGuide:getv(master * 1000,0) == 0 then
  			funcGuide = funcGuide:setv(master * 1000, 1)
  		end
  		self:updateProperty({field = "funcGuide", value = funcGuide})
  		self:log("onGuidePoint", {guild_type = 0, guild_id = master, guild_point = slave, guild_pass = 0})
f22a33af   zhouhaihai   自己的日志
1986
  		self:mylog("guide", {desc = "guide_new",int1 = master*1000+slave})
a608cccb   chenyueqi   引导服务端记录
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
  
  		newerGuide = string.format("%d=%d",master,slave)
  		self:updateProperty({field = "newerGuide", value = newerGuide})
  	end
  
  	-- 引导大步骤结束
  	function Role:finishGuide(master)
  		local newerGuide = self:getProperty("newerGuide")
  		local guide = newerGuide:toArray(true,"=")
  		if guide[1] > master then return end
  		
  		local guideCsv = csvdb["guide_mainCsv"]
  		local lastStep = guideCsv[master][#guideCsv[master]]
  		if guideCsv[master + 1] then
  			self:updateProperty({field = "newerGuide", value = string.format("%d=%d",master + 1,1)})
  		else
  			self:updateProperty({field = "newerGuide", value = "9999=1"})
  		end
  	end
37bb4611   测试   付费签到,抽卡阶段奖励,探索指令
2006
2007
  
  	-- 抽卡阶段奖励
eb5ffd1c   测试   世界boss翻牌奖励 活动卡池保底...
2008
  	function Role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
37bb4611   测试   付费签到,抽卡阶段奖励,探索指令
2009
2010
  		local reward = nil
  		local maxCount = 0
eb5ffd1c   测试   世界boss翻牌奖励 活动卡池保底...
2011
  		for k, v in pairs(csvdb["build_extraRewardCsv"][feedbackId]) do
37bb4611   测试   付费签到,抽卡阶段奖励,探索指令
2012
2013
2014
2015
2016
2017
2018
2019
2020
  			if oldVal < k and newVal >= k then
  				reward = v["reward"] or ""
  			end
  			maxCount = k > maxCount and k or maxCount
  		end
  
  		return reward, (newVal >= maxCount and newVal - maxCount or newVal)
  	end
  
53b4b8bd   测试   自动挂机下一关
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
  	-- 获取下一个挂机关卡id
  	function Role:getNextCarbonId(curId)
  		local diff = math.floor(curId / 10000)
  		local chapterId = math.floor((curId / 100) % 100)
  		local subId = curId % 100
  		local nextId = curId + 1
  		local function makeCarbonId(diff, chapterId, subId)
  			return diff * 10000 + chapterId * 100 + subId
  		end
  		if not csvdb["idle_battleCsv"][nextId] then
  			nextId = makeCarbonId(diff, chapterId + 1, 1)
  			if not csvdb["idle_battleCsv"][nextId] then
8cd3770f   测试   挂机关卡可以选择,经验金币根据最高...
2033
2034
  				nextId = makeCarbonId(diff + 1, 1, 1)
  				if not csvdb["idle_battleCsv"][nextId] then
53b4b8bd   测试   自动挂机下一关
2035
  					nextId = 0
53b4b8bd   测试   自动挂机下一关
2036
2037
2038
2039
2040
2041
2042
  				end
  			end
  		end
  
  		return nextId
  	end
  
e52c384f   测试   探索指令bug, 充值返利活动
2043
2044
2045
2046
  	-- 根据累计充值金额计算奖励档位
  	function Role:getPaybackReward(oldVal, newVal)
  		local maxVal, diff, extraReward = 0, 0, ""
  		local gift = ""
4709685d   测试   返利邮件拼接充值档位
2047
  		local checkPoint = {}
e52c384f   测试   探索指令bug, 充值返利活动
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
  		for k, v in pairs(csvdb["rebateCsv"]) do
  			if k > maxVal then
  				maxVal = k
  			end
  			if v.isLoop > diff then
  				diff = v.isLoop
  				extraReward = v.reward
  			end
  			if oldVal < k and newVal > k then
  				gift = gift .. v.reward .. " "
4709685d   测试   返利邮件拼接充值档位
2058
2059
  
  				table.insert(checkPoint, k)
e52c384f   测试   探索指令bug, 充值返利活动
2060
2061
2062
2063
  			end
  		end
  		if newVal > maxVal then
  			local cnt = 0
4709685d   测试   返利邮件拼接充值档位
2064
  			local oldCheckPoint = 0
e52c384f   测试   探索指令bug, 充值返利活动
2065
2066
  			if oldVal < maxVal then
  				cnt = math.floor((newVal - maxVal) / diff)
4709685d   测试   返利邮件拼接充值档位
2067
  				oldCheckPoint = maxVal
e52c384f   测试   探索指令bug, 充值返利活动
2068
2069
  			else
  				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
4709685d   测试   返利邮件拼接充值档位
2070
  				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
e52c384f   测试   探索指令bug, 充值返利活动
2071
2072
2073
  			end
  			for i = 1, cnt do
  				gift = gift .. extraReward .. " "
4709685d   测试   返利邮件拼接充值档位
2074
2075
  
  				table.insert(checkPoint, oldCheckPoint + i * diff)
e52c384f   测试   探索指令bug, 充值返利活动
2076
2077
  			end
  		end
56d191ec   测试   充值返利邮件档位排序
2078
2079
2080
  		table.sort(checkPoint, function(a, b)
  			return a < b
  		end)
4709685d   测试   返利邮件拼接充值档位
2081
  		return gift, checkPoint
e52c384f   测试   探索指令bug, 充值返利活动
2082
  	end
072db127   zhouhaihai   推送
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
  	--[[
  	"hang" : "挂机资源满",
  	"box" : "箱子拆解完毕",
  	"food" : "食物出售完毕",
  	"adv" : "代理拾荒完毕",
  	--]]
  	function Role:pushMsg(params)
  		if not self._pushToken or self._pushToken == "" then return end
  		if params.time <= 0 then
  			self:pushCancel(params)
  			return
  		end
  		local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
  		notifyClient({content = content, time = math.floor(params.time)})
  	end
e52c384f   测试   探索指令bug, 充值返利活动
2098
  
072db127   zhouhaihai   推送
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
  	function Role:pushCancel(params)
  		if not self._pushToken or self._pushToken == "" then return end
  		local content = string.format("push:%d:%s:%s:%s", self:getProperty("id"), params.type, params.slot or 1, self._pushToken)
  		deleteNotify({content = content})
  	end
  
  	function Role:pushCancelAll(ptype)
  		if not self._pushToken or self._pushToken == "" then return end
  		local pattern = string.format("push:%d:*", self:getProperty("id"))
  		if ptype then
  			pattern = string.format("push:%d:%s:*", self:getProperty("id"), ptype)
  		end
  		deleteNotify({pattern = pattern})
  	end
66fe093a   测试   元旦关卡活动
2113
2114
  
  	local CommonRankTime = toUnixtime("2019010100")
576c791c   测试   玛尼英雄帖活动通过任务bug 元旦...
2115
2116
  	local CommonCoef1 = 10000
  	local CommonCoef2 = 10000
66fe093a   测试   元旦关卡活动
2117
2118
2119
2120
2121
2122
  	function Role:updateRankCommon(rankType, rankVal, reserve)
  		if not rankType then return end
  		reserve = reserve or 0
  		local now = skynet.timex()
  		local ct = math.ceil((now - CommonRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
  		ct = 10000 - ct  -- 越早的排名越靠前
576c791c   测试   玛尼英雄帖活动通过任务bug 元旦...
2123
  		local score = (rankVal * CommonCoef1 + ct) * CommonCoef2 + reserve
66fe093a   测试   元旦关卡活动
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
  
  		local roleId = self:getProperty("id")
  		redisproxy:pipelining(function (red)
  			red:zadd(RANK_COMMON..rankType, score, roleId)	--更新分数
  		end)
  	end
  
  	function Role:getRankInfoCommon(rankType)
  		if not rankType then return end
  		local list = {}
  		local rankKey = RANK_COMMON .. rankType
  		local ids = redisproxy:zrevrange(rankKey, 0 , 99, "WITHSCORES")
  		for i = 1, #ids, 2 do
  			local roleId = tonumber(ids[i])
  			local rankVal = tonumber(ids[i + 1])
576c791c   测试   玛尼英雄帖活动通过任务bug 元旦...
2139
  			rankVal = math.floor(math.floor(rankVal / CommonCoef2) / CommonCoef1)
66fe093a   测试   元旦关卡活动
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
  			table.insert(list, {roleId = roleId, player = rankVal})
  		end
  
  		for _, v in ipairs(list) do
  			local _, curInfo = rpcRole(v.roleId, "friendSInfo")
  			curInfo.ltime = nil
  			curInfo.rankVal = v.player
  			v.player = curInfo
  		end
  
  		local rank = redisproxy:ZREVRANK(rankKey, self:getProperty("id"))
  		if not rank then
  			rank = -1
  		else
  			rank = rank + 1
  		end
  		return {list = list, rank = rank}
  	end
  
43a6d57e   测试   拾荒活动
2159
2160
2161
2162
2163
2164
2165
2166
2167
  	function Role:addHeroFaith(heroId, exp)
  		local hero = self.heros[heroId]
  		if not hero then
  			return
  		end
  
  		hero:addHeroFaith(exp)
  		return hero:getProperty("faith")
  	end
66fe093a   测试   元旦关卡活动
2168
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
2169
2170
2171
  end
  
  return RolePlugin