Blame view

src/models/RolePlugin.lua 75.9 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()
3d8468b2   liuzujun   火花系统
15
  		self:loadSparks()
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,
3d8468b2   liuzujun   火花系统
100
101
102
103
104
  			[ItemType.Spark] = function()
  				for _= 1, count do
  					self:addSpark({id = itemId, notNotify = pms.notNotify, log = pms.log})
  				end
  			end,
00115a7a   zhouahaihai   奖励发放
105
106
107
  			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
  				count = 0
  			end,
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
108
  			[ItemType.FuncOpen] = function()
44c6e479   zhouhaihai   增加部分日志
109
  				self:funcOpen(itemId, count, pms)
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
110
  			end,
993def2f   zhouhaihai   碎片直接转换为其他碎片
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
  			[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   调理剂生产和使用逻辑优化
140
141
142
  			[ItemType.Potion] = function ()
  				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
  			end,
8eaed74e   liuzujun   战令活动开启时清除购买记录,新增B...
143
  			[ItemType.BossTicket] = function ()
c6a4c456   liuzujun   boss挑战门票购买可以超出上限
144
145
146
  				local isOpen, actId = self.activity:isOpen("ChallengeLevel")
  				if not isOpen then return end
  				self.activity:getBattleTicket(actId)
8eaed74e   liuzujun   战令活动开启时清除购买记录,新增B...
147
148
149
150
  				local actData = self.activity:getActData("ChallengeLevel")
  				actData["ticket"] = (actData["ticket"] or 0) + count
  				self.activity:updateActData("ChallengeLevel", actData)
  			end,
be9c9ca6   zhouahaihai   角色评论
151
  		}
dfa9ae5e   liuzujun   战令任务活动
152
153
154
155
156
157
158
159
160
  
  		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   背包
161
  		-- 对数量筛查
1a1a6375   gaofengduan   fix lua warning
162
  		count = checkItemCount(self, itemId, count)
312b9db5   zhouahaihai   背包
163
  		if count ~= 0 then
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
164
165
166
  			if itemIdAward[itemId] then
  				itemIdAward[itemId]()
  			elseif itemTypeAward[curType] then
312b9db5   zhouahaihai   背包
167
168
  				itemTypeAward[curType]()
  			else
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
169
170
171
  				pms.itemId = itemId
  				pms.count = count
  				self:addItem(pms)
312b9db5   zhouahaihai   背包
172
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
173
174
  		end
  
a7b69ec2   zhouhaihai   完善道具转换
175
  		return count, change --  count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
8c74292c   zhouahaihai   增加item 以及 角色突破
176
177
178
179
180
  	end
  
  
  	-- 发奖功能入口  award string id=count or {[id] = count}
  	function Role:award(gift, params)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
181
  		params = params or {}
8c74292c   zhouahaihai   增加item 以及 角色突破
182
  		local tgift = {}
46fac6f1   zhouahaihai   酱料
183
  		if type(gift) == "string" then
8c74292c   zhouahaihai   增加item 以及 角色突破
184
185
186
187
188
189
190
191
  			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   完善道具转换
192
193
194
195
196
  		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 以及 角色突破
197
  			if next(change) then
a7b69ec2   zhouhaihai   完善道具转换
198
199
200
201
202
203
  				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   背包
204
  				end
8c74292c   zhouahaihai   增加item 以及 角色突破
205
206
  			end
  		end
7bb30dca   zhouhaihai   修改发奖
207
  		if not next(allChange) then allChange = nil end
8c74292c   zhouahaihai   增加item 以及 角色突破
208
209
210
  		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
  	end
  
7bb30dca   zhouhaihai   修改发奖
211
212
213
214
215
216
  
  	function Role:packReward(reward, change)
  		if not reward then return nil end
  		return {reward = reward, change = change}
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
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
  	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
18722d1e   liuzujun   修改过期头像邮件发送方式 send...
250
251
  									self:sendMail(19)
  									--redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
bd4fb541   zhouhaihai   增加物品过期系统
252
253
254
255
256
257
258
259
260
261
262
263
264
  								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   优化
265
  		self:mylog("role_action", {desc = "changeHead", int1 = id})
bd4fb541   zhouhaihai   增加物品过期系统
266
267
  	end
  
44c6e479   zhouhaihai   增加部分日志
268
  	function Role:addPlayExp(addExp, params)
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
269
  		local level = self:getProperty("level")
39bcd7ca   zhouhaihai   LOG
270
  		local oldLevel = level
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
271
272
273
  		if not csvdb["player_expCsv"][level + 1] then
  			return
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
274
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
275
276
277
278
279
280
  		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   liuzujun   限时礼包
281
  				self:checkTaskEnter("RoleLevelUp", {level = level})
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
282
283
284
285
  			else
  				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
  			end
  		end
39bcd7ca   zhouhaihai   LOG
286
  		if level > oldLevel then
c6f3e36c   zhouhaihai   错误的语法
287
288
289
290
291
  			if params.log then
  				local log = params.log
  				self:log("setLevel", {
  					level_before = oldLevel, 
  					level_changemain = log.desc,
43293781   zhouhaihai   日志bug
292
  					level_changedetail = log.int1 or 0,
f3eb34b1   liuzujun   删除无用日志
293
  					level_reward = {},
c6f3e36c   zhouhaihai   错误的语法
294
295
296
297
  				})
  			else
  				print("addPlayExp no log ", debug.traceback())
  			end
f22a33af   zhouhaihai   自己的日志
298
299
300
  		end
  
  		if params.log then
7d31daa8   zhouhaihai   调整压测
301
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
302
303
304
  			if log["cint1"] or log["cint2"] then
  				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
  			end
c6f3e36c   zhouhaihai   错误的语法
305
  			
f22a33af   zhouhaihai   自己的日志
306
307
308
309
310
311
312
313
  
  			log["cint1"] = addExp
  			log["cint2"] = newExp
  			log["cint3"] = level
  
  			self:mylog("player_exp", log)
  		else
  			print("addPlayExp no log ", debug.traceback())
44c6e479   zhouhaihai   增加部分日志
314
315
  		end
  
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
316
  		self:updateProperties({level = level, exp = newExp}, params.notNotify)
e3c5cc5e   zhouhaihai   跨服竞技场over
317
  		self:changeCrossServerPvpSelfInfo("level")
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
318
319
  	end
  
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
320
  	function Role:addPotion(params)
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
  		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 以及 角色突破
350
351
  	function Role:addItem(params)
  		params = params or {}
d02368d3   zhouhaihai   数据保护
352
  		params.count = math.floor(params.count or 0)
312b9db5   zhouahaihai   背包
353
354
355
356
  		if params.itemId ==  ItemId.Diamond then
  			self:gainDiamond(params)
  			return
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
357
358
359
360
361
362
363
364
365
  		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   增加部分日志
366
  
c59e058b   zhouhaihai   新一批日志记录
367
  		self:logItems(params.itemId, origin, nums, params.log)
f22a33af   zhouhaihai   自己的日志
368
  		if params.log then
7d31daa8   zhouhaihai   调整压测
369
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
370
371
372
373
374
375
376
377
378
379
380
381
382
  			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   增加部分日志
383
  
8c74292c   zhouahaihai   增加item 以及 角色突破
384
385
386
387
  		self:setProperty("items", items)
  		if not params.notNotify then
  			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.itemId] = nums}))
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
388
389
390
391
  	end
  
  	function Role:checkItemEnough(itemCountT)
  		local less = {}
87cc3a35   zhengshouren   餐厅建筑升级逻辑
392
  		if not next(itemCountT) then
7d31daa8   zhouhaihai   调整压测
393
  			return true, less
87cc3a35   zhengshouren   餐厅建筑升级逻辑
394
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
395
  		for itemId, count in pairs(itemCountT) do
87cc3a35   zhengshouren   餐厅建筑升级逻辑
396
397
398
399
400
401
402
403
  			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 以及 角色突破
404
405
406
407
408
409
  			end
  		end
  		return (not next(less)), less -- 是否足够,,缺什么缺多少
  	end
  
  	function Role:costItems(itemCountT, params)
36204e3c   zhengshouren   贩卖逻辑
410
  		local pms = clone(params or {})
312b9db5   zhouahaihai   背包
411
  		if itemCountT[ItemId.Diamond] then  --优先扣除钻石
312b9db5   zhouahaihai   背包
412
413
414
415
  			pms.count = itemCountT[ItemId.Diamond]
  			if not self:costDiamond(pms) then
  				return
  			end
312b9db5   zhouahaihai   背包
416
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
417
  		for itemId, count in pairs(itemCountT) do
0a6fcddc   zhouhaihai   log 发现的bug
418
419
420
421
422
423
  			if itemId ~= ItemId.Diamond then
  				pms.itemId = itemId
  				pms.count = - count
  				self:addItem(pms)
  				self:itemDeltaEvent(pms)
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
424
  		end
312b9db5   zhouahaihai   背包
425
  		return true
8c74292c   zhouahaihai   增加item 以及 角色突破
426
427
  	end
  
89760dbe   chenyueqi   拆解室功能重写
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
  	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   修复存在的冒险进不去的玩家
447
  			self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
89760dbe   chenyueqi   拆解室功能重写
448
449
450
  		end
  	end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
451
  	function Role:getItemCount(itemId)
43cc5f51   gaofengduan   调整 equip 数据结构
452
  		if itemId == ItemId.Diamond then
312b9db5   zhouahaihai   背包
453
454
  			return self:getAllDiamond()
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
455
456
457
  		return self:getProperty("items"):getv(itemId, 0)
  	end
  
312b9db5   zhouahaihai   背包
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
  	function Role:getAllDiamond()
  		return self:getProperty("diamond") + self:getProperty("reDiamond")
  	end
  
  	function Role:gainDiamond(params)
  		if not params or type(params) ~= "table" then return false end
  		local count = tonum(params.count)
  		if isnan(count) then
  			return false
  		end
  		local origind = self:getProperty("diamond")
  		local originr = self:getProperty("reDiamond")
  		local origin = origind + originr
  		if params.isRecharge then
  			self:incrProperty("reDiamond", count)
  		else
  			self:incrProperty("diamond", count)
  		end
44c6e479   zhouhaihai   增加部分日志
476
  
c59e058b   zhouhaihai   新一批日志记录
477
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
478
  		if params.log then
7d31daa8   zhouhaihai   调整压测
479
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
480
481
482
483
484
485
486
487
488
489
  			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   背包
490
491
492
493
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
312b9db5   zhouahaihai   背包
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
  	function Role:costDiamond(params)
  		if not params or type(params) ~= "table" then return false end
  		local count = tonum(params.count)
  		if isnan(count) then
  			return false
  		end
  		if count <= 0 then
  			return false
  		end
  		local origind = self:getProperty("diamond")
  		local originr = self:getProperty("reDiamond")
  		local origin = origind + originr
  
  		if origin < 0 then
  			return false
  		end
  		if origin < count then
  			return false
  		end
  		local last = count
  		local costFirst = {"diamond", "reDiamond"}
  		if params.isRecharge then
  			costFirst = {"reDiamond", "diamond"}
  		end
  		last  = math.max(last - self:getProperty(costFirst[1]), 0)
  		if last < count then
  			self:incrProperty(costFirst[1], last - count)
  		end
  		if last > 0 then
  			self:incrProperty(costFirst[2], -last)
  		end
  
c59e058b   zhouhaihai   新一批日志记录
526
527
  
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
528
  		if params.log then
7d31daa8   zhouhaihai   调整压测
529
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
530
531
532
533
534
535
536
537
538
  			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   增加部分日志
539
  
312b9db5   zhouahaihai   背包
540
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
dfa9ae5e   liuzujun   战令任务活动
541
542
  
  		self:checkTaskEnter("CostDiamond", {count = count})
312b9db5   zhouahaihai   背包
543
544
545
  		return true
  	end
  
0a07bdd9   zhouahaihai   角色升级 。gm
546
547
  	function Role:addHero(params)
  		local roleId = self:getProperty("id")
0a07bdd9   zhouahaihai   角色升级 。gm
548
  		local heroType = params.type
056c01a0   zhouhaihai   简化装备
549
  		if self:isHaveHero(heroType) then return end
53e8037e   zhouhaihai   任务
550
551
  		local unitData = csvdb["unitCsv"][heroType] 
  		if not unitData then return false end
056c01a0   zhouhaihai   简化装备
552
553
  
  		local heroId = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "hero", 1))
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
554
  
0a07bdd9   zhouahaihai   角色升级 。gm
555
556
  		redisproxy:sadd(string.format(R_HEROS, roleId), heroId)
  
0a07bdd9   zhouahaihai   角色升级 。gm
557
558
559
560
  		local heroInfo = {
  			key = string.format(R_HERO, roleId, heroId),
  			id 	= heroId,
  			type= heroType,
fb73effd   wangyujie   英雄初始觉醒等级从GD取
561
  			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
0a07bdd9   zhouahaihai   角色升级 。gm
562
  		}
bcbb0c7b   zhouhaihai   3星解锁 cg
563
  		if heroInfo.wakeL == 3 then
3ed95697   zhouhaihai   成就 参数错误
564
  			self:checkTaskEnter("WakeCG", {heroType = heroType})
bcbb0c7b   zhouhaihai   3星解锁 cg
565
  		end
0a07bdd9   zhouahaihai   角色升级 。gm
566
567
568
  		local newHero = require("models.Hero").new(heroInfo)
  		newHero:create()
  		newHero.owner = self
8c74292c   zhouahaihai   增加item 以及 角色突破
569
  		newHero:saveBattleValue()
0a07bdd9   zhouahaihai   角色升级 。gm
570
  		self.heros[heroId] = newHero
00bf6029   liuzujun   限时礼包,抽卡ssr广播
571
572
573
574
575
  		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   liuzujun   英雄帖活动初始化
576
  		self:checkTaskEnter("HeroQualityCollect", {})
0a07bdd9   zhouahaihai   角色升级 。gm
577
578
579
580
581
582
  		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   新一批日志记录
583
584
585
  
  		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
f22a33af   zhouhaihai   自己的日志
586
  		if params.log then
7d31daa8   zhouhaihai   调整压测
587
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
588
589
590
591
592
593
594
595
596
  			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   添加 测试账号 方法
597
  		return true, newHero
056c01a0   zhouhaihai   简化装备
598
599
600
601
602
603
  	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   添加 测试账号 方法
604
  				return hero
056c01a0   zhouhaihai   简化装备
605
606
  			end
  		end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
607
608
  	end
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
609
610
611
612
613
614
615
616
617
618
  	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   登陆成功。 增加数据结构修正功能
619
  
0a07bdd9   zhouahaihai   角色升级 。gm
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
  	function Role:loadHeros()
  		local roleId = self:getProperty("id")
  		local heroIds = redisproxy:smembers(string.format(R_HEROS, roleId))
  		local redret = redisproxy:pipelining(function (red)
  			for _, heroId in ipairs(heroIds) do
  				red:hgetall(string.format(R_HERO, roleId, heroId))
  			end
  		end)
  		for index, heroId in ipairs(heroIds) do
  			local hero = require("models.Hero").new({key = string.format(R_HERO, roleId, heroId)})
  			if hero:load(table.array2Table(redret[index])) then
  				hero.owner = self
  				self.heros[tonumber(heroId)] = hero
  			end
  		end
  	end
  
be9c9ca6   zhouahaihai   角色评论
637
638
639
640
641
642
643
644
645
646
647
  	function Role:loadDaily()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_DAILY, roleId)
  		self.dailyData = require("models.Daily").new({key = dataKey})
  		self.dailyData.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.dailyData:create()
  		else
  			self.dailyData:load()
  		end
  	end
46fac6f1   zhouahaihai   酱料
648
  
9a1c54b2   zhouhaihai   活动
649
650
651
652
653
654
655
656
657
658
659
660
  	function Role:loadActivity()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_ACTIVITY, roleId)
  		self.activity = require("models.Activity").new({key = dataKey})
  		self.activity.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.activity:create()
  		else
  			self.activity:load()
  		end
  	end
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
661
662
663
664
665
666
667
668
669
670
671
672
  	function Role:loadDiner()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_DINER, roleId)
  		self.dinerData = require("models.Diner").new({key = dataKey})
  		self.dinerData.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.dinerData:create()
  		else
  			self.dinerData:load()
  		end
  	end
  
440aa055   zhouhaihai   聊天
673
  
43cc5f51   gaofengduan   调整 equip 数据结构
674
  	function Role:loadEquips()
056c01a0   zhouhaihai   简化装备
675
  		-- 放role 里面了
43cc5f51   gaofengduan   调整 equip 数据结构
676
677
  	end
  
c5825110   saicom   新增用户商城相关数据
678
679
680
681
682
683
684
685
686
687
688
689
  	function Role:loadStoreInfo()
  		local roleId = self:getProperty("id")
  		local dataKey = string.format(R_STORE, roleId)
  		self.storeData = require("models.Store").new({key = dataKey})
  		self.storeData.owner = self
  		if not redisproxy:exists(dataKey) then
  			self.storeData:create()
  		else
  			self.storeData:load()
  		end
  	end
  
056c01a0   zhouhaihai   简化装备
690
691
692
693
694
695
696
  	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   新一批日志记录
697
698
  		local oldCount = curTypeEquips[equipLv] or 0
  		local curCount = oldCount + count
056c01a0   zhouhaihai   简化装备
699
700
701
702
703
704
705
706
  
  		-- 是否足够上层判断
  		if curCount < 0 then
  			curCount = 0
  			curTypeEquips[equipLv] = nil
  		else
  			curTypeEquips[equipLv] = curCount
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
707
  
056c01a0   zhouhaihai   简化装备
708
709
710
711
712
713
714
  		if next(curTypeEquips) then
  			equips[equipType] = curTypeEquips
  		else
  			equips[equipType] = nil
  		end
  
  		self:setProperty("equips", equips)
44c6e479   zhouhaihai   增加部分日志
715
  
c59e058b   zhouhaihai   新一批日志记录
716
  		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
f22a33af   zhouhaihai   自己的日志
717
  		if pms.log then
7d31daa8   zhouhaihai   调整压测
718
  			local log = clone(pms.log)
f22a33af   zhouhaihai   自己的日志
719
720
721
722
723
724
725
726
727
728
729
730
731
732
  			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   增加部分日志
733
  
056c01a0   zhouhaihai   简化装备
734
735
  		if not pms.notNotify then
  			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
43cc5f51   gaofengduan   调整 equip 数据结构
736
737
738
739
  		end
  	end
  
  	function Role:getEquipCount(typ,lv)
056c01a0   zhouhaihai   简化装备
740
  		return (self:getProperty("equips")[typ] or {})[lv] or 0
43cc5f51   gaofengduan   调整 equip 数据结构
741
742
743
  	end
  
  	function Role:loadRunes()
43cc5f51   gaofengduan   调整 equip 数据结构
744
  		local roleId = self:getProperty("id")
ad484303   gaofengduan   add rune
745
746
747
748
749
750
751
752
753
754
755
756
  		local runeIds = redisproxy:smembers(string.format(R_RUNEIDS, roleId))
  		local redret = redisproxy:pipelining(function (red)
  			for _, runeId in ipairs(runeIds) do
  				red:hgetall(string.format(R_RUNE, roleId, runeId))
  			end
  		end)
  		for index, runeId in ipairs(runeIds) do
  			local rune = require("models.Rune").new({key = string.format(R_RUNE, roleId, runeId)})
  			if rune:load(table.array2Table(redret[index])) then
  				rune.owner = self
  				self.runeBag[tonumber(runeId)] = rune
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
757
758
759
  		end
  	end
  
3d8468b2   liuzujun   火花系统
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
  	function Role:loadSparks()
  		local roleId = self:getProperty("id")
  		local sparkIds = redisproxy:smembers(string.format(R_SPARKIDS, roleId))
  		local redret = redisproxy:pipelining(function (red)
  			for _, sparkId in ipairs(sparkIds) do
  				red:hgetall(string.format(R_SPARK, roleId, sparkId))
  			end
  		end)
  		for index, sparkId in ipairs(sparkIds) do
  			local spark = require("models.Spark").new({key = string.format(R_SPARK, roleId, sparkId)})
  			if spark:load(table.array2Table(redret[index])) then
  				spark.owner = self
  				self.sparkBag[tonumber(sparkId)] = spark
  			end
  		end
  	end
  
ad484303   gaofengduan   add rune
777
  	-- 0 为操作成功
43cc5f51   gaofengduan   调整 equip 数据结构
778
  	function Role:addRune(params)
ad484303   gaofengduan   add rune
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
  		if params.type and params.id then
  			local set  = csvdb["runeCsv"][params.type]
  			if not set then return 2 end
  			local data = set[params.id]
  			if not data then return 3 end
  
  			local roleId = self:getProperty("id")
  			local runeUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "rune", 1))
  
  			redisproxy:sadd(string.format(R_RUNEIDS, roleId), runeUid)
  
  			local heroInfo = {
  				key = string.format(R_RUNE, roleId, runeUid),
  				uid = runeUid,
  				type = params.type,
  				id = params.id,
  			}
  
  			local newRune = require("models.Rune").new(heroInfo)
  			newRune:create()
  			newRune:generateAttrs()
  			newRune.owner = self
  			self.runeBag[runeUid] = newRune
ee999bde   zhouhaihai   零件优化
802
803
804
805
806
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newRune:data())
  				SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  			end
89338c47   zhouhaihai   技能目标
807
  			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
44c6e479   zhouhaihai   增加部分日志
808
  
c59e058b   zhouhaihai   新一批日志记录
809
  			self:logItems(params.id, 0, 1, params.log)
f22a33af   zhouhaihai   自己的日志
810
  			if params.log then
7d31daa8   zhouhaihai   调整压测
811
  				local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
812
813
814
815
816
817
818
819
820
821
822
823
  				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   增加部分日志
824
  
c7ecb87f   zhouhaihai   添加 测试账号 方法
825
  			return 0, newRune
43cc5f51   gaofengduan   调整 equip 数据结构
826
  		else
ad484303   gaofengduan   add rune
827
  			return 1
43cc5f51   gaofengduan   调整 equip 数据结构
828
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
829
830
  	end
  
3d8468b2   liuzujun   火花系统
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
  	-- 0 为操作成功
  	function Role:addSpark(params)
  		if params.id then
  			local set  = csvdb["sparkCsv"][params.id]
  			if not set then return 2 end
  			local data = set[0]
  			if not data then return 3 end
  
  			local roleId = self:getProperty("id")
  			local sparkUid = tonum(redisproxy:hincrby(string.format(R_INCR, roleId), "spark", 1))
  
  			redisproxy:sadd(string.format(R_SPARKIDS, roleId), sparkUid)
  
  			local sparkInfo = {
  				key = string.format(R_SPARK, roleId, sparkUid),
  				id = sparkUid,
  				cfg_id = params.id,
  			}
  
  			local newSpark = require("models.Spark").new(sparkInfo)
  			newSpark:create()
  			newSpark:addAttr(data.attr:toNumMap())
  			newSpark.owner = self
  			self.sparkBag[sparkUid] = newSpark
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newSpark:data())
3d8468b2   liuzujun   火花系统
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
  				SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
  			end
  			--self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
  
  			self:logItems(params.id, 0, 1, params.log)
  			if params.log then
  				local log = clone(params.log)
  				if log["cint1"] or log["cint2"] or log["cint3"] then
  					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
  				end
  
  				log["cint1"] = sparkUid
  				log["cint2"] = params.cfg_id
  
  				self:mylog("in_spark", log)
  			else
  				print("addSpark no log ", debug.traceback())
  			end
  
  			return 0, newSpark
  		else
  			return 1
  		end
  	end
  
  	function Role:delSparks(sparkIds, params) -- 批量删除 {id, }
  		params = params or {}
  		local roleId = self:getProperty('id')
  		local bDel = {}
  		for _, sparkId in pairs(sparkIds) do
  			local spark = self.sparkBag[sparkId]
  			if spark then
  
  				self:logItems(spark:getProperty("id"), 1, 0, params.log)
  				if params.log then
  					local log = clone(params.log)
  					if log["cint1"] or log["cint2"] then
  						print("delSpark error log have cint1 or cint2 ", debug.traceback())
  					end
  
  					log["cint1"] = sparkId
  					log["cint2"] = spark:getProperty("cfg_id")
  
  					self:mylog("out_spark", log)
  				else
  					print("delSparks no log ", debug.traceback())
  				end
  
  				self.sparkBag[sparkId] = nil
  				table.insert(bDel, sparkId)
  			end
  		end
  
  		redisproxy:pipelining(function (red)
  			for _, sparkId in pairs(bDel) do
  				red:del(string.format(R_SPARK, roleId, sparkId))
  				red:srem(string.format(R_SPARKIDS, roleId), sparkId)
  			end
  		end)
  		local response = {}
  		for _, sparkId in pairs(bDel) do
  			table.insert(response, {id = sparkId, bDel = true})
  		end
  
  		SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
  	end
  
44c6e479   zhouhaihai   增加部分日志
925
926
  	function Role:delRunes(runeIds, params) -- 批量删除 {id, }
  		params = params or {}
497f9a67   zhouhaihai   卖零件
927
928
  		local roleId = self:getProperty('id')
  		local bDel = {}
2445248d   zhouhaihai   去掉热门料理
929
  		for _, runeId in pairs(runeIds) do
497f9a67   zhouhaihai   卖零件
930
931
  			local rune = self.runeBag[runeId]
  			if rune and rune:getProperty("refer") == 0 then
44c6e479   zhouhaihai   增加部分日志
932
  
c59e058b   zhouhaihai   新一批日志记录
933
  				self:logItems(rune:getProperty("id"), 1, 0, params.log)
f22a33af   zhouhaihai   自己的日志
934
  				if params.log then
7d31daa8   zhouhaihai   调整压测
935
  					local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
936
937
938
939
940
941
942
943
944
945
946
947
  					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   增加部分日志
948
  
497f9a67   zhouhaihai   卖零件
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
  				self.runeBag[runeId] = nil
  				table.insert(bDel, runeId)
  			end
  		end
  
  		redisproxy:pipelining(function (red)
  			for _, runeId in pairs(bDel) do
  				red:del(string.format(R_RUNE, roleId, runeId))
  				red:srem(string.format(R_RUNEIDS, roleId), runeId)
  			end
  		end)
  		local response = {}
  		for _, runeId in pairs(bDel) do
  			table.insert(response, {uid = runeId, bDel = true})
  		end
  		SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  	end
  
ee3ac0b5   gaofengduan   fix magic
967
968
969
970
971
  	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 数据结构
972
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
973
  		end
ee3ac0b5   gaofengduan   fix magic
974
  		return runeSet
43cc5f51   gaofengduan   调整 equip 数据结构
975
976
  	end
  
70cc72d7   zhouhaihai   拾荒bug
977
  	function Role:getAdvData(notNotify)
43cc5f51   gaofengduan   调整 equip 数据结构
978
  		if not self.advData then
46fac6f1   zhouahaihai   酱料
979
  			self.advData = require("adv.Adv").new(self)
70cc72d7   zhouhaihai   拾荒bug
980
981
982
983
984
985
986
  			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   酱料
987
988
989
  		end
  		return self.advData
  	end
bd15e9bc   zhouhaihai   购买剧情
990
991
992
993
994
995
996
997
998
999
1000
1001
  
  	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   属性计算
1002
1003
1004
  
  	function Role:warningHeartTooQuick()
  		-- 加速器检测
e3c5cc5e   zhouhaihai   跨服竞技场over
1005
1006
1007
1008
  		local heartWarning = self:getProperty("heartWarning")
  		heartWarning = heartWarning + 1
  		self:setProperty("heartWarning", heartWarning)
  		if heartWarning == 50 then
44c6e479   zhouhaihai   增加部分日志
1009
  			self:setBan(30, 1) --封禁 30天
e3c5cc5e   zhouhaihai   跨服竞技场over
1010
1011
1012
1013
  			return
  		end
  		if heartWarning < 50 and heartWarning % 5 == 0 then
  			self:sendGmMsg("server_accountBanned_warning")
8e524d41   zhouhaihai   优化
1014
  			self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
e3c5cc5e   zhouhaihai   跨服竞技场over
1015
1016
1017
1018
1019
1020
1021
  		end
  	end
  
  	function Role:setBan(time, banType)
  		time = time or 0
  		banType = banType or 0
  		local now = skynet.timex()
edf2ee12   zhouhaihai   防作弊
1022
  		if time <= 0 then
e3c5cc5e   zhouhaihai   跨服竞技场over
1023
1024
1025
  			self:setProperty("banTime", 0)
  			self:setProperty("banType", 0)
  			self:setProperty("heartWarning", 0)
8e524d41   zhouhaihai   优化
1026
  			self:mylog("role_action", {desc = "ban_rm"})
e3c5cc5e   zhouhaihai   跨服竞技场over
1027
  		else
edf2ee12   zhouhaihai   防作弊
1028
  			self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
edf2ee12   zhouhaihai   防作弊
1029
  			self:setProperty("banTime", math.ceil(now + 86400 * time))
e3c5cc5e   zhouhaihai   跨服竞技场over
1030
  			self:setProperty("banType", banType)
edf2ee12   zhouhaihai   防作弊
1031
1032
  			self:resetRank()
  			self:mylog("role_action", {desc = "ban", int1 = math.ceil(time), int2 = banType})
e3c5cc5e   zhouhaihai   跨服竞技场over
1033
1034
1035
  		end
  	end
  
edf2ee12   zhouhaihai   防作弊
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
  	-- 清掉所有排行榜
  	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
1059
1060
  	function Role:sendGmMsg(text, isNotKey)
  		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
edf2ee12   zhouhaihai   防作弊
1061
1062
1063
1064
1065
1066
1067
  		
  		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   属性计算
1068
  	end
a41b9076   zhouhaihai   增加羁绊方法
1069
  
e8ca14c4   zhouhaihai   羁绊加成去掉
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
  	-- 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
1081
  		
e8ca14c4   zhouhaihai   羁绊加成去掉
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
  	-- 	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   羁绊加成
1114
  
ccbafe67   zhouhaihai   冒险神器和buff
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
  	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   羁绊加成去掉
1134
1135
  	-- function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
  	function Role:getRealBattleValue(heros) -- 获取队伍战斗力  羁绊加成
f317b790   zhouhaihai   pvp 遗留
1136
  		heros = heros or {}
e8ca14c4   zhouhaihai   羁绊加成去掉
1137
  		-- local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
b53593b5   zhouhaihai   羁绊加成
1138
1139
1140
1141
  		local battleValue = 0
  		for _, id in pairs(heros) do
  			local hero = self.heros[id]
  			if hero then
e8ca14c4   zhouhaihai   羁绊加成去掉
1142
1143
  				-- battleValue = battleValue + hero:getBattleValue(activeRelation)
  				battleValue = battleValue + hero:getBattleValue()
b53593b5   zhouhaihai   羁绊加成
1144
1145
1146
1147
  			end
  		end
  		return battleValue
  	end
09be9059   zhouhaihai   冒险接口
1148
1149
  
  	function Role:getAdvHangLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1150
  		return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
09be9059   zhouhaihai   冒险接口
1151
  	end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1152
  
fc316d1f   zhouhaihai   冒险体力优化
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
  	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   微调 结算返还
1167
  		if change == 0 then return end
fc316d1f   zhouhaihai   冒险体力优化
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
  		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   冒险体力优化
1178
1179
  		self:updateProperties({
  			advC = count + change,
92ef9591   zhouhaihai   冒险次数
1180
  			advCT = nextTime,
fc316d1f   zhouhaihai   冒险体力优化
1181
1182
1183
  		})
  	end
  
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1184
  	function Role:getAdvElLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1185
  		return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1186
1187
  	end
  
d232676a   zhouhaihai   功能解锁 冒险返回
1188
1189
1190
1191
1192
1193
  	-- 走 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 结构
1194
  		if self:checkHangPass(data.carbonId) then 
d232676a   zhouhaihai   功能解锁 冒险返回
1195
1196
1197
1198
1199
  			return true
  		else
  			return false
  		end 
  	end
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1200
  
d232676a   zhouhaihai   功能解锁 冒险返回
1201
  	-- 走 unlock 表的主动解锁
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1202
1203
1204
1205
  	function Role:isFuncOpen(func)
  		return self:getProperty("funcOpen")[func] == 1
  	end
  
bab30666   zhouhaihai   增加通用功能等级 字段
1206
1207
  	function Role:getFuncLv(func)
  		return self:getProperty("funcLv")[func] or 1
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1208
1209
  	end
  
ccbafe67   zhouhaihai   冒险神器和buff
1210
1211
1212
1213
1214
1215
1216
1217
1218
  	-- 参数有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 神器
1219
  		elseif curData.unlock == 2 then  -- 特殊神器 不可解锁
ccbafe67   zhouhaihai   冒险神器和buff
1220
  			return isCheckLevel
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
1221
  		elseif curData.unlock == 3 then
ccbafe67   zhouhaihai   冒险神器和buff
1222
1223
1224
1225
1226
  			return isEndless
  		end
  		return true
  	end
  
44c6e479   zhouhaihai   增加部分日志
1227
1228
1229
  	function Role:funcOpen(func, count, params)
  		params = params or {}
  		
ad88ba14   zhouhaihai   工坊 bug
1230
  		count = count or 1
44c6e479   zhouhaihai   增加部分日志
1231
  
887c1843   zhouhaihai   日志新一批
1232
  		self:logItems(func, 0, count, params.log)
f22a33af   zhouhaihai   自己的日志
1233
  		if params.log then
7d31daa8   zhouhaihai   调整压测
1234
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
  			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   增加部分日志
1246
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1247
  		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
bab30666   zhouhaihai   增加通用功能等级 字段
1248
  			local unlockData = csvdb["unlockCsv"][func]
9be3f3ea   zhouhaihai   日志需求
1249
  			self:log("function_open", {function_id = func})
db3c56ad   zhouhaihai   冒险相关
1250
  			if unlockData.type == 4 then -- 解锁神器
f45d3a7b   zhouhaihai   adv_unlock
1251
1252
1253
  				if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
  					self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
  				end
4b61215f   zhouhaihai   语法错误
1254
  			elseif TypeIsFunc[unlockData.type] then
bab30666   zhouhaihai   增加通用功能等级 字段
1255
  				if unlockData.value1 == 0 or unlockData.value1 == 1 then
f45d3a7b   zhouhaihai   adv_unlock
1256
1257
1258
  					if self:getProperty("funcOpen")[unlockData.type] ~= 1 then
  						self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1259
1260
  				else
  					local oldV = self:getFuncLv(unlockData.type)
59835765   zhouhaihai   排行榜
1261
  					local newLv = math.min(oldV + count, unlockData.value2)
f45d3a7b   zhouhaihai   adv_unlock
1262
1263
1264
  					if oldV ~= newLv then
  						self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1265
1266
  				end
  			else
f45d3a7b   zhouhaihai   adv_unlock
1267
1268
1269
  				if self:getProperty("funcOpen")[func] ~= 1 then
  					self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
  				end
bab30666   zhouhaihai   增加通用功能等级 字段
1270
  			end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1271
1272
1273
  		end
  	end
  
e51ff6d2   zhouhaihai   冒险~
1274
  	function Role:advChapterIsOpen(chapterId)
e51ff6d2   zhouhaihai   冒险~
1275
  		local chapterData = csvdb["adv_chapterCsv"][chapterId]
33be3111   zhouhaihai   修改hangPass 结构
1276
  		if chapterData.prepose ~= 0 and not self:checkHangPass(chapterData.prepose) then return false end
e51ff6d2   zhouhaihai   冒险~
1277
  		return true
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
  	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   无尽模式
1291
  	-- 赛季检查
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1292
1293
1294
1295
  	function Role:advEndlessSeasonCheck(notNotify)
  		--  重置一下冒险
  		local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
  		if self:getProperty("advElS") ~= nowSeason then
0e3ab88d   zhouhaihai   中继层
1296
1297
1298
1299
  			-- 胡博文让注释掉 衰减 从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   赛季更新完善 无尽冒险排行榜
1300
1301
1302
1303
1304
1305
1306
  
  			-- 正在无尽冒险清掉
  			local adv = self:getAdvData()
  			if adv:isRunning() and adv:isEndless() then
  				adv:forceOver()
  			end
  
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1307
1308
1309
  			-- 路过的中继层重置掉
  			local advRelay = self:getProperty("advRelay")
  			advRelay[-1] = nil
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1310
1311
1312
  			-- 清掉冒险手册
  			self:updateProperties({
  				advEAchiev = {},
0e3ab88d   zhouhaihai   中继层
1313
1314
  				advElM = 0,
  				advElS = nowSeason,
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1315
  				advRelay = advRelay,
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1316
  			}, notNotify)
e1355da3   zhouhaihai   神器 被动
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
  
  
  			-- 重新设定冒险章节和冒险结束时间
  			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   无尽模式
1328
1329
  		end
  	end
59835765   zhouhaihai   排行榜
1330
  
65b551a7   chenyueqi   海港贸易季初版
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
  	-- 结算上期海港贸易季
  	function Role:checkSeaportTrade()
  		local openTime0 = tonum(redisproxy:hget("autoincrement_set", "seaportTime0") or 0)
  		local openTime1 = tonum(redisproxy:hget("autoincrement_set", "seaportTime1") or 0)
  		local openTime2 = tonum(redisproxy:hget("autoincrement_set", "seaportTime2") or 0)
  		local seaport = self:getProperty("seaport") or {}
  		local oldTime = seaport.time or 0
  		local update = false
  
  		local function getReward(reset)
  			-- 全服捐赠奖励
  			local donate = seaport.donate or {}
  			if not reset and (not donate[1] or not donate[2]) then
  				local result = self:getSeaportServerProgress()
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1345
  				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) do
65b551a7   chenyueqi   海港贸易季初版
1346
1347
  					local done = true
  					for id, data in ipairs(set) do
ab2928d9   chenyueqi   海港贸易季结束后自动领取奖励,第二...
1348
  						if donate[idx] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
65b551a7   chenyueqi   海港贸易季初版
1349
1350
1351
1352
1353
1354
  							done = false
  							break
  						end
  					end
  					if done then
  						update = true
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1355
1356
1357
1358
1359
1360
  						redisproxy:insertEmail({
  							roleId = self:getProperty("id"),
  							emailId = idx == 1 and 361 or 362,
  							attachments = set[1].phase_award,
  						})
  						-- self:award(set[1].phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
98699b0c   chenyueqi   自动结算海岛贸易季 捐赠奖励领取报错
1361
  						donate[idx] = 1
65b551a7   chenyueqi   海港贸易季初版
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
  					end
  				end
  				seaport.donate = donate
  			end
  
  			-- 委托任务的奖励
  			local collect = seaport.collect or {}
  			if next(collect) then
  				local function getHeroCoef(hero, condition)
  				    -- 基础概率
  				    local rareMap = {[HeroQuality.N] = 10, [HeroQuality.R] = 10, [HeroQuality.SR] = 15, [HeroQuality.SSR] = 20}
  				    local rare = hero:getRare()
  				    local result = 0
  				    for _, it in ipairs(condition:toTableArray(true)) do
  				        local type = it[1]
  				        local value = it[2]
  				        local add = it[3]
  				        if type == 1 then   -- 种族加成
  				            if hero:getCamp() == value then
  				                result = result + add
  				            end
  				        elseif type == 2 then   -- 定位加成
  				            if hero:getPosition() == value then
  				                result = result + add
  				            end
  				        end
  				    end
  
  				    return result + (rareMap[rare] or 0)
  				end
  
  				local carbonCsv = csvdb["idle_battleCsv"]
  				local expCarbonId = self:getProperty("hangInfo").expCarbonId
65b551a7   chenyueqi   海港贸易季初版
1395
1396
  				local taskCsv = csvdb["seaport_taskCsv"]
  				local endTime = openTime0 + 86400 * 2
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1397
1398
  				local reward = {}
  
65b551a7   chenyueqi   海港贸易季初版
1399
1400
1401
1402
1403
1404
1405
1406
  				for slot, set in pairs(taskCsv) do
  					if collect[slot] then
  						update = true
  						local level = collect[slot].level
  						local data = set[level]
  						local teams = collect[slot].team
  						local time = collect[slot].time
  						if time + data.time <= endTime then
007a7927   chenyueqi   奖励计算错误,遗漏一处
1407
  							if not carbonCsv[expCarbonId] then break end
65b551a7   chenyueqi   海港贸易季初版
1408
1409
  
  							local totalCoef = 0
9fc8b7f0   chenyueqi   分割字符串错误
1410
  						    for _, heroId in ipairs(teams:toArray(true,"=")) do
65b551a7   chenyueqi   海港贸易季初版
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
  						        local hero = self.heros[heroId]
  						        if hero then
  						            totalCoef = totalCoef + getHeroCoef(hero, data.success)
  						            hero:addHeroFaith(data.trust)
  						        end
  					    	end
  
  							local bigSuccess = false
  						    local result = math.randomInt(0, 100)
  						    if result < totalCoef then
  						        bigSuccess = true
  						    end
  
007a7927   chenyueqi   奖励计算错误,遗漏一处
1424
1425
  							local money = math.ceil(carbonCsv[expCarbonId].money / 5 * data.time * data.money_clear)
  							local exp = math.ceil(carbonCsv[expCarbonId].exp / 5 * data.time * data.exp_clear)
65b551a7   chenyueqi   海港贸易季初版
1426
1427
1428
1429
1430
1431
1432
1433
1434
  							local itemReward = data.item_clear_special:toNumMap()
  							itemReward[ItemId.Gold] = (itemReward[ItemId.Gold] or 0) + money
  					    	itemReward[ItemId.Exp] = (itemReward[ItemId.Exp] or 0) + exp
  					    
  							if bigSuccess then
  						        for key, value in pairs(itemReward) do
  						            itemReward[key] = math.ceil(1.5 * value)
  						        end
  						    end
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
  
  						    for itemId, value in pairs(itemReward) do
  						    	reward[itemId] = (reward[itemId] or 0) + value
  						    end
  							-- self:award(itemReward, {log = {desc = "seaportTask", int1 = slot, int2 = level}})
  						end
  					end
  				end
  
  				if next(reward) then
  					local rewardStr = ""
  					for itemId, value in pairs(reward) do
  						if rewardStr ~= "" then
  							rewardStr = rewardStr .. " "
65b551a7   chenyueqi   海港贸易季初版
1449
  						end
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1450
  						rewardStr = rewardStr .. string.format("%s=%s",itemId,value)
65b551a7   chenyueqi   海港贸易季初版
1451
  					end
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1452
1453
1454
1455
1456
  					redisproxy:insertEmail({
  						roleId = self:getProperty("id"),
  						emailId = 363,
  						attachments = rewardStr,
  					})
65b551a7   chenyueqi   海港贸易季初版
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
  				end
  			end
  			seaport.collect = {}
  
  			if update or reset then
  				if reset then
  					seaport = {
  						time = openTime0,
  						shop = {},
  						collect = {},
  						donate = {}
  					}
  				end
98699b0c   chenyueqi   自动结算海岛贸易季 捐赠奖励领取报错
1470
  				self:updateProperty({field = "seaport", value = seaport})
65b551a7   chenyueqi   海港贸易季初版
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
  			end
  		end
  		
  		if oldTime == openTime0 then
  			if openTime1 == 1 or openTime2 == 1 then
  				return
  			end
  			getReward()
  		else
  			getReward(true)
  		end
  	end
  
a5dc3b0e   chenyueqi   回归活动初版
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
  	-- 检查回归者
  	function Role:checkReturner()
  		local returner = self:getProperty("returner") or {}
  		if next(returner) then return end
  
  		local now = specTime({hour = 4})
  		returner.time = now
  
  		self:updateProperty({field = "returner", value = returner})
  	end
  
65b551a7   chenyueqi   海港贸易季初版
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
  	function Role:getSeaportServerProgress()
  		local result = {}
  
  		local dataCsv = csvdb["seaport_purchaseCsv"]
  		local rediskey = {SEAPORT_TRADE_TASK_1,SEAPORT_TRADE_TASK_2}
  		for idx, set in ipairs(dataCsv) do
  			local temp = {}
  			temp = redisproxy:pipelining(function (red)
  				for id, data in ipairs(set) do
  					red:hget(rediskey[idx], id)
  				end
  			end)
  			result[idx] = {}
c4814196   chenyueqi   从数据库读取捐赠物品顺序错误
1508
  			for i,v in pairs(temp) do
65b551a7   chenyueqi   海港贸易季初版
1509
  				if v then
5fb0ac5f   liguanghui   海港贸易相关bug修复
1510
  					result[idx][i] = tonumber(v)
65b551a7   chenyueqi   海港贸易季初版
1511
1512
1513
1514
1515
1516
  				end
  			end
  		end
  		return result
  	end
  
9ced5432   zhouhaihai   冒险支援效果 保底事件
1517
1518
1519
1520
1521
1522
1523
  	-- 获得激活的冒险效果
  	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   数据保护
1524
  				if achvData and achvData.support ~= 0 then
9ced5432   zhouhaihai   冒险支援效果 保底事件
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
  					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   排行榜
1572
  
cfd68b3a   zhouhaihai   时间重置 新逻辑
1573
  	
59835765   zhouhaihai   排行榜
1574
  	function Role:getCurDinerRankKey()
bd4fb541   zhouhaihai   增加物品过期系统
1575
  		local round = self:getTimeResetRound(TimeReset.DinerRank)
59835765   zhouhaihai   排行榜
1576
  		local idx = 1
bd4fb541   zhouhaihai   增加物品过期系统
1577
  		if round % 2 == 1 then
59835765   zhouhaihai   排行榜
1578
1579
1580
1581
1582
1583
  			idx = 2 
  		end
  		return RANK_DINER[idx]
  	end
  
  	local StdTowerRankTime = toUnixtime("2019010100")
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1584
  	local TowerRankInfo = {
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
1585
1586
1587
1588
  		[1] = {rank = RANK_TOWER, rankInfo = RANK_TOWER_INFO},
  		[2] = {rank = RANK_TOWER1, rankInfo = RANK_TOWER1_INFO},
  		[3] = {rank = RANK_TOWER2, rankInfo = RANK_TOWER2_INFO},
  		[4] = {rank = RANK_TOWER3, rankInfo = RANK_TOWER3_INFO},
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1589
1590
1591
  	}
  	function Role:setTowerRank(level,tType)
  		tType = tType or 1
59835765   zhouhaihai   排行榜
1592
1593
1594
  		local now = skynet.timex()
  		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
  		local ct = 10000 - ct  -- 越早的排名越靠前
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1595
1596
1597
  
  		
  		local info = TowerRankInfo[tType]
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
1598
  		local towerTeam = self:getTowerTeamFormat(tostring(tType))
59835765   zhouhaihai   排行榜
1599
1600
1601
1602
1603
1604
1605
1606
1607
  		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
1608
  			format = self:getTeamHerosInfo(towerTeam).heros,
59835765   zhouhaihai   排行榜
1609
1610
1611
  		}
  		local roleId = self:getProperty("id")
  		redisproxy:pipelining(function (red)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1612
1613
  			red:zadd(info.rank, score, roleId)	--更新分数
  			red:hset(info.rankInfo, roleId,  MsgPack.pack(curInfo))
59835765   zhouhaihai   排行榜
1614
1615
1616
  		end)
  	end
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1617
1618
1619
  	function Role:getTowerRank(tType)
  		tType = tType or 1
  		local info = TowerRankInfo[tType]
59835765   zhouhaihai   排行榜
1620
  		local list = {}
6e76008a   liguanghui   bug修复:电波塔排行榜协议报错
1621
  		local ids = redisproxy:zrevrange(info.rank, 0 , 99)
59835765   zhouhaihai   排行榜
1622
1623
1624
1625
1626
1627
  		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)})
6e76008a   liguanghui   bug修复:电波塔排行榜协议报错
1628
  					red:hget(info.rankInfo, roleId)
59835765   zhouhaihai   排行榜
1629
1630
1631
1632
1633
1634
1635
1636
  				end
  			end)
  		end
  		for i = 1, #redret do
  			local player = MsgPack.unpack(redret[i])
  			player.format = nil
  			list[i].player = player
  		end
6e76008a   liguanghui   bug修复:电波塔排行榜协议报错
1637
  		local rank = redisproxy:ZREVRANK(info.rank, self:getProperty("id"))
59835765   zhouhaihai   排行榜
1638
1639
1640
1641
1642
1643
1644
1645
  		if not rank then
  			rank = -1
  		else
  			rank = rank + 1
  		end
  		return {list = list, rank = rank}
  	end
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1646
1647
1648
1649
  	function Role:getTowerRankOneInfo(roleId,tType)
  		tType = tType or 1
  		local info = TowerRankInfo[tType]
  		local data = redisproxy:hget(info.rankInfo, roleId)
59835765   zhouhaihai   排行榜
1650
1651
1652
1653
1654
  		if data then
  			local player = MsgPack.unpack(data)
  			return player.format
  		end
  	end
f60b89b1   zhouhaihai   奖励副本
1655
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1656
  	function Role:addAdvLvExp(exp)
f60b89b1   zhouhaihai   奖励副本
1657
  		local advL = self:getProperty("advL")
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1658
  		local level = advL[1]
97807511   zhouhaihai   增加日志
1659
  		local oldLevel = level
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1660
1661
1662
1663
1664
1665
1666
  		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   liuzujun   资助升级等级限制放开
1667
1668
  			--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   冒险资助升级属性奖励
1669
1670
1671
1672
  				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
  				level = level + 1
  			else
  				newExp = csvdb["adv_level_fundCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
f60b89b1   zhouhaihai   奖励副本
1673
1674
  			end
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1675
1676
1677
  
  		if level > advL[1] then
  			self:checkTaskEnter("AdvLevel", {level = level})
f60b89b1   zhouhaihai   奖励副本
1678
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1679
1680
  		advL[1] = level
  		advL[2] = newExp
f60b89b1   zhouhaihai   奖励副本
1681
  		self:updateProperty({field = "advL", value = advL})
97807511   zhouhaihai   增加日志
1682
  		return oldLevel, level
f60b89b1   zhouhaihai   奖励副本
1683
  	end
c384626d   zhouhaihai   好友
1684
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
  	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   资助对积分的影响
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
  	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   冒险
1710
  		return math.floor(score * (1 + change / 100))
9f956e88   zhouhaihai   资助对积分的影响
1711
1712
  	end
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
  	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   好友
1728
  	function Role:getTeamBattleInfo(team)
f603a60f   zhouhaihai   支援技实装
1729
  		local teamInfo = {heros = {}, supports = {}}
e8ca14c4   zhouhaihai   羁绊加成去掉
1730
  		-- local activeRelation = self:getHeroActiveRelation(team.heros)
c384626d   zhouhaihai   好友
1731
1732
  
  		for slot, id in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1733
1734
  			local info = {}
  			local hero = self.heros[id]
c384626d   zhouhaihai   好友
1735
  			if not hero then
fa565e0c   zhouhaihai   优化结构
1736
1737
  				print("error heroid " .. id)
  			end
e8ca14c4   zhouhaihai   羁绊加成去掉
1738
1739
  			-- local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
  			local attrs = hero:getTotalAttrs()
fa565e0c   zhouhaihai   优化结构
1740
1741
  			for k, v in pairs(AttsEnumEx) do
  				info[v] = (attrs[v] or 0)
c384626d   zhouhaihai   好友
1742
  			end
c384626d   zhouhaihai   好友
1743
1744
  			info.type = hero:getProperty("type")
  			info.level = hero:getProperty("level")
42f465e5   suhongyang   战斗参数传传入觉醒等级
1745
  			info.wakeL = hero:getProperty("wakeL")
fa565e0c   zhouhaihai   优化结构
1746
1747
  			info.blockLevel = hero:getSkillLevel(4)
  			info.specialLevel = hero:getSkillLevel(1)
aad10fac   suhongyang   战斗获取被动技能等级参数
1748
  			info.passiveLevel = hero:getSkillLevel(3)
a6508219   zhouhaihai   挂机奖励
1749
  			info.runeSkill = hero:getRuneSkill(102)
73db53c3   zhouhaihai   天赋技能
1750
  			info.talentSkills = hero:getTalentSkill()
fa565e0c   zhouhaihai   优化结构
1751
1752
  			teamInfo.heros[slot] = info
  		end
f603a60f   zhouhaihai   支援技实装
1753
1754
1755
  		for slot, id in pairs(team.supports or {}) do
  			teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
  		end
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
1756
  		teamInfo.tactics = globalCsv.tactics_skill_passive_cell[team.tactics] and team.tactics or nil
fa565e0c   zhouhaihai   优化结构
1757
1758
1759
  		return teamInfo
  	end
  
821e2704   zhouhaihai   heros 增加 supports
1760
1761
  	function Role:getTeamHerosInfo(team)
  		local format = {}
fa565e0c   zhouhaihai   优化结构
1762
  		local heros = {}
821e2704   zhouhaihai   heros 增加 supports
1763
  		for slot, heroId in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1764
1765
1766
1767
1768
1769
  			local hero = self.heros[heroId]
  			heros[slot] = {
  				type = hero:getProperty("type"),
  				level = hero:getProperty("level"),
  				wakeL = hero:getProperty("wakeL"),
  			}
c384626d   zhouhaihai   好友
1770
  		end
821e2704   zhouhaihai   heros 增加 supports
1771
1772
  		format.heros = heros
  		format.supports = team.supports or {}
57e52b3d   zhouhaihai   空的是nil
1773
  		format.tactics = team.tactics or nil
821e2704   zhouhaihai   heros 增加 supports
1774
  		return format
c384626d   zhouhaihai   好友
1775
1776
  	end
  
fa565e0c   zhouhaihai   优化结构
1777
  	function Role:getTeamBattleValue(heros)
3dbbc9f3   zhouhaihai   加上新的任务
1778
1779
1780
1781
1782
1783
1784
  		-- 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   优化结构
1785
1786
  	end
  
98d32f92   liuzujun   多编队
1787
1788
1789
1790
1791
  	function Role:updateHangTeamInfo()
  		local team = self:getTeamFormatByType(TeamSystemType.Hang)
  		if not team then return end
  
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
1792
  			hangTS = self:getTeamHerosInfo(team),
98d32f92   liuzujun   多编队
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
  			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   优化结构
1833
  	function Role:savePvpCTeam(team)
4cf74232   zhouhaihai   pvp
1834
  		if not team then
3dbbc9f3   zhouhaihai   加上新的任务
1835
  			team = self:getProperty("pvpTC")
4cf74232   zhouhaihai   pvp
1836
  		else
3dbbc9f3   zhouhaihai   加上新的任务
1837
  			self:updateProperty({field = "pvpTC", value = team})
4cf74232   zhouhaihai   pvp
1838
  		end
fa565e0c   zhouhaihai   优化结构
1839
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
1840
  			pvpTSC = self:getTeamHerosInfo(team),
fa565e0c   zhouhaihai   优化结构
1841
1842
1843
  			pvpTBC = self:getTeamBattleInfo(team),
  			pvpTBVC = self:getTeamBattleValue(team.heros),
  		})
c384626d   zhouhaihai   好友
1844
  	end
dc9d814f   zhouhaihai   邮件
1845
  
ab9f5400   zhouhaihai   临时代码
1846
1847
1848
1849
1850
1851
1852
1853
1854
  	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   报错
1855
  			if team[i] then
821e2704   zhouhaihai   heros 增加 supports
1856
  				pvpTSH[i] = self:getTeamHerosInfo(team[i])
c6940d28   zhouhaihai   报错
1857
1858
1859
  				pvpTBH[i] = self:getTeamBattleInfo(team[i])
  				pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
  			end
ab9f5400   zhouhaihai   临时代码
1860
1861
1862
1863
1864
1865
1866
1867
1868
  		end
  
  		self:setProperties({
  			pvpTSH = pvpTSH,
  			pvpTBH = pvpTBH,
  			pvpTBVH = pvpTBVH,
  		})
  	end
  
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
  	-- 设置电波塔阵容
  	function Role:getTowerTeamFormat(teamIdx)
  		local teams = self:getProperty("towerTeams") or {}
  		local team = teams[tostring(teamIdx)] or {}
  		return team
  	end
  
  	function Role:setTowerTeamFormat(teamIdx, team)
  		local teams = self:getProperty("towerTeams") or {}
  		teams[tostring(teamIdx)] = team
  		self:updateProperty({field = "towerTeams", value = teams, notNotify = false})
  	end
  
dc9d814f   zhouhaihai   邮件
1882
1883
  	-- update
  	function Role:onRecoverTimer(now)
cfd68b3a   zhouhaihai   时间重置 新逻辑
1884
  		self:updateTimeReset(now, true)
dc9d814f   zhouhaihai   邮件
1885
1886
1887
  		self:checkNewEvent(now)
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
1888
  	local function breath(sec, name)
dc9d814f   zhouhaihai   邮件
1889
  		local last_breath = 0
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
1890
1891
1892
  		return function (now, role)
  			if name == "email" and role.sendMailFlag then
  				last_breath = now + sec
0d892cdf   liuzujun   发送邮件清标记
1893
  				role.sendMailFlag = false
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
1894
1895
  				return true
  			end
dc9d814f   zhouhaihai   邮件
1896
1897
1898
1899
1900
1901
1902
1903
  			if now >= last_breath then
  				last_breath = now + sec
  				return true
  			end
  			return false
  		end
  	end
  	local breathes = {
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
1904
1905
  		["email"] = breath(120, "email"), -- email
  		["pvphg"] = breath(300, "pvphg"), -- 高级竞技场 奖励满的红点
dc9d814f   zhouhaihai   邮件
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
  	}
  	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   liuzujun   添加新的延時類型郵件
1929
1930
1931
1932
1933
1934
1935
1936
1937
  					-- 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   邮件
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
  						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   liuzujun   翻倍掉落活动,商城免费宝箱
1953
1954
  
  			self.SendMailFlag = false
dc9d814f   zhouhaihai   邮件
1955
1956
  			for index, id in ipairs(emailIds) do
  				if tonumber(redret[index]) == 0 then
dc9d814f   zhouhaihai   邮件
1957
1958
1959
1960
  					return true
  				end
  			end
  		end
42327de8   zhouhaihai   高级竞技场红点
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
  
  		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   未测试版好友能量助力活动
1974
  		end
dc9d814f   zhouhaihai   邮件
1975
1976
1977
  		
  		local events = {}
  		for name, breath in pairs(breathes) do
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
1978
  			if breath(now, self) and checks[name] then
dc9d814f   zhouhaihai   邮件
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
  				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 结构
1995
1996
1997
1998
1999
2000
  	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
2001
  	function Role:hangFinish(carbonId)
33be3111   zhouhaihai   修改hangPass 结构
2002
2003
  		local hangPass = self:getProperty("hangPass")
  		local diff = math.floor(carbonId / 10000)
15e1f084   zhouhaihai   挂机gm
2004
  		if (hangPass[diff] or 0) < carbonId then
33be3111   zhouhaihai   修改hangPass 结构
2005
2006
2007
2008
2009
  			hangPass[diff] = carbonId
  			self:updateProperty({field = "hangPass", value = hangPass})
  		end
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
2010
2011
2012
2013
2014
2015
2016
2017
2018
  	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   主推红点 和冒险次数
2019
2020
2021
2022
2023
2024
2025
  	-- 消除指定tag 红点
  	function Role:clearRedPTag(tag)
  		local redp = self:getProperty("redp")
  		redp[tag] = nil
  		self:updateProperty({field = "redp", value = redp})
  	end
  
2bf99d62   zhouhaihai   充值mycard
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
  	-- 网页支付获取订单号
  	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 的方式
2039
  				if v.twd * 100 ~= tonumber(params.money) then
2bf99d62   zhouhaihai   充值mycard
2040
2041
2042
  					return "error money"
  				end
  				-- 发现需要的id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2043
  				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId, params.choose)
2bf99d62   zhouhaihai   充值mycard
2044
2045
2046
2047
2048
2049
2050
2051
  				if partnerOrderId == "" then
  					return "no product"
  				end
  				return json.encode({order = partnerOrderId})
  			end
  		end
  	end
  
d705a315   zhouhaihai   充值 整理
2052
  	-- 获取充值订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2053
  	function Role:getPurchaseOrder(rechargeId, transactionId, choose)
d705a315   zhouhaihai   充值 整理
2054
2055
2056
2057
2058
2059
2060
  		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   liuzujun   世界boss翻牌奖励 活动卡池保底...
2061
  	    local rechargeRecord = self.storeData:getProperty("payR") or {}
d705a315   zhouhaihai   充值 整理
2062
2063
  	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
  	        return ""
8e892c71   liuzujun   挑战关卡活动打完再扣门票
2064
  		end
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2065
2066
2067
2068
2069
2070
2071
  		-- 检查礼包自选奖励合法
  		if choose and choose ~= "" then
  			if rechargeData.itemgift == "" then return "" end
  			local slot = rechargeData.itemdirect or 0
  			local set = choose:toTableArray(true)
  			if slot ~= #set then return "" end
  			local pass = {}
064138fe   liguanghui   定制礼包相关bug修复
2072
2073
  			local groups = rechargeData.itemgift:toTableArray(true)
  			for idx, item in ipairs(set) do
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2074
  				for _, group in ipairs(groups) do
064138fe   liguanghui   定制礼包相关bug修复
2075
  					if group[2] == item[1] and group[3] == item[2] and idx == group[1] then
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2076
2077
2078
2079
2080
2081
2082
  						pass[group[1]] = 1
  						break
  					end
  				end
  			end
  			if #pass ~= slot then return "" end
  		end
8e892c71   liuzujun   挑战关卡活动打完再扣门票
2083
  		--判断是否是活动商品
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2084
2085
2086
2087
2088
  		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   充值 整理
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
  
  	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
  	    if orderId then
  	    	local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
  			if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
  				return string.format("%d_%d_%d", serverId, roleId, orderId)
  			end
  	    end
  
  		orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
  		local partnerOrderId = string.format("%d_%d_%d", serverId, roleId, orderId)
  		local orderKey = string.format(R_ORDER, roleId, orderId)
  		redisproxy:del(orderKey) -- 删掉可能有了
  		local order = require("models.Order").new({ 
  			key = orderKey, 
  			order = partnerOrderId, 
  			rechargeId = rechargeId, 
1ce3adac   zhouhaihai   充值
2106
  			createTime = skynet.timex(),
2bf99d62   zhouhaihai   充值mycard
2107
  			transactionId = transactionId,
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2108
  			choose = choose or "",
d705a315   zhouhaihai   充值 整理
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
  		})
  		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
  		local _, _, orderId = string.match(partnerOrderStr, "(.+)_(.+)_(.+)")
  
  		local roleId = self:getProperty("id")
  		local orderObject = require("models.Order").new({ key = string.format(R_ORDER, roleId, orderId) })
  		if not orderObject:load() then
  			return false
  		end
  
  		local rechargeId = orderObject:getProperty("rechargeId")
  		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
  
  		if orderObject:getProperty("finishTime") > 0 then
d778335c   zhouhaihai   同单号充值输出
2141
2142
2143
  			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   充值 整理
2144
2145
2146
  			return false, "finsh"
  		end
  		
ffb3e2c5   zhouhaihai   支付bug
2147
2148
  		if platformOrder then
  			orderObject:setProperty("transactionId", platformOrder)
d705a315   zhouhaihai   充值 整理
2149
  		end
ffb3e2c5   zhouhaihai   支付bug
2150
  		orderObject:setProperty("status", status)
d705a315   zhouhaihai   充值 整理
2151
2152
2153
2154
  
  		-- 开始下单
  		if status == "success" then
  		elseif status == "fail" then
cd597363   zhouhaihai   充值重复
2155
  			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
2156
2157
  		elseif status == "finsh" then
  			orderObject:setProperty("finishTime", skynet.time())
ffb3e2c5   zhouhaihai   支付bug
2158
  			redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
  		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
  
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2176
  		return true, rechargeId, orderObject:getProperty("choose")
d705a315   zhouhaihai   充值 整理
2177
  	end
192b96d3   zhouhaihai   重置
2178
2179
  
  	-- 充值 --
b6ed652b   zhouhaihai   充值
2180
2181
  	--[[
  	request.order = data.out_trade_no
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
2182
  	request.amount = data.money
b6ed652b   zhouhaihai   充值
2183
2184
2185
2186
  	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
2187
  	request.extension_info = data.extension_info
6df9d5e1   zhouhaihai   mycard twd
2188
  	request.is_mycard = 1
b6ed652b   zhouhaihai   充值
2189
  	]]
192b96d3   zhouhaihai   重置
2190
2191
2192
2193
  	function Role:handlePurchase(params)
  		local roleId = self:getProperty("id")
  		local partnerOrderStr = params.order
  
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2194
  		local status, back, choose = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
d705a315   zhouhaihai   充值 整理
2195
2196
2197
2198
2199
  		if not status then
  			if back == "finsh" then
  				-- 订单已经处理
  				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
  			end
192b96d3   zhouhaihai   重置
2200
2201
  			return
  		end
d705a315   zhouhaihai   充值 整理
2202
  		local rechargeId = back
39bcd7ca   zhouhaihai   LOG
2203
  		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
2204
  		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   充值 整理
2205
  			skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
ec8caae5   zhouhaihai   多一点输出
2206
  				params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
192b96d3   zhouhaihai   重置
2207
2208
2209
2210
  			))
  			return
  		end
  
39bcd7ca   zhouhaihai   LOG
2211
  		local status, reward = self:recharge({ 
f22a33af   zhouhaihai   自己的日志
2212
2213
2214
2215
  			id = rechargeId,
  			transactionId = params.transactionId,
  			pay_time = params.pay_time,
  			order = partnerOrderStr,
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2216
  			choose = choose,
192b96d3   zhouhaihai   重置
2217
  		})
39bcd7ca   zhouhaihai   LOG
2218
2219
  
  		if not status then
2bf99d62   zhouhaihai   充值mycard
2220
  			if params.extension_info == "mycard_web" then
2d046fcb   zhouhaihai   通知邮件
2221
  				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
2bf99d62   zhouhaihai   充值mycard
2222
  			end
d705a315   zhouhaihai   充值 整理
2223
2224
2225
  			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
  				result = "success", reward = reward}))
  		end
192b96d3   zhouhaihai   重置
2226
  
d705a315   zhouhaihai   充值 整理
2227
  		return rechargeId
192b96d3   zhouhaihai   重置
2228
2229
2230
2231
2232
2233
2234
  	end
  
  
  	function Role:recharge(params)
  		local id = tonumber(params.id)
  		local rechargeData = csvdb["shop_rechargeCsv"][id]
  		if not rechargeData then
d705a315   zhouhaihai   充值 整理
2235
  			skynet.error("[recharge] recharge id not exist", id)
39bcd7ca   zhouhaihai   LOG
2236
  			return 1
192b96d3   zhouhaihai   重置
2237
2238
  		end
  
3e20f499   saicom   完善商城相关协议
2239
  		if not self.storeData:checkRechargeRecord(rechargeData.limit, id) then
39bcd7ca   zhouhaihai   LOG
2240
  			return 2
c5825110   saicom   新增用户商城相关数据
2241
2242
  		end
  
192b96d3   zhouhaihai   重置
2243
  		local diamondCount = 0
c5825110   saicom   新增用户商城相关数据
2244
2245
  		local reward = {}
  		if rechargeData.shop == 1 then -- 钻石
573d5ade   zhouhaihai   充值
2246
  			local rechargeF = self:getProperty("rechargeF")
192b96d3   zhouhaihai   重置
2247
2248
2249
2250
  			diamondCount = rechargeData.diamond + rechargeData.diamondExtra
  			if not rechargeF[id] then
  				diamondCount = diamondCount + rechargeData.diamondFirst
  				rechargeF[id] = 1
573d5ade   zhouhaihai   充值
2251
  				self:updateProperty({field = "rechargeF", value = rechargeF})
192b96d3   zhouhaihai   重置
2252
  			end
573d5ade   zhouhaihai   充值
2253
  			self:gainDiamond({count = diamondCount, isRecharge = true, log = {desc = "recharge", int1 = id}})
3e20f499   saicom   完善商城相关协议
2254
  		elseif rechargeData.shop == 2 then  --通行证商店
39bcd7ca   zhouhaihai   LOG
2255
  			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
b620581a   liuzujun   战令活动,战令相关的任务活动
2256
  			self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
3e20f499   saicom   完善商城相关协议
2257
  		elseif rechargeData.shop == 3 then  -- 礼包商店
39bcd7ca   zhouhaihai   LOG
2258
  			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
192b96d3   zhouhaihai   重置
2259
  		else
d705a315   zhouhaihai   充值 整理
2260
  			skynet.error("[recharge] invalid recharge shop type " .. id)
39bcd7ca   zhouhaihai   LOG
2261
  			return 3
192b96d3   zhouhaihai   重置
2262
2263
  		end
  
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2264
2265
2266
2267
2268
2269
  		-- 自选奖励部分
  		if params.choose and params.choose ~= "" then
  			local tReward, tChange = self:award(params.choose, {log = {desc = "recharge", int1 = id}})
  			for itemId, value in pairs(tReward) do
  				reward[itemId] = (reward[itemId] or 0) + value
  			end
064138fe   liguanghui   定制礼包相关bug修复
2270
  			for itemId, value in pairs(tChange or {}) do
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2271
2272
2273
2274
  				reward[itemId] = (reward[itemId] or 0) + value
  			end
  		end
  
3e20f499   saicom   完善商城相关协议
2275
  		if diamondCount > 0 then
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
2276
  			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
3e20f499   saicom   完善商城相关协议
2277
2278
  		end
  
e52c384f   liuzujun   探索指令bug, 充值返利活动
2279
2280
  		self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})
  
192b96d3   zhouhaihai   重置
2281
2282
  		-- 累充
  		local rmb = rechargeData.rmb
573d5ade   zhouhaihai   充值
2283
  		self:updateProperty({field = "rmbC", delta = rmb})
e52c384f   liuzujun   探索指令bug, 充值返利活动
2284
2285
  		self:updateProperty({field = "twdC", delta = rechargeData.twd})
  
8e524d41   zhouhaihai   优化
2286
  		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
192b96d3   zhouhaihai   重置
2287
  
39bcd7ca   zhouhaihai   LOG
2288
  		return nil, reward
192b96d3   zhouhaihai   重置
2289
2290
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2291
  	--直接给玩家发送邮件,立即推送小红点
7f9f002d   liuzujun   循环周活动
2292
  	function Role:sendMail(mailId, createTime, reward, contentPms)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2293
2294
2295
2296
2297
2298
  		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   liuzujun   翻倍掉落活动,商城免费宝箱
2299
  			tgift = reward or {}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2300
2301
2302
2303
2304
  		end
  		local gift = ""
  		for k, v in pairs(tgift) do
  			gift = gift .. k.."="..v.." "
  		end
7f9f002d   liuzujun   循环周活动
2305
  		redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2306
2307
2308
  		self.sendMailFlag = true
  	end
  
1e9cb217   chenyueqi   服务器记录控制引导过程
2309
2310
2311
2312
2313
2314
2315
2316
2317
  	-- 是否需要进行引导
  	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   引导服务端记录
2318
  	-- 保存引导步骤
1e9cb217   chenyueqi   服务器记录控制引导过程
2319
  	function Role:saveGuide(master,slave,force)
a608cccb   chenyueqi   引导服务端记录
2320
2321
2322
2323
  		local newerGuide = self:getProperty("newerGuide")
  		local guide = newerGuide:toArray(true,"=")
  		local sMaster, sSlave = guide[1], guide[2]
  
1e9cb217   chenyueqi   服务器记录控制引导过程
2324
2325
  		if not force and master < sMaster then return end
  		if not force and master <= sMaster and slave < sSlave then return end
a608cccb   chenyueqi   引导服务端记录
2326
  
a7b824ac   chenyueqi   记录新手引导步骤的代码存在bug
2327
2328
2329
2330
2331
2332
2333
  		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   自己的日志
2334
  		self:mylog("guide", {desc = "guide_new",int1 = master*1000+slave})
a608cccb   chenyueqi   引导服务端记录
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
  
  		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   liuzujun   付费签到,抽卡阶段奖励,探索指令
2354
2355
  
  	-- 抽卡阶段奖励
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2356
  	function Role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
2357
2358
  		local reward = nil
  		local maxCount = 0
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2359
  		for k, v in pairs(csvdb["build_extraRewardCsv"][feedbackId]) do
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
2360
2361
2362
2363
2364
2365
2366
2367
2368
  			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   liuzujun   自动挂机下一关
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
  	-- 获取下一个挂机关卡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   liuzujun   挂机关卡可以选择,经验金币根据最高...
2381
2382
  				nextId = makeCarbonId(diff + 1, 1, 1)
  				if not csvdb["idle_battleCsv"][nextId] then
53b4b8bd   liuzujun   自动挂机下一关
2383
  					nextId = 0
53b4b8bd   liuzujun   自动挂机下一关
2384
2385
2386
2387
2388
2389
2390
  				end
  			end
  		end
  
  		return nextId
  	end
  
e52c384f   liuzujun   探索指令bug, 充值返利活动
2391
2392
2393
2394
  	-- 根据累计充值金额计算奖励档位
  	function Role:getPaybackReward(oldVal, newVal)
  		local maxVal, diff, extraReward = 0, 0, ""
  		local gift = ""
4709685d   liuzujun   返利邮件拼接充值档位
2395
  		local checkPoint = {}
e52c384f   liuzujun   探索指令bug, 充值返利活动
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
  		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   liuzujun   返利邮件拼接充值档位
2406
2407
  
  				table.insert(checkPoint, k)
e52c384f   liuzujun   探索指令bug, 充值返利活动
2408
2409
2410
2411
  			end
  		end
  		if newVal > maxVal then
  			local cnt = 0
4709685d   liuzujun   返利邮件拼接充值档位
2412
  			local oldCheckPoint = 0
e52c384f   liuzujun   探索指令bug, 充值返利活动
2413
2414
  			if oldVal < maxVal then
  				cnt = math.floor((newVal - maxVal) / diff)
4709685d   liuzujun   返利邮件拼接充值档位
2415
  				oldCheckPoint = maxVal
e52c384f   liuzujun   探索指令bug, 充值返利活动
2416
2417
  			else
  				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
4709685d   liuzujun   返利邮件拼接充值档位
2418
  				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
e52c384f   liuzujun   探索指令bug, 充值返利活动
2419
2420
2421
  			end
  			for i = 1, cnt do
  				gift = gift .. extraReward .. " "
4709685d   liuzujun   返利邮件拼接充值档位
2422
2423
  
  				table.insert(checkPoint, oldCheckPoint + i * diff)
e52c384f   liuzujun   探索指令bug, 充值返利活动
2424
2425
  			end
  		end
56d191ec   liuzujun   充值返利邮件档位排序
2426
2427
2428
  		table.sort(checkPoint, function(a, b)
  			return a < b
  		end)
4709685d   liuzujun   返利邮件拼接充值档位
2429
  		return gift, checkPoint
e52c384f   liuzujun   探索指令bug, 充值返利活动
2430
  	end
072db127   zhouhaihai   推送
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
  	--[[
  	"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   liuzujun   探索指令bug, 充值返利活动
2446
  
072db127   zhouhaihai   推送
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
  	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   liuzujun   元旦关卡活动
2461
2462
  
  	local CommonRankTime = toUnixtime("2019010100")
576c791c   liuzujun   玛尼英雄帖活动通过任务bug 元旦...
2463
2464
  	local CommonCoef1 = 10000
  	local CommonCoef2 = 10000
66fe093a   liuzujun   元旦关卡活动
2465
2466
2467
2468
2469
2470
  	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   liuzujun   玛尼英雄帖活动通过任务bug 元旦...
2471
  		local score = (rankVal * CommonCoef1 + ct) * CommonCoef2 + reserve
66fe093a   liuzujun   元旦关卡活动
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
  
  		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   liuzujun   玛尼英雄帖活动通过任务bug 元旦...
2487
  			rankVal = math.floor(math.floor(rankVal / CommonCoef2) / CommonCoef1)
66fe093a   liuzujun   元旦关卡活动
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
  			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   liuzujun   拾荒活动
2507
2508
2509
2510
2511
2512
2513
2514
2515
  	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   liuzujun   元旦关卡活动
2516
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2517
2518
2519
2520
  	function Role:getTowerBnousActive(update)
  		if not update and self.towerBnousActive then
  			return self.towerBnousActive
  		end
4ee2fe31   chenyueqi   电波塔bug
2521
  		local towerInfo = self:getProperty("towerInfo")
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2522
2523
  		local towerLevel = {towerInfo.l or 1, towerInfo.l1 or 10001, towerInfo.l2 or 20001, towerInfo.l3 or 30001}
  		local towerBnous = self:getProperty("towerBnous")
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2524
  		local bnousCsv = csvdb["tower_battle_additionCsv"]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2525
  		self.towerBnousActive = {}
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2526
2527
2528
2529
  
  		for towerIdx, Set in pairs(towerBnous) do
  			for id, _ in pairs(Set) do
  				local data = bnousCsv[towerIdx][id]
a42130ee   chenyueqi   电波塔加成错误
2530
2531
2532
2533
2534
2535
  				if data then
  					local effects = data.effect:toTableArraySec()
  					for _, effect in pairs(effects) do
  						local pm1, pm2, pm3, pm4 = tonumber(effect[1]), tonumber(effect[2]), tonumber(effect[3]), tonumber(effect[4])
  						if not self.towerBnousActive[pm1] then
  							self.towerBnousActive[pm1] = {}
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2536
  						end
a42130ee   chenyueqi   电波塔加成错误
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
  						if pm1 == SystemBnousType.TowerBuff then
  							if not self.towerBnousActive[pm1][pm2] then
  								self.towerBnousActive[pm1][pm2] = {}
  							end
  							table.insert(self.towerBnousActive[pm1][pm2],pm3)
  						elseif pm1 == SystemBnousType.Adv then
  							if not self.towerBnousActive[pm1][pm4] then
  								self.towerBnousActive[pm1][pm4] = {}
  							end
  							self.towerBnousActive[pm1][pm4][pm2] = (self.towerBnousActive[pm1][pm4][pm2] or 0) + pm3
  						elseif pm1 == SystemBnousType.HangTime then
  							if type(self.towerBnousActive[pm1]) == "table" then
  								self.towerBnousActive[pm1] = 0
  							end
  							self.towerBnousActive[pm1] = self.towerBnousActive[pm1] + pm2
  						else
  							self.towerBnousActive[pm1][pm2] = (self.towerBnousActive[pm1][pm2] or 0) + pm3
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2554
  						end
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2555
  					end
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2556
2557
2558
  				end
  			end
  		end
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2559
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2560
2561
2562
  		return self.towerBnousActive
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
  	function Role:getDeltaValue(result, value)
  		if not result then return 0 end
  		local delta = 0
  		if result[1] and value then
  			delta = math.floor(value * result[1] / 100)
  		end
  		if result[0] then
  			delta = delta + result[0]
  		end
  		return delta
  	end
  
  	function Role:getBnousBattleBuff()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2576
2577
2578
2579
  		local towerBnous = self:getTowerBnousActive()
  		return towerBnous[SystemBnousType.TowerBuff]
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2580
  	function Role:getBnousCrusade(value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2581
  		local towerBnous = self:getTowerBnousActive()
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2582
  		return self:getDeltaValue(towerBnous[SystemBnousType.CrusadeTask], value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2583
2584
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2585
  	function Role:getBnousDiner(type, value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2586
2587
  		local towerBnous = self:getTowerBnousActive()
  		type = type or 1
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2588
  		local result
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2589
  		if type == 1 then
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2590
  			result = towerBnous[SystemBnousType.DinerGet]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2591
  		elseif type == 2 then
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2592
  			result = towerBnous[SystemBnousType.DinerLimit]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2593
  		elseif type == 3 then
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2594
  			result = towerBnous[SystemBnousType.DinerSell]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2595
  		elseif type == 4 then
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2596
  			result = towerBnous[SystemBnousType.DinerPrice]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2597
  		end
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2598
  		return self:getDeltaValue(result, value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2599
2600
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2601
  	function Role:getBnousAdv()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2602
  		local towerBnous = self:getTowerBnousActive()
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2603
  		return towerBnous[SystemBnousType.Adv] or {}
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2604
2605
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2606
  	function Role:getBnousHangTime()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2607
  		local towerBnous = self:getTowerBnousActive()
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2608
  		return towerBnous[SystemBnousType.HangTime] or 0
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2609
2610
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2611
  	function Role:getBnousPvpTicket()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2612
  		local towerBnous = self:getTowerBnousActive()
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2613
  		return towerBnous[SystemBnousType.PvpTicket] or {}
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2614
2615
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2616
  	function Role:getBnousSweep()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2617
  		local towerBnous = self:getTowerBnousActive()
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2618
  		return towerBnous[SystemBnousType.SweepReward] or {}
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2619
2620
  	end
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
2621
2622
2623
  end
  
  return RolePlugin