Blame view

src/models/RolePlugin.lua 101 KB
8583f6ee   chenyueqi   动态屏蔽字
1
2
3
  local httpc = require("http.httpc")
  local md5 = require "md5"
  local cjson = require "shared.json"
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
4
  local mysqlproxy = require "shared.mysqlproxy"
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
5
  
ffb3e2c5   zhouhaihai   支付bug
6
  local serverId = tonumber(skynet.getenv("servId"))
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
7
8
9
10
  local RolePlugin = {}
  
  function RolePlugin.bind(Role)
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
11
  	function Role:loadAll()
be9c9ca6   zhouahaihai   角色评论
12
  		self:loadDaily()
43cc5f51   gaofengduan   调整 equip 数据结构
13
14
  		self:loadEquips()
  		self:loadRunes()
0a07bdd9   zhouahaihai   角色升级 。gm
15
  		self:loadHeros()
87cc3a35   zhengshouren   餐厅建筑升级逻辑
16
  		self:loadDiner()
9a1c54b2   zhouhaihai   活动
17
  		self:loadActivity()
c5825110   saicom   新增用户商城相关数据
18
  		self:loadStoreInfo()
d99a4962   liuzujun   火花系统建表,新增虹光玉
19
  		--self:loadRoleIncre()
6136eaca   liuzujun   添加好友表
20
  		self:loadFriends()
3d8468b2   liuzujun   火花系统
21
  		self:loadSparks()
555f745e   zhangqijia   feat: 一番赏
22
  		self:loadCapsules()
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
23
24
25
  	end
  
  	function Role:reloadWhenLogin()
0a07bdd9   zhouahaihai   角色升级 。gm
26
27
  	end
  
c384626d   zhouhaihai   好友
28
29
30
31
  	function Role:SendPacket(...)
  		SendPacket(...)
  	end
  
5b28342d   zhouahaihai   离线方法
32
  	function Role:onOfflineEvent()
c384626d   zhouhaihai   好友
33
34
  		-- 设置最新的登录时间
  		self:setProperty("ltime", skynet.timex())
a8bab292   liuzujun   离线对象保存bug
35
  
5c8c3b70   liuzujun   离线角色强制保存
36
          self:saveRoleData()
5b28342d   zhouahaihai   离线方法
37
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
38
  
7e61a962   liuzujun   新增通用生成订单协议,
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
  	-- 上报中宣数据
  	function Role:onUploadLoginout(bt, session)
  		local uid = self:getProperty("uid")
  		local id = self:getProperty("id")
  		local time = skynet.timex()
  		local si = string.format("%s_%s", id, session)
  		local info = {{si = si, bt = bt, ot = time}}
  
  		local codeurl = skynet.getenv("codeurl")
  		local content = {
  			["si"] = si,
  			["bt"] = bt,
  			["ot"] = time,
  			["uid"] = uid,
  			["key"] = "zhaolugame20170831",
  		}
7e61a962   liuzujun   新增通用生成订单协议,
55
56
57
  		httpc.get(codeurl, "/collect?" .. httpGetFormatData(content), {})
  	end
  
312b9db5   zhouahaihai   背包
58
59
60
61
62
63
64
65
  	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   限定错误
66
67
  			for id ,_ in pairs(items) do
  				local tempData = csvdb["itemCsv"][id]
514590c2   zhouhaihai   容错
68
69
70
71
72
73
74
  				if tempData then
  					if globalCsv.store_type[tempData.type] == page then
  						curCount = curCount + 1
  						if curCount >= limit then
  							count = 0
  							break
  						end
312b9db5   zhouahaihai   背包
75
76
77
78
  					end
  				end
  			end
  		end
312b9db5   zhouahaihai   背包
79
80
  		return count
  	end
8c74292c   zhouahaihai   增加item 以及 角色突破
81
82
  
  	local function _award(self, itemId, count, params)
0719a220   zhouhaihai   数据保护
83
  		local count = math.floor(count)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
84
  		local pms = clone(params)
8c74292c   zhouahaihai   增加item 以及 角色突破
85
  		local itemData = csvdb["itemCsv"][itemId]
056c01a0   zhouhaihai   简化装备
86
87
88
  		if not itemData then  -- 加一层保护
  			return 0, {}
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
89
90
91
  		local curType = itemData.type
  		local change = {} -- 奖励被转化为了其他奖励 id = count
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
92
93
  		local itemIdAward = {
  			[ItemId.PlayerExp] = function()
44c6e479   zhouhaihai   增加部分日志
94
  				self:addPlayExp(count, pms)
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
95
  			end,
e1b238dd   zhouhaihai   拾荒体力
96
97
98
  			[ItemId.AdvPower] = function()
  				self:changeAdvCount(-count)
  			end,
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
99
100
  		}
  
be9c9ca6   zhouahaihai   角色评论
101
102
  		local itemTypeAward = {
  			[ItemType.Hero] = function()
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
103
  				pms.type = itemId - ItemStartId.Hero
a7b69ec2   zhouhaihai   完善道具转换
104
105
106
107
108
109
110
111
  				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   角色评论
112
  				end
a7b69ec2   zhouhaihai   完善道具转换
113
  				count = gcount
be9c9ca6   zhouahaihai   角色评论
114
  			end,
1c24ba6e   gaofengduan   fix equip
115
116
117
  			[ItemType.EquipBase] = function()
  				local typ = math.floor((itemId-7000)/100)
      			local lv = (itemId-7000)%100
056c01a0   zhouhaihai   简化装备
118
  				self:addEquip(typ, lv, count ,pms)
53e8037e   zhouhaihai   任务
119
120
  				local equipCsv = (csvdb["equipCsv"][typ] or {})[lv]
  				self:checkTaskEnter("AddEquip", {equipId = itemId, rarity = equipCsv.rarity}, pms.notNotify)
1c24ba6e   gaofengduan   fix equip
121
122
  			end,
  			[ItemType.Rune] = function()
3847ba2d   zhouhaihai   修改 零件
123
  				local typ =  math.floor((itemId-10000)/1000)
1c24ba6e   gaofengduan   fix equip
124
  				for _= 1, count do
44c6e479   zhouhaihai   增加部分日志
125
  					self:addRune({type = typ,id = itemId, notNotify = pms.notNotify, log = pms.log})
1c24ba6e   gaofengduan   fix equip
126
127
  				end
  			end,
3d8468b2   liuzujun   火花系统
128
129
130
131
132
  			[ItemType.Spark] = function()
  				for _= 1, count do
  					self:addSpark({id = itemId, notNotify = pms.notNotify, log = pms.log})
  				end
  			end,
00115a7a   zhouahaihai   奖励发放
133
134
135
  			[ItemType.AdvItem] = function()  --冒险道具不会进入 玩家仓库
  				count = 0
  			end,
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
136
  			[ItemType.FuncOpen] = function()
44c6e479   zhouhaihai   增加部分日志
137
  				self:funcOpen(itemId, count, pms)
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
138
  			end,
993def2f   zhouhaihai   碎片直接转换为其他碎片
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
  			[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   调理剂生产和使用逻辑优化
168
169
170
  			[ItemType.Potion] = function ()
  				self:addPotion({id = itemId, count = count, notNotify = pms.notNotify, log = pms.log})
  			end,
8eaed74e   liuzujun   战令活动开启时清除购买记录,新增B...
171
  			[ItemType.BossTicket] = function ()
c6a4c456   liuzujun   boss挑战门票购买可以超出上限
172
173
174
  				local isOpen, actId = self.activity:isOpen("ChallengeLevel")
  				if not isOpen then return end
  				self.activity:getBattleTicket(actId)
8eaed74e   liuzujun   战令活动开启时清除购买记录,新增B...
175
176
177
178
  				local actData = self.activity:getActData("ChallengeLevel")
  				actData["ticket"] = (actData["ticket"] or 0) + count
  				self.activity:updateActData("ChallengeLevel", actData)
  			end,
be9c9ca6   zhouahaihai   角色评论
179
  		}
dfa9ae5e   liuzujun   战令任务活动
180
181
182
183
184
185
186
187
188
  
  		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   背包
189
  		-- 对数量筛查
1a1a6375   gaofengduan   fix lua warning
190
  		count = checkItemCount(self, itemId, count)
312b9db5   zhouahaihai   背包
191
  		if count ~= 0 then
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
192
193
194
  			if itemIdAward[itemId] then
  				itemIdAward[itemId]()
  			elseif itemTypeAward[curType] then
312b9db5   zhouahaihai   背包
195
196
  				itemTypeAward[curType]()
  			else
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
197
198
199
  				pms.itemId = itemId
  				pms.count = count
  				self:addItem(pms)
312b9db5   zhouahaihai   背包
200
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
201
202
  		end
  
a7b69ec2   zhouhaihai   完善道具转换
203
  		return count, change --  count 实际发放的奖励个数 change 物品实际奖励与当前id 不符 就发生转换 而不实际发奖
8c74292c   zhouahaihai   增加item 以及 角色突破
204
205
206
207
208
  	end
  
  
  	-- 发奖功能入口  award string id=count or {[id] = count}
  	function Role:award(gift, params)
8c199cec   zhengshouren   简化物品奖励接口,设置默认参数
209
  		params = params or {}
8c74292c   zhouahaihai   增加item 以及 角色突破
210
  		local tgift = {}
46fac6f1   zhouahaihai   酱料
211
  		if type(gift) == "string" then
8c74292c   zhouahaihai   增加item 以及 角色突破
212
213
214
215
216
217
218
219
  			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   完善道具转换
220
221
222
223
224
  		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 以及 角色突破
225
  			if next(change) then
a7b69ec2   zhouhaihai   完善道具转换
226
227
228
229
230
231
  				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   背包
232
  				end
8c74292c   zhouahaihai   增加item 以及 角色突破
233
234
  			end
  		end
7bb30dca   zhouhaihai   修改发奖
235
  		if not next(allChange) then allChange = nil end
209c42ff   liuzujun   添加道具及时保存
236
237
          -- 加道具及时刷新数据
          self:update()
8c74292c   zhouahaihai   增加item 以及 角色突破
238
239
240
  		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
  	end
  
7bb30dca   zhouhaihai   修改发奖
241
242
243
244
245
246
  
  	function Role:packReward(reward, change)
  		if not reward then return nil end
  		return {reward = reward, change = change}
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
  	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
70fb62d1   liuzujun   服务器数据打点
280
281
  									--mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
  									self:sendMail(19)
bd4fb541   zhouhaihai   增加物品过期系统
282
283
284
285
286
287
288
289
290
291
292
293
294
  								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   优化
295
  		self:mylog("role_action", {desc = "changeHead", int1 = id})
bd4fb541   zhouhaihai   增加物品过期系统
296
297
  	end
  
44c6e479   zhouhaihai   增加部分日志
298
  	function Role:addPlayExp(addExp, params)
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
299
  		local level = self:getProperty("level")
39bcd7ca   zhouhaihai   LOG
300
  		local oldLevel = level
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
301
302
303
  		if not csvdb["player_expCsv"][level + 1] then
  			return
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
304
  
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
305
306
307
308
309
310
  		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   限时礼包
311
  				self:checkTaskEnter("RoleLevelUp", {level = level})
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
312
313
314
315
  			else
  				newExp = csvdb["player_expCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
  			end
  		end
39bcd7ca   zhouhaihai   LOG
316
  		if level > oldLevel then
c6f3e36c   zhouhaihai   错误的语法
317
318
319
320
321
  			if params.log then
  				local log = params.log
  				self:log("setLevel", {
  					level_before = oldLevel, 
  					level_changemain = log.desc,
43293781   zhouhaihai   日志bug
322
  					level_changedetail = log.int1 or 0,
f3eb34b1   liuzujun   删除无用日志
323
  					level_reward = {},
c6f3e36c   zhouhaihai   错误的语法
324
325
326
327
  				})
  			else
  				print("addPlayExp no log ", debug.traceback())
  			end
f22a33af   zhouhaihai   自己的日志
328
329
330
  		end
  
  		if params.log then
7d31daa8   zhouhaihai   调整压测
331
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
332
333
334
  			if log["cint1"] or log["cint2"] then
  				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
  			end
c6f3e36c   zhouhaihai   错误的语法
335
  			
f22a33af   zhouhaihai   自己的日志
336
337
338
339
340
341
342
343
  
  			log["cint1"] = addExp
  			log["cint2"] = newExp
  			log["cint3"] = level
  
  			self:mylog("player_exp", log)
  		else
  			print("addPlayExp no log ", debug.traceback())
44c6e479   zhouhaihai   增加部分日志
344
345
  		end
  
67b46a6b   zhouhaihai   修复存在的冒险进不去的玩家
346
  		self:updateProperties({level = level, exp = newExp}, params.notNotify)
e3c5cc5e   zhouhaihai   跨服竞技场over
347
  		self:changeCrossServerPvpSelfInfo("level")
4b7c7c96   zhouahaihai   增加 清空 挂机 冒险gm 角色经验
348
349
  	end
  
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
350
  	function Role:addPotion(params)
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
351
352
353
354
355
356
357
358
359
360
361
362
363
364
  		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)
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
365
366
  			log["cint3"] = nums
  			log["long1"] = origin
0027e33b   chenyueqi   调理剂生产和使用逻辑优化
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
  			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 以及 角色突破
382
383
  	function Role:addItem(params)
  		params = params or {}
d02368d3   zhouhaihai   数据保护
384
  		params.count = math.floor(params.count or 0)
312b9db5   zhouahaihai   背包
385
386
387
388
  		if params.itemId ==  ItemId.Diamond then
  			self:gainDiamond(params)
  			return
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
389
390
391
392
393
394
395
396
397
  		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   增加部分日志
398
  
c59e058b   zhouhaihai   新一批日志记录
399
  		self:logItems(params.itemId, origin, nums, params.log)
f22a33af   zhouhaihai   自己的日志
400
  		if params.log then
7d31daa8   zhouhaihai   调整压测
401
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
402
403
404
405
406
  			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)
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
407
408
  			log["cint3"] = nums
  			log["long1"] = origin
f22a33af   zhouhaihai   自己的日志
409
410
411
412
413
414
415
416
  			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   增加部分日志
417
  
8c74292c   zhouahaihai   增加item 以及 角色突破
418
419
420
421
  		self:setProperty("items", items)
  		if not params.notNotify then
  			SendPacket(actionCodes.Role_updateItems, MsgPack.pack({[params.itemId] = nums}))
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
422
423
424
425
  	end
  
  	function Role:checkItemEnough(itemCountT)
  		local less = {}
87cc3a35   zhengshouren   餐厅建筑升级逻辑
426
  		if not next(itemCountT) then
7d31daa8   zhouhaihai   调整压测
427
  			return true, less
87cc3a35   zhengshouren   餐厅建筑升级逻辑
428
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
429
  		for itemId, count in pairs(itemCountT) do
a33ade6c   liuzujun   rmb礼包改钻石礼包
430
431
432
433
434
  			--if count <= 0 then
  			--	-- 判断物品数量值不应该小于等于0
  			--	less[itemId] = 0
              --else
              if count > 0 then
87cc3a35   zhengshouren   餐厅建筑升级逻辑
435
436
437
438
  				local last = self:getItemCount(itemId) - count
  				if last < 0 then
  					less[itemId] = -last
  				end
8c74292c   zhouahaihai   增加item 以及 角色突破
439
440
441
442
443
444
  			end
  		end
  		return (not next(less)), less -- 是否足够,,缺什么缺多少
  	end
  
  	function Role:costItems(itemCountT, params)
36204e3c   zhengshouren   贩卖逻辑
445
  		local pms = clone(params or {})
7cbae6f3   zhangqijia   fix: Role:costIte...
446
447
448
449
  		for _, v in pairs(itemCountT) do
  			if v <= 0 then return false end
  		end
  
312b9db5   zhouahaihai   背包
450
  		if itemCountT[ItemId.Diamond] then  --优先扣除钻石
312b9db5   zhouahaihai   背包
451
452
453
454
  			pms.count = itemCountT[ItemId.Diamond]
  			if not self:costDiamond(pms) then
  				return
  			end
312b9db5   zhouahaihai   背包
455
  		end
923a626e   zhangqijia   feat: 远征, 增加消耗虹光玉...
456
457
458
459
460
461
462
  
  		if itemCountT[ItemId.Jade] then --扣除
  			pms.itemId = ItemId.Jade
  			pms.count = - itemCountT[ItemId.Jade]
  			self:costJade(pms)
  		end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
463
  		for itemId, count in pairs(itemCountT) do
923a626e   zhangqijia   feat: 远征, 增加消耗虹光玉...
464
  			if itemId ~= ItemId.Diamond and itemId ~= ItemId.Jade then
0a6fcddc   zhouhaihai   log 发现的bug
465
466
467
468
469
  				pms.itemId = itemId
  				pms.count = - count
  				self:addItem(pms)
  				self:itemDeltaEvent(pms)
  			end
8c74292c   zhouahaihai   增加item 以及 角色突破
470
  		end
312b9db5   zhouahaihai   背包
471
  		return true
8c74292c   zhouahaihai   增加item 以及 角色突破
472
473
  	end
  
89760dbe   chenyueqi   拆解室功能重写
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
  	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   修复存在的冒险进不去的玩家
493
  			self:updateProperty({field = "boxL", value = boxL, notNotify = pms.notNotify})
89760dbe   chenyueqi   拆解室功能重写
494
495
496
  		end
  	end
  
8c74292c   zhouahaihai   增加item 以及 角色突破
497
  	function Role:getItemCount(itemId)
43cc5f51   gaofengduan   调整 equip 数据结构
498
  		if itemId == ItemId.Diamond then
312b9db5   zhouahaihai   背包
499
500
  			return self:getAllDiamond()
  		end
8c74292c   zhouahaihai   增加item 以及 角色突破
501
502
503
  		return self:getProperty("items"):getv(itemId, 0)
  	end
  
312b9db5   zhouahaihai   背包
504
  	function Role:getAllDiamond()
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
505
  		local diamond = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
3d8050ef   liuzujun   钻石3改成虹光玉8
506
507
  		--return self:getProperty("diamond") + diamond
  		return diamond
312b9db5   zhouahaihai   背包
508
509
510
511
512
513
514
515
  	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
3d8050ef   liuzujun   钻石3改成虹光玉8
516
  		local origind = 0 -- self:getProperty("diamond")
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
517
  		local originr = self:getProperty("sid") == IOS_SID and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
312b9db5   zhouahaihai   背包
518
  		local origin = origind + originr
3d8050ef   liuzujun   钻石3改成虹光玉8
519
  		--if params.isRecharge then
a48ab367   liuzujun   钻石区分渠道
520
  			if self:getProperty("sid") == IOS_SID then
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
521
522
523
524
  				self:incrProperty("reDiamondIos", count)
  			else
  				self:incrProperty("reDiamond", count)
  			end
3d8050ef   liuzujun   钻石3改成虹光玉8
525
526
527
  		--else
  			--self:incrProperty("diamond", count)
  		--end
44c6e479   zhouhaihai   增加部分日志
528
  
c59e058b   zhouhaihai   新一批日志记录
529
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
530
  		if params.log then
7d31daa8   zhouhaihai   调整压测
531
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
532
533
534
535
536
  			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
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
537
  			log["cint3"] = origin + count
f22a33af   zhouhaihai   自己的日志
538
539
540
541
542
  			self:mylog("in_diamond", log)
  		else
  			print("gainDiamond no log ", debug.traceback())
  		end
  
312b9db5   zhouahaihai   背包
543
544
545
546
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
  		return true
  	end
  
312b9db5   zhouahaihai   背包
547
548
549
550
551
552
553
554
555
  	function Role:costDiamond(params)
  		if not params or type(params) ~= "table" then return false end
  		local count = tonum(params.count)
  		if isnan(count) then
  			return false
  		end
  		if count <= 0 then
  			return false
  		end
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
556
  		local isIos = self:getProperty("sid") == IOS_SID
3d8050ef   liuzujun   钻石3改成虹光玉8
557
  		local origind = 0 -- self:getProperty("diamond")
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
558
  		local originr = isIos and self:getProperty("reDiamondIos") or self:getProperty("reDiamond")
312b9db5   zhouahaihai   背包
559
560
561
562
563
564
565
566
  		local origin = origind + originr
  
  		if origin < 0 then
  			return false
  		end
  		if origin < count then
  			return false
  		end
3d8050ef   liuzujun   钻石3改成虹光玉8
567
568
569
570
571
572
573
574
575
576
577
578
579
580
  		local diamondKey = isIos and "reDiamondIos" or "reDiamond"
  		self:incrProperty(diamondKey, -count)
  		--local last = count
  		--local costFirst = isIos and {"diamond", "reDiamondIos"} or {"diamond", "reDiamond"}
  		--if params.isRecharge then
  		--	costFirst = isIos and {"reDiamondIos", "diamond"} or {"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
312b9db5   zhouahaihai   背包
581
  
c59e058b   zhouhaihai   新一批日志记录
582
583
  
  		self:logItems(ItemId.Diamond, origin, count, params.log)
f22a33af   zhouhaihai   自己的日志
584
  		if params.log then
7d31daa8   zhouhaihai   调整压测
585
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
586
587
588
589
590
  			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
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
591
  			log["cint3"] = origin - count
f22a33af   zhouhaihai   自己的日志
592
593
594
595
  			self:mylog("out_diamond", log)
  		else
  			print("costDiamond no log ", debug.traceback())
  		end
44c6e479   zhouhaihai   增加部分日志
596
  
312b9db5   zhouahaihai   背包
597
  		self:notifyUpdateProperty("diamond", self:getAllDiamond())
dfa9ae5e   liuzujun   战令任务活动
598
599
  
  		self:checkTaskEnter("CostDiamond", {count = count})
95c9089b   zhangqijia   feat: 新增世界线积分功能。
600
          self:checkWorldChangePoints({[ItemWorldLine.CostDiamond]=count})
312b9db5   zhouahaihai   背包
601
602
603
  		return true
  	end
  
923a626e   zhangqijia   feat: 远征, 增加消耗虹光玉...
604
605
606
  	function Role:costJade(param)
          self:addItem(param)
  		self:checkTaskEnter("CostJade", {count = - param.count})
5db4c63a   zhangqijia   fix: 世界线积分, 修复计算错...
607
  		self:checkWorldChangePoints({[ItemWorldLine.CostJade]= -param.count})
923a626e   zhangqijia   feat: 远征, 增加消耗虹光玉...
608
609
  	end
  
d99a4962   liuzujun   火花系统建表,新增虹光玉
610
611
612
613
614
615
616
617
  	function Role:increBy(field, val)
  		local roleIncre = self:getProperty("roleIncre")
  		local curId = roleIncre[field] or 0
  		roleIncre[field] = curId + val
  		self:setProperty("roleIncre", roleIncre)
  		return curId + val
  	end
  
0a07bdd9   zhouahaihai   角色升级 。gm
618
619
  	function Role:addHero(params)
  		local roleId = self:getProperty("id")
0a07bdd9   zhouahaihai   角色升级 。gm
620
  		local heroType = params.type
056c01a0   zhouhaihai   简化装备
621
  		if self:isHaveHero(heroType) then return end
53e8037e   zhouhaihai   任务
622
623
  		local unitData = csvdb["unitCsv"][heroType] 
  		if not unitData then return false end
056c01a0   zhouhaihai   简化装备
624
  
d99a4962   liuzujun   火花系统建表,新增虹光玉
625
  		local heroId = self:increBy("heroId" , 1)
0a07bdd9   zhouahaihai   角色升级 。gm
626
  
0a07bdd9   zhouahaihai   角色升级 。gm
627
  		local heroInfo = {
a12bfcce   liuzujun   添加英雄表
628
629
630
  			key = string.format("%d",roleId * MAX_HERO_NUM + heroId),
  			id 	= roleId * MAX_HERO_NUM + heroId,
  			roleid = roleId,
0a07bdd9   zhouahaihai   角色升级 。gm
631
  			type= heroType,
fb73effd   wangyujie   英雄初始觉醒等级从GD取
632
  			wakeL = globalCsv.unit_wake_initLevel[unitData.rare],
0a07bdd9   zhouahaihai   角色升级 。gm
633
  		}
bcbb0c7b   zhouhaihai   3星解锁 cg
634
  		if heroInfo.wakeL == 3 then
3ed95697   zhouhaihai   成就 参数错误
635
  			self:checkTaskEnter("WakeCG", {heroType = heroType})
9e5f9701   zhangqijia   feat: 玛尼的英雄帖增加任务类型
636
  			self:checkTaskEnter("WakeCGSum", {count = 1})
bcbb0c7b   zhouhaihai   3星解锁 cg
637
  		end
0a07bdd9   zhouahaihai   角色升级 。gm
638
639
640
  		local newHero = require("models.Hero").new(heroInfo)
  		newHero:create()
  		newHero.owner = self
8c74292c   zhouahaihai   增加item 以及 角色突破
641
  		newHero:saveBattleValue()
0a07bdd9   zhouahaihai   角色升级 。gm
642
  		self.heros[heroId] = newHero
00bf6029   liuzujun   限时礼包,抽卡ssr广播
643
644
645
646
647
  		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   英雄帖活动初始化
648
  		self:checkTaskEnter("HeroQualityCollect", {})
b88939d5   zhangqijia   fix: 玛尼的英雄帖增加任务类型...
649
650
  		self:checkTaskEnter("HeroStartSum", {})
  
0a07bdd9   zhouahaihai   角色升级 。gm
651
652
653
654
655
656
  		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   新一批日志记录
657
  
e9bfa7a2   liuzujun   其他玩家展示界面数据支持, 更新s...
658
          self:updateProperty({field = "heroCnt", value = #self.heros})
c59e058b   zhouhaihai   新一批日志记录
659
660
  		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
  
f22a33af   zhouhaihai   自己的日志
661
  		if params.log then
7d31daa8   zhouhaihai   调整压测
662
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
663
664
665
666
667
668
669
670
671
  			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   添加 测试账号 方法
672
  		return true, newHero
056c01a0   zhouhaihai   简化装备
673
674
675
676
677
678
  	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   添加 测试账号 方法
679
  				return hero
056c01a0   zhouhaihai   简化装备
680
681
  			end
  		end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
682
683
  	end
  
00bf6029   liuzujun   限时礼包,抽卡ssr广播
684
685
686
687
688
689
690
691
692
693
  	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
  
a85b344f   zhangqijia   feat: 挂机图鉴
694
695
696
697
698
699
700
701
702
  	function Role:getHeroByID(heroId)
  		for id, hero in pairs(self.heros) do
  			if id == heroId then
  				return hero
  			end
  		end
  		return nil
  	end
  
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
703
  
0a07bdd9   zhouahaihai   角色升级 。gm
704
705
  	function Role:loadHeros()
  		local roleId = self:getProperty("id")
a12bfcce   liuzujun   添加英雄表
706
707
708
709
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Hero` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
  			local hero = require("models.Hero").new({key = string.format("%d",data.id), id=data.id})
  			if hero:load(data) then
0a07bdd9   zhouahaihai   角色升级 。gm
710
  				hero.owner = self
52249374   liuzujun   添加铭文表
711
  				self.heros[hero:getSimpleHeroId()] = hero
0a07bdd9   zhouahaihai   角色升级 。gm
712
713
714
715
  			end
  		end
  	end
  
6136eaca   liuzujun   添加好友表
716
717
718
719
720
721
722
  	function Role:loadFriends()
  		local roleId = self:getProperty("id")
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Friend` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
  			local friend = require("models.Friend").new({key = string.format("%d",data.id), id = data.id})
  			if friend:load(data) then
  				self.friends[friend:getProperty("fid")] = friend
0a07bdd9   zhouahaihai   角色升级 。gm
723
724
725
726
  			end
  		end
  	end
  
be9c9ca6   zhouahaihai   角色评论
727
728
  	function Role:loadDaily()
  		local roleId = self:getProperty("id")
fa992c94   liuzujun   添加daily,diner,act...
729
730
  		local dataKey = string.format("%d", roleId)
  		self.dailyData = require("models.Daily").new({key = dataKey, id = roleId})
be9c9ca6   zhouahaihai   角色评论
731
  		self.dailyData.owner = self
fa992c94   liuzujun   添加daily,diner,act...
732
  		if not self.dailyData:checkKeyExists(dataKey) then
be9c9ca6   zhouahaihai   角色评论
733
734
735
736
737
  			self.dailyData:create()
  		else
  			self.dailyData:load()
  		end
  	end
46fac6f1   zhouahaihai   酱料
738
  
9a1c54b2   zhouhaihai   活动
739
740
  	function Role:loadActivity()
  		local roleId = self:getProperty("id")
fa992c94   liuzujun   添加daily,diner,act...
741
742
  		local dataKey = string.format("%d", roleId)
  		self.activity = require("models.Activity").new({key = dataKey, id = roleId})
9a1c54b2   zhouhaihai   活动
743
  		self.activity.owner = self
fa992c94   liuzujun   添加daily,diner,act...
744
  		if not self.activity:checkKeyExists(dataKey) then
9a1c54b2   zhouhaihai   活动
745
746
747
748
749
750
  			self.activity:create()
  		else
  			self.activity:load()
  		end
  	end
  
87cc3a35   zhengshouren   餐厅建筑升级逻辑
751
752
  	function Role:loadDiner()
  		local roleId = self:getProperty("id")
fa992c94   liuzujun   添加daily,diner,act...
753
754
  		local dataKey = string.format("%d", roleId)
  		self.dinerData = require("models.Diner").new({key = dataKey, id = roleId})
87cc3a35   zhengshouren   餐厅建筑升级逻辑
755
  		self.dinerData.owner = self
fa992c94   liuzujun   添加daily,diner,act...
756
  		if not self.dinerData:checkKeyExists(dataKey) then
87cc3a35   zhengshouren   餐厅建筑升级逻辑
757
758
759
760
761
762
  			self.dinerData:create()
  		else
  			self.dinerData:load()
  		end
  	end
  
440aa055   zhouhaihai   聊天
763
  
43cc5f51   gaofengduan   调整 equip 数据结构
764
  	function Role:loadEquips()
056c01a0   zhouhaihai   简化装备
765
  		-- 放role 里面了
43cc5f51   gaofengduan   调整 equip 数据结构
766
767
  	end
  
c5825110   saicom   新增用户商城相关数据
768
769
  	function Role:loadStoreInfo()
  		local roleId = self:getProperty("id")
fa992c94   liuzujun   添加daily,diner,act...
770
771
  		local dataKey = string.format("%d", roleId)
  		self.storeData = require("models.Store").new({key = dataKey, id = roleId})
c5825110   saicom   新增用户商城相关数据
772
  		self.storeData.owner = self
fa992c94   liuzujun   添加daily,diner,act...
773
  		if not self.storeData:checkKeyExists(dataKey) then
c5825110   saicom   新增用户商城相关数据
774
775
776
777
778
779
  			self.storeData:create()
  		else
  			self.storeData:load()
  		end
  	end
  
d99a4962   liuzujun   火花系统建表,新增虹光玉
780
781
782
783
784
785
786
787
788
789
790
  	--function Role:loadRoleIncre()
  	--	local roleId = self:getProperty("id")
  	--	local dataKey = string.format("%d", roleId)
  	--	self.roleIncre = require("models.RoleIncre").new({key = dataKey, id = roleId})
  	--	self.roleIncre.owner = self
  	--	if not self.roleIncre:checkKeyExists(dataKey) then
  	--		self.roleIncre:create()
  	--	else
  	--		self.roleIncre:load()
  	--	end
  	--end
a12bfcce   liuzujun   添加英雄表
791
  
056c01a0   zhouhaihai   简化装备
792
793
794
795
796
797
798
  	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   新一批日志记录
799
800
  		local oldCount = curTypeEquips[equipLv] or 0
  		local curCount = oldCount + count
056c01a0   zhouhaihai   简化装备
801
802
803
804
805
806
807
808
  
  		-- 是否足够上层判断
  		if curCount < 0 then
  			curCount = 0
  			curTypeEquips[equipLv] = nil
  		else
  			curTypeEquips[equipLv] = curCount
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
809
  
056c01a0   zhouhaihai   简化装备
810
811
812
813
814
815
816
  		if next(curTypeEquips) then
  			equips[equipType] = curTypeEquips
  		else
  			equips[equipType] = nil
  		end
  
  		self:setProperty("equips", equips)
44c6e479   zhouhaihai   增加部分日志
817
  
c59e058b   zhouhaihai   新一批日志记录
818
  		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
f22a33af   zhouhaihai   自己的日志
819
  		if pms.log then
7d31daa8   zhouhaihai   调整压测
820
  			local log = clone(pms.log)
f22a33af   zhouhaihai   自己的日志
821
822
823
824
825
826
827
828
829
830
831
832
833
834
  			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   增加部分日志
835
  
056c01a0   zhouhaihai   简化装备
836
837
  		if not pms.notNotify then
  			self:changeUpdates({{type = "equips", field = {equipType, equipLv}, value = curCount, isOnlyToC = true}}) -- 通知客户端
43cc5f51   gaofengduan   调整 equip 数据结构
838
839
840
841
  		end
  	end
  
  	function Role:getEquipCount(typ,lv)
056c01a0   zhouhaihai   简化装备
842
  		return (self:getProperty("equips")[typ] or {})[lv] or 0
43cc5f51   gaofengduan   调整 equip 数据结构
843
844
845
  	end
  
  	function Role:loadRunes()
43cc5f51   gaofengduan   调整 equip 数据结构
846
  		local roleId = self:getProperty("id")
a12bfcce   liuzujun   添加英雄表
847
848
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Rune` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
52249374   liuzujun   添加铭文表
849
850
  			local rune = require("models.Rune").new({key = string.format("%d",data.uid), uid=data.uid})
  			if rune:load(data) then
ad484303   gaofengduan   add rune
851
  				rune.owner = self
52249374   liuzujun   添加铭文表
852
  				self.runeBag[data.uid] = rune
ad484303   gaofengduan   add rune
853
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
854
855
856
  		end
  	end
  
3d8468b2   liuzujun   火花系统
857
858
  	function Role:loadSparks()
  		local roleId = self:getProperty("id")
d99a4962   liuzujun   火花系统建表,新增虹光玉
859
860
861
862
  		local res = mysqlproxy:query(string.format("SELECT * FROM `Spark` WHERE `roleid` = %s", roleId))
  		for _, data in ipairs(res) do
  			local spark = require("models.Spark").new({key = string.format("%d",data.id), id=data.id})
  			if spark:load(data) then
3d8468b2   liuzujun   火花系统
863
  				spark.owner = self
d99a4962   liuzujun   火花系统建表,新增虹光玉
864
  				self.sparkBag[data.id] = spark
3d8468b2   liuzujun   火花系统
865
866
867
868
  			end
  		end
  	end
  
555f745e   zhangqijia   feat: 一番赏
869
870
871
872
873
874
875
  	function Role:loadCapsules()
  		local now = skynet.timex()
          local roleId = self:getProperty("id")
  		local res = redisproxy:smembers(CAPSULE_ID_ROLE:format(roleId)) or {}
  		for _, key in pairs(res) do
  			local capsule = require("models.Capsule").new({ key = CAPSULE_ROLE:format(roleId,tonumber(key))})
  			capsule:load()
f382b4f2   zhangqijia   fix: 一番赏的抽奖bug
876
877
878
879
880
881
882
883
884
  			if capsule:isShow() then
  				if capsule:refreshing(now) then
  					capsule:init()
  					capsule:create()
  				end
  				self.capsules[key] = capsule
  			else
  				redisproxy:del(CAPSULE_ROLE:format(roleId, tonumber(key)))
  				redisproxy:srem(CAPSULE_ID_ROLE, key)
555f745e   zhangqijia   feat: 一番赏
885
  			end
555f745e   zhangqijia   feat: 一番赏
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
  		end
  
  		for _, data in pairs(csvdb["ichibankuji_mainCsv"]) do
  			for _, val in pairs(data) do
  				if val.typ == 0 then
  					local key = val.id..val.room
  					if not self.capsules[key] then
  						local capsule = require("models.Capsule").new({ key = CAPSULE_ROLE:format(roleId, tonumber(key)), id= val.id, room = val.room, typ = 0, name=val.name})
  						capsule:init()
  						capsule:create()
                          self.capsules[key] = capsule
  						redisproxy.sadd(CAPSULE_ID_ROLE:format(roleId), key)
  					end
  				end
  			end
  		end
  	end
  
ad484303   gaofengduan   add rune
904
  	-- 0 为操作成功
43cc5f51   gaofengduan   调整 equip 数据结构
905
  	function Role:addRune(params)
ad484303   gaofengduan   add rune
906
907
908
909
910
911
912
  		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")
d99a4962   liuzujun   火花系统建表,新增虹光玉
913
  			local runeUid = self:increBy("runeId" , 1)
ad484303   gaofengduan   add rune
914
  
a12bfcce   liuzujun   添加英雄表
915
916
917
918
  			local runeInfo = {
  				key = string.format("%d",roleId * MAX_RUNE_NUM + runeUid),
  				uid = roleId * MAX_RUNE_NUM + runeUid,
  				roleid = roleId,
ad484303   gaofengduan   add rune
919
920
921
922
  				type = params.type,
  				id = params.id,
  			}
  
a12bfcce   liuzujun   添加英雄表
923
  			local newRune = require("models.Rune").new(runeInfo)
ad484303   gaofengduan   add rune
924
925
926
  			newRune:create()
  			newRune:generateAttrs()
  			newRune.owner = self
4a25969f   chenyueqi   修复登录后新获得的铭文和火花无法装...
927
  			self.runeBag[roleId * MAX_RUNE_NUM + runeUid] = newRune
ee999bde   zhouhaihai   零件优化
928
929
930
931
932
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newRune:data())
  				SendPacket(actionCodes.Role_loadRunes, MsgPack.pack(response))
  			end
89338c47   zhouhaihai   技能目标
933
  			self:checkTaskEnter("AddRune", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
44c6e479   zhouhaihai   增加部分日志
934
  
c59e058b   zhouhaihai   新一批日志记录
935
  			self:logItems(params.id, 0, 1, params.log)
f22a33af   zhouhaihai   自己的日志
936
  			if params.log then
7d31daa8   zhouhaihai   调整压测
937
  				local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
938
939
940
941
942
943
944
945
946
947
948
949
  				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   增加部分日志
950
  
c7ecb87f   zhouhaihai   添加 测试账号 方法
951
  			return 0, newRune
43cc5f51   gaofengduan   调整 equip 数据结构
952
  		else
ad484303   gaofengduan   add rune
953
  			return 1
43cc5f51   gaofengduan   调整 equip 数据结构
954
  		end
43cc5f51   gaofengduan   调整 equip 数据结构
955
956
  	end
  
3d8468b2   liuzujun   火花系统
957
958
959
960
961
962
963
964
965
  	-- 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")
d99a4962   liuzujun   火花系统建表,新增虹光玉
966
  			local sparkUid = self:increBy("sparkId" , 1)
3d8468b2   liuzujun   火花系统
967
968
  
  			local sparkInfo = {
d99a4962   liuzujun   火花系统建表,新增虹光玉
969
970
971
  				key = string.format("%d",roleId * MAX_SPARK_NUM + sparkUid),
  				id = roleId * MAX_SPARK_NUM + sparkUid,
  				roleid = roleId,
3d8468b2   liuzujun   火花系统
972
973
  				cfg_id = params.id,
  			}
3d8468b2   liuzujun   火花系统
974
975
976
977
  			local newSpark = require("models.Spark").new(sparkInfo)
  			newSpark:create()
  			newSpark:addAttr(data.attr:toNumMap())
  			newSpark.owner = self
4a25969f   chenyueqi   修复登录后新获得的铭文和火花无法装...
978
  			self.sparkBag[roleId * MAX_SPARK_NUM + sparkUid] = newSpark
3d8468b2   liuzujun   火花系统
979
980
981
  			if not params.notNotify then
  				local response = {}
  				table.insert(response, newSpark:data())
3d8468b2   liuzujun   火花系统
982
983
  				SendPacket(actionCodes.Role_loadSparks, MsgPack.pack(response))
  			end
d99a4962   liuzujun   火花系统建表,新增虹光玉
984
985
  
  			--self:checkTaskEnter("AddSpark", {id = params.id, type = params.type, rarity = data.rarity}, params.notNotify)
3d8468b2   liuzujun   火花系统
986
987
988
989
990
  
  			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
d99a4962   liuzujun   火花系统建表,新增虹光玉
991
  					print("addSpark error log have cint1 or cint2 or cint3 ", debug.traceback())
3d8468b2   liuzujun   火花系统
992
993
994
  				end
  
  				log["cint1"] = sparkUid
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
995
996
  				log["cint2"] = params.id
  				log["cint3"] = 0
3d8468b2   liuzujun   火花系统
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
  
  				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")
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
1026
  					log["cint3"] = spark:getProperty("level")
3d8468b2   liuzujun   火花系统
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
  
  					self:mylog("out_spark", log)
  				else
  					print("delSparks no log ", debug.traceback())
  				end
  
  				self.sparkBag[sparkId] = nil
  				table.insert(bDel, sparkId)
  			end
  		end
  
d99a4962   liuzujun   火花系统建表,新增虹光玉
1038
1039
1040
  		-- delete spark
  		mysqlproxy:query(string.format("DELETE FROM `Spark` WHERE `id` in (%s)", table.concat(bDel, ",")))
  
3d8468b2   liuzujun   火花系统
1041
1042
1043
1044
1045
1046
1047
1048
  		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   增加部分日志
1049
1050
  	function Role:delRunes(runeIds, params) -- 批量删除 {id, }
  		params = params or {}
497f9a67   zhouhaihai   卖零件
1051
1052
  		local roleId = self:getProperty('id')
  		local bDel = {}
2445248d   zhouhaihai   去掉热门料理
1053
  		for _, runeId in pairs(runeIds) do
497f9a67   zhouhaihai   卖零件
1054
1055
  			local rune = self.runeBag[runeId]
  			if rune and rune:getProperty("refer") == 0 then
44c6e479   zhouhaihai   增加部分日志
1056
  
c59e058b   zhouhaihai   新一批日志记录
1057
  				self:logItems(rune:getProperty("id"), 1, 0, params.log)
f22a33af   zhouhaihai   自己的日志
1058
  				if params.log then
7d31daa8   zhouhaihai   调整压测
1059
  					local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
  					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   增加部分日志
1072
  
497f9a67   zhouhaihai   卖零件
1073
1074
1075
1076
1077
  				self.runeBag[runeId] = nil
  				table.insert(bDel, runeId)
  			end
  		end
  
a12bfcce   liuzujun   添加英雄表
1078
  		-- delete rune
2ca93972   liuzujun   添加邮件表
1079
1080
  		mysqlproxy:query(string.format("DELETE FROM `Rune` WHERE `uid` in (%s)", table.concat(bDel, ",")))
  
497f9a67   zhouhaihai   卖零件
1081
1082
1083
1084
1085
1086
1087
  		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
1088
1089
1090
1091
1092
  	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 数据结构
1093
  			end
43cc5f51   gaofengduan   调整 equip 数据结构
1094
  		end
ee3ac0b5   gaofengduan   fix magic
1095
  		return runeSet
43cc5f51   gaofengduan   调整 equip 数据结构
1096
1097
  	end
  
70cc72d7   zhouhaihai   拾荒bug
1098
  	function Role:getAdvData(notNotify)
43cc5f51   gaofengduan   调整 equip 数据结构
1099
  		if not self.advData then
46fac6f1   zhouahaihai   酱料
1100
  			self.advData = require("adv.Adv").new(self)
70cc72d7   zhouhaihai   拾荒bug
1101
1102
1103
1104
1105
1106
1107
  			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   酱料
1108
1109
1110
  		end
  		return self.advData
  	end
bd15e9bc   zhouhaihai   购买剧情
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
  
  	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   属性计算
1123
1124
1125
  
  	function Role:warningHeartTooQuick()
  		-- 加速器检测
e3c5cc5e   zhouhaihai   跨服竞技场over
1126
1127
1128
1129
  		local heartWarning = self:getProperty("heartWarning")
  		heartWarning = heartWarning + 1
  		self:setProperty("heartWarning", heartWarning)
  		if heartWarning == 50 then
44c6e479   zhouhaihai   增加部分日志
1130
  			self:setBan(30, 1) --封禁 30天
e3c5cc5e   zhouhaihai   跨服竞技场over
1131
1132
1133
1134
  			return
  		end
  		if heartWarning < 50 and heartWarning % 5 == 0 then
  			self:sendGmMsg("server_accountBanned_warning")
8e524d41   zhouhaihai   优化
1135
  			self:mylog("role_action",{desc = "heartWarning", int1 = heartWarning})
e3c5cc5e   zhouhaihai   跨服竞技场over
1136
1137
1138
1139
1140
1141
1142
  		end
  	end
  
  	function Role:setBan(time, banType)
  		time = time or 0
  		banType = banType or 0
  		local now = skynet.timex()
edf2ee12   zhouhaihai   防作弊
1143
  		if time <= 0 then
e3c5cc5e   zhouhaihai   跨服竞技场over
1144
1145
1146
  			self:setProperty("banTime", 0)
  			self:setProperty("banType", 0)
  			self:setProperty("heartWarning", 0)
8e524d41   zhouhaihai   优化
1147
  			self:mylog("role_action", {desc = "ban_rm"})
e3c5cc5e   zhouhaihai   跨服竞技场over
1148
  		else
edf2ee12   zhouhaihai   防作弊
1149
  			self:sendGmMsg(globalCsv.ban_tips[banType] or globalCsv.ban_tips[0])
edf2ee12   zhouhaihai   防作弊
1150
  			self:setProperty("banTime", math.ceil(now + 86400 * time))
e3c5cc5e   zhouhaihai   跨服竞技场over
1151
  			self:setProperty("banType", banType)
edf2ee12   zhouhaihai   防作弊
1152
1153
  			self:resetRank()
  			self:mylog("role_action", {desc = "ban", int1 = math.ceil(time), int2 = banType})
e3c5cc5e   zhouhaihai   跨服竞技场over
1154
1155
1156
  		end
  	end
  
edf2ee12   zhouhaihai   防作弊
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
  	-- 清掉所有排行榜
  	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
1180
1181
  	function Role:sendGmMsg(text, isNotKey)
  		SendPacket(actionCodes.Sys_maintainNotice, MsgPack.pack({ body = text, iskey = not isNotKey}))
edf2ee12   zhouhaihai   防作弊
1182
1183
1184
1185
1186
1187
1188
  		
  		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   属性计算
1189
  	end
a41b9076   zhouhaihai   增加羁绊方法
1190
  
e8ca14c4   zhouhaihai   羁绊加成去掉
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
  	-- 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
1202
  		
e8ca14c4   zhouhaihai   羁绊加成去掉
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
  	-- 	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   羁绊加成
1235
  
e84a1beb   liuzujun   gm后台查询日志,公告相关协议
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
  	function Role:getRewardLogStr(gift)
          if not gift then return '' end
  		local tgift = {}
  		if type(gift) == "string" then
  			for _, one in pairs(gift:toTableArray(true)) do
  				tgift[one[1]] = (tgift[one[1]] or 0) + one[2]
  			end
  		else
  			tgift = gift
  		end
          local t = {}
          for k, v in pairs(tgift) do
              local name = csvdb['itemCsv'][k].name
              table.insert(t, string.format("%s*%s", name, v))
          end
          return table.concat(t, ',')
      end
  
  	function Role:getHerosLogStr(heros)
  		local t = {}
  		for _, id in pairs(heros or {}) do
  			local hero = self.heros[id]
  			if hero then
  				local name = csvdb["unitCsv"][hero:getProperty("type")].name
                  local level = hero:getProperty("level")
                  local wakeL = hero:getProperty("wakeL")
                  table.insert(t, string.format("%s(%s %s)", name,level,wakeL))
  			end
  		end
          return table.concat(t, ',')
  	end
  
ccbafe67   zhouhaihai   冒险神器和buff
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
  	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   羁绊加成去掉
1287
1288
  	-- function Role:getRealBattleValue(heros, activeRelation) -- 获取队伍战斗力  羁绊加成
  	function Role:getRealBattleValue(heros) -- 获取队伍战斗力  羁绊加成
f317b790   zhouhaihai   pvp 遗留
1289
  		heros = heros or {}
e8ca14c4   zhouhaihai   羁绊加成去掉
1290
  		-- local activeRelation = activeRelation or self:getHeroActiveRelation(heros)
b53593b5   zhouhaihai   羁绊加成
1291
1292
1293
1294
  		local battleValue = 0
  		for _, id in pairs(heros) do
  			local hero = self.heros[id]
  			if hero then
e8ca14c4   zhouhaihai   羁绊加成去掉
1295
1296
  				-- battleValue = battleValue + hero:getBattleValue(activeRelation)
  				battleValue = battleValue + hero:getBattleValue()
b53593b5   zhouhaihai   羁绊加成
1297
1298
1299
1300
  			end
  		end
  		return battleValue
  	end
09be9059   zhouhaihai   冒险接口
1301
1302
  
  	function Role:getAdvHangLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1303
  		return globalCsv.adv_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCount)
09be9059   zhouhaihai   冒险接口
1304
  	end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1305
  
fc316d1f   zhouhaihai   冒险体力优化
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
  	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   微调 结算返还
1320
  		if change == 0 then return end
fc316d1f   zhouhaihai   冒险体力优化
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
  		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   冒险体力优化
1331
1332
  		self:updateProperties({
  			advC = count + change,
92ef9591   zhouhaihai   冒险次数
1333
  			advCT = nextTime,
fc316d1f   zhouhaihai   冒险体力优化
1334
1335
1336
  		})
  	end
  
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1337
  	function Role:getAdvElLimit()
9cede2e2   zhouhaihai   主推红点 和冒险次数
1338
  		return globalCsv.adv_endless_daily_cross_count + self:getFuncLv(FuncOpenType.AdvCountEL)
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1339
1340
  	end
  
d232676a   zhouhaihai   功能解锁 冒险返回
1341
1342
1343
1344
1345
1346
  	-- 走 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 结构
1347
  		if self:checkHangPass(data.carbonId) then 
d232676a   zhouhaihai   功能解锁 冒险返回
1348
1349
1350
1351
1352
  			return true
  		else
  			return false
  		end 
  	end
7828ffd0   zhouhaihai   冒险 连续选择点 和 地图因子
1353
  
d232676a   zhouhaihai   功能解锁 冒险返回
1354
  	-- 走 unlock 表的主动解锁
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1355
1356
1357
1358
  	function Role:isFuncOpen(func)
  		return self:getProperty("funcOpen")[func] == 1
  	end
  
bab30666   zhouhaihai   增加通用功能等级 字段
1359
1360
  	function Role:getFuncLv(func)
  		return self:getProperty("funcLv")[func] or 1
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1361
1362
  	end
  
ccbafe67   zhouhaihai   冒险神器和buff
1363
1364
1365
1366
1367
1368
1369
1370
1371
  	-- 参数有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 神器
1372
  		elseif curData.unlock == 2 then  -- 特殊神器 不可解锁
ccbafe67   zhouhaihai   冒险神器和buff
1373
  			return isCheckLevel
d3da3368   zhouhaihai   冒险地图被动技, buff 神器
1374
  		elseif curData.unlock == 3 then
ccbafe67   zhouhaihai   冒险神器和buff
1375
1376
1377
1378
1379
  			return isEndless
  		end
  		return true
  	end
  
44c6e479   zhouhaihai   增加部分日志
1380
1381
1382
  	function Role:funcOpen(func, count, params)
  		params = params or {}
  		
ad88ba14   zhouhaihai   工坊 bug
1383
  		count = count or 1
44c6e479   zhouhaihai   增加部分日志
1384
  
887c1843   zhouhaihai   日志新一批
1385
  		self:logItems(func, 0, count, params.log)
f22a33af   zhouhaihai   自己的日志
1386
  		if params.log then
7d31daa8   zhouhaihai   调整压测
1387
  			local log = clone(params.log)
f22a33af   zhouhaihai   自己的日志
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
  			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   增加部分日志
1399
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1400
  		if csvdb["itemCsv"][func] and csvdb["itemCsv"][func].type == ItemType.FuncOpen then
bab30666   zhouhaihai   增加通用功能等级 字段
1401
  			local unlockData = csvdb["unlockCsv"][func]
9be3f3ea   zhouhaihai   日志需求
1402
  			self:log("function_open", {function_id = func})
db3c56ad   zhouhaihai   冒险相关
1403
  			if unlockData.type == 4 then -- 解锁神器
f45d3a7b   zhouhaihai   adv_unlock
1404
1405
1406
  				if self:getProperty("advAFOpen")[unlockData.value1] ~= 1 then
  					self:changeUpdates({{type = "advAFOpen", field = unlockData.value1, value = 1}})
  				end
4b61215f   zhouhaihai   语法错误
1407
  			elseif TypeIsFunc[unlockData.type] then
bab30666   zhouhaihai   增加通用功能等级 字段
1408
  				if unlockData.value1 == 0 or unlockData.value1 == 1 then
f45d3a7b   zhouhaihai   adv_unlock
1409
1410
1411
  					if self:getProperty("funcOpen")[unlockData.type] ~= 1 then
  						self:changeUpdates({{type = "funcOpen", field = unlockData.type, value = 1}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1412
1413
  				else
  					local oldV = self:getFuncLv(unlockData.type)
59835765   zhouhaihai   排行榜
1414
  					local newLv = math.min(oldV + count, unlockData.value2)
f45d3a7b   zhouhaihai   adv_unlock
1415
1416
1417
  					if oldV ~= newLv then
  						self:changeUpdates({{type = "funcLv", field = unlockData.type, value = newLv}})
  					end
bab30666   zhouhaihai   增加通用功能等级 字段
1418
1419
  				end
  			else
f45d3a7b   zhouhaihai   adv_unlock
1420
1421
1422
  				if self:getProperty("funcOpen")[func] ~= 1 then
  					self:changeUpdates({{type = "funcOpen", field = func, value = 1}})
  				end
bab30666   zhouhaihai   增加通用功能等级 字段
1423
  			end
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1424
1425
1426
  		end
  	end
  
e51ff6d2   zhouhaihai   冒险~
1427
  	function Role:advChapterIsOpen(chapterId)
e51ff6d2   zhouhaihai   冒险~
1428
  		local chapterData = csvdb["adv_chapterCsv"][chapterId]
fe562215   chenyueqi   拾荒章节解锁条件修改
1429
1430
1431
1432
  		if chapterData.prepose == "" then return true end
  		local prepose = chapterData.prepose:toArray(true,"=")
  		if prepose[1] == 1 then
  			if chapterData.prepose ~= 0 and not self:checkHangPass(prepose[2]) then return false end
749528eb   liguanghui   拾荒章节解锁条件修改
1433
  		elseif prepose[1] == 2 then
fe562215   chenyueqi   拾荒章节解锁条件修改
1434
  			return self:checkAdvChapterPass(prepose[2])
749528eb   liguanghui   拾荒章节解锁条件修改
1435
1436
  		elseif prepose[1] == 3 then
  			return self:checkOverGuide(prepose[2])
fe562215   chenyueqi   拾荒章节解锁条件修改
1437
  		end
e51ff6d2   zhouhaihai   冒险~
1438
  		return true
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1439
1440
  	end
  
fe562215   chenyueqi   拾荒章节解锁条件修改
1441
1442
  
  
4faef572   zhouhaihai   冒险任务,冒险扫荡, 冒险中继
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
  	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   无尽模式
1454
  	-- 赛季检查
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1455
1456
1457
1458
  	function Role:advEndlessSeasonCheck(notNotify)
  		--  重置一下冒险
  		local nowSeason = tonum(redisproxy:hget("adv_season", "idx"))
  		if self:getProperty("advElS") ~= nowSeason then
0e3ab88d   zhouhaihai   中继层
1459
1460
1461
1462
  			-- 胡博文让注释掉 衰减 从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   赛季更新完善 无尽冒险排行榜
1463
1464
1465
1466
1467
1468
1469
  
  			-- 正在无尽冒险清掉
  			local adv = self:getAdvData()
  			if adv:isRunning() and adv:isEndless() then
  				adv:forceOver()
  			end
  
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1470
1471
1472
  			-- 路过的中继层重置掉
  			local advRelay = self:getProperty("advRelay")
  			advRelay[-1] = nil
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1473
1474
1475
  			-- 清掉冒险手册
  			self:updateProperties({
  				advEAchiev = {},
0e3ab88d   zhouhaihai   中继层
1476
1477
  				advElM = 0,
  				advElS = nowSeason,
6dc482bb   zhouhaihai   中继层完成, 新增两个冒险物品使用效果
1478
  				advRelay = advRelay,
1b20cfdb   zhouhaihai   赛季更新完善 无尽冒险排行榜
1479
  			}, notNotify)
e1355da3   zhouhaihai   神器 被动
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
  
  
  			-- 重新设定冒险章节和冒险结束时间
  			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   无尽模式
1491
1492
  		end
  	end
59835765   zhouhaihai   排行榜
1493
  
65b551a7   chenyueqi   海港贸易季初版
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
  	-- 结算上期海港贸易季
  	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 {}
62c5e2f0   chenyueqi   海港贸易活动自动领取结算奖励时,增...
1506
  			if not reset and seaport.join and (not donate[1] or not donate[2]) then
65b551a7   chenyueqi   海港贸易季初版
1507
  				local result = self:getSeaportServerProgress()
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1508
  				for idx, set in ipairs(csvdb["seaport_purchaseCsv"]) do
65b551a7   chenyueqi   海港贸易季初版
1509
1510
  					local done = true
  					for id, data in ipairs(set) do
ab2928d9   chenyueqi   海港贸易季结束后自动领取奖励,第二...
1511
  						if donate[idx] or not result[idx] or not result[idx][id] or result[idx][id] < data.need_num then
65b551a7   chenyueqi   海港贸易季初版
1512
1513
1514
1515
1516
1517
  							done = false
  							break
  						end
  					end
  					if done then
  						update = true
70fb62d1   liuzujun   服务器数据打点
1518
1519
1520
1521
1522
1523
  						--redisproxy:insertEmail({
  						--	roleId = self:getProperty("id"),
  						--	emailId = idx == 1 and 361 or 362,
  						--	attachments = set[1].phase_award,
  						--})
  						self:sendMail(idx == 1 and 361 or 362, nil, set[1].phase_award)
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1524
  						-- self:award(set[1].phase_award, {log = {desc = "seaportReward", int1 = set[1].phase, int2 = set[1].id}})
98699b0c   chenyueqi   自动结算海岛贸易季 捐赠奖励领取报错
1525
  						donate[idx] = 1
65b551a7   chenyueqi   海港贸易季初版
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
  					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"]
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
1558
  				local expData = self:getProperty("hangInfo").expData or {}
65b551a7   chenyueqi   海港贸易季初版
1559
1560
  				local taskCsv = csvdb["seaport_taskCsv"]
  				local endTime = openTime0 + 86400 * 2
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1561
1562
  				local reward = {}
  
65b551a7   chenyueqi   海港贸易季初版
1563
1564
1565
1566
1567
1568
1569
1570
  				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
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
1571
  							--if not carbonCsv[expCarbonId] then break end
65b551a7   chenyueqi   海港贸易季初版
1572
1573
  
  							local totalCoef = 0
9fc8b7f0   chenyueqi   分割字符串错误
1574
  						    for _, heroId in ipairs(teams:toArray(true,"=")) do
65b551a7   chenyueqi   海港贸易季初版
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
  						        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
  
2a542865   liuzujun   齿轮、经验 奖励投放逻辑调整
1588
1589
  							local money = math.ceil((expData.money or 0) / 5 * data.time * data.money_clear)
  							local exp = math.ceil((expData.exp or 0) / 5 * data.time * data.exp_clear)
65b551a7   chenyueqi   海港贸易季初版
1590
1591
1592
1593
1594
1595
1596
1597
1598
  							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   海港贸易季自动填充,活动结束后的奖...
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
  
  						    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   海港贸易季初版
1613
  						end
d9d63fa0   chenyueqi   海港贸易季自动填充,活动结束后的奖...
1614
  						rewardStr = rewardStr .. string.format("%s=%s",itemId,value)
65b551a7   chenyueqi   海港贸易季初版
1615
  					end
70fb62d1   liuzujun   服务器数据打点
1616
1617
1618
1619
1620
1621
  					--redisproxy:insertEmail({
  					--	roleId = self:getProperty("id"),
  					--	emailId = 363,
  					--	attachments = rewardStr,
  					--})
  					self:sendMail(363, nil, rewardStr)
65b551a7   chenyueqi   海港贸易季初版
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
  				end
  			end
  			seaport.collect = {}
  
  			if update or reset then
  				if reset then
  					seaport = {
  						time = openTime0,
  						shop = {},
  						collect = {},
  						donate = {}
  					}
  				end
98699b0c   chenyueqi   自动结算海岛贸易季 捐赠奖励领取报错
1635
  				self:updateProperty({field = "seaport", value = seaport})
65b551a7   chenyueqi   海港贸易季初版
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
  			end
  		end
  		
  		if oldTime == openTime0 then
  			if openTime1 == 1 or openTime2 == 1 then
  				return
  			end
  			getReward()
  		else
  			getReward(true)
  		end
  	end
  
a5dc3b0e   chenyueqi   回归活动初版
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
  	-- 检查回归者
  	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   海港贸易季初版
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
  	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   从数据库读取捐赠物品顺序错误
1673
  			for i,v in pairs(temp) do
65b551a7   chenyueqi   海港贸易季初版
1674
  				if v then
5fb0ac5f   liguanghui   海港贸易相关bug修复
1675
  					result[idx][i] = tonumber(v)
65b551a7   chenyueqi   海港贸易季初版
1676
1677
1678
1679
1680
1681
  				end
  			end
  		end
  		return result
  	end
  
9ced5432   zhouhaihai   冒险支援效果 保底事件
1682
1683
1684
1685
1686
1687
1688
  	-- 获得激活的冒险效果
  	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   数据保护
1689
  				if achvData and achvData.support ~= 0 then
9ced5432   zhouhaihai   冒险支援效果 保底事件
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
  					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   排行榜
1737
  
cfd68b3a   zhouhaihai   时间重置 新逻辑
1738
  	
59835765   zhouhaihai   排行榜
1739
  	function Role:getCurDinerRankKey()
bd4fb541   zhouhaihai   增加物品过期系统
1740
  		local round = self:getTimeResetRound(TimeReset.DinerRank)
59835765   zhouhaihai   排行榜
1741
  		local idx = 1
bd4fb541   zhouhaihai   增加物品过期系统
1742
  		if round % 2 == 1 then
59835765   zhouhaihai   排行榜
1743
1744
1745
1746
1747
1748
  			idx = 2 
  		end
  		return RANK_DINER[idx]
  	end
  
  	local StdTowerRankTime = toUnixtime("2019010100")
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1749
  	local TowerRankInfo = {
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
1750
1751
1752
1753
  		[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   电波塔属性塔功能部分功能草稿
1754
1755
1756
  	}
  	function Role:setTowerRank(level,tType)
  		tType = tType or 1
59835765   zhouhaihai   排行榜
1757
1758
1759
  		local now = skynet.timex()
  		local ct = math.ceil((now - StdTowerRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
  		local ct = 10000 - ct  -- 越早的排名越靠前
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1760
1761
1762
  
  		
  		local info = TowerRankInfo[tType]
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
1763
  		local towerTeam = self:getTowerTeamFormat(tostring(tType))
59835765   zhouhaihai   排行榜
1764
1765
1766
1767
1768
1769
1770
1771
1772
  		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
1773
  			format = self:getTeamHerosInfo(towerTeam).heros,
59835765   zhouhaihai   排行榜
1774
1775
1776
  		}
  		local roleId = self:getProperty("id")
  		redisproxy:pipelining(function (red)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1777
1778
  			red:zadd(info.rank, score, roleId)	--更新分数
  			red:hset(info.rankInfo, roleId,  MsgPack.pack(curInfo))
59835765   zhouhaihai   排行榜
1779
1780
1781
  		end)
  	end
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1782
1783
1784
  	function Role:getTowerRank(tType)
  		tType = tType or 1
  		local info = TowerRankInfo[tType]
59835765   zhouhaihai   排行榜
1785
  		local list = {}
6e76008a   liguanghui   bug修复:电波塔排行榜协议报错
1786
  		local ids = redisproxy:zrevrange(info.rank, 0 , 99)
59835765   zhouhaihai   排行榜
1787
1788
1789
1790
1791
1792
  		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修复:电波塔排行榜协议报错
1793
  					red:hget(info.rankInfo, roleId)
59835765   zhouhaihai   排行榜
1794
1795
1796
1797
1798
1799
1800
1801
  				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修复:电波塔排行榜协议报错
1802
  		local rank = redisproxy:ZREVRANK(info.rank, self:getProperty("id"))
59835765   zhouhaihai   排行榜
1803
1804
1805
1806
1807
1808
1809
1810
  		if not rank then
  			rank = -1
  		else
  			rank = rank + 1
  		end
  		return {list = list, rank = rank}
  	end
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
1811
1812
1813
1814
  	function Role:getTowerRankOneInfo(roleId,tType)
  		tType = tType or 1
  		local info = TowerRankInfo[tType]
  		local data = redisproxy:hget(info.rankInfo, roleId)
59835765   zhouhaihai   排行榜
1815
1816
1817
1818
1819
  		if data then
  			local player = MsgPack.unpack(data)
  			return player.format
  		end
  	end
f60b89b1   zhouhaihai   奖励副本
1820
  
1e2c5316   zhangqijia   fix: 修改昵称,餐厅/电波塔/...
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
  	function Role:updateTowerRankName(name)
  		if name:len() <= 0 then return end
  		local roleId = self:getProperty("id")
  		for _, info in pairs(TowerRankInfo) do
  			local data = redisproxy:hget(info.rankInfo, roleId)
  			if data then
  				local player = MsgPack.unpack(data)
  				player.name = name
  				redisproxy:hset(info.rankInfo, roleId, MsgPack.pack(player))
  			end
  		end
  	end
  
      function Role:updateAdvRankName(name)
  		if name:len() <= 0 then return end
  		local roleId = self:getProperty("id")
  		local data = redisproxy:hget(RANK_ADV_INFO, roleId)
  		if data then
  			local player = MsgPack.unpack(data)
  			player.name = name
  			redisproxy:hset(RANK_ADV_INFO, roleId, MsgPack.pack(player))
  		end
  	end
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1845
  	function Role:addAdvLvExp(exp)
f60b89b1   zhouhaihai   奖励副本
1846
  		local advL = self:getProperty("advL")
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1847
  		local level = advL[1]
97807511   zhouhaihai   增加日志
1848
  		local oldLevel = level
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1849
1850
1851
1852
1853
1854
1855
  		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   资助升级等级限制放开
1856
1857
  			--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   冒险资助升级属性奖励
1858
1859
1860
1861
  				newExp = newExp - csvdb["adv_level_fundCsv"][level].exp
  				level = level + 1
  			else
  				newExp = csvdb["adv_level_fundCsv"][level].exp - 1 -- 没有下一级了 经验溢出太多 扣除
f60b89b1   zhouhaihai   奖励副本
1862
1863
  			end
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1864
1865
1866
  
  		if level > advL[1] then
  			self:checkTaskEnter("AdvLevel", {level = level})
70fb62d1   liuzujun   服务器数据打点
1867
  			self:mylog("adv_action", {desc = "adv_level", int1 = level})
f60b89b1   zhouhaihai   奖励副本
1868
  		end
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1869
1870
  		advL[1] = level
  		advL[2] = newExp
f60b89b1   zhouhaihai   奖励副本
1871
  		self:updateProperty({field = "advL", value = advL})
97807511   zhouhaihai   增加日志
1872
  		return oldLevel, level
f60b89b1   zhouhaihai   奖励副本
1873
  	end
c384626d   zhouhaihai   好友
1874
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
  	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   资助对积分的影响
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
  	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   冒险
1900
  		return math.floor(score * (1 + change / 100))
9f956e88   zhouhaihai   资助对积分的影响
1901
1902
  	end
  
6b5c9206   zhouhaihai   冒险资助升级属性奖励
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
  	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   好友
1918
  	function Role:getTeamBattleInfo(team)
f603a60f   zhouhaihai   支援技实装
1919
  		local teamInfo = {heros = {}, supports = {}}
e8ca14c4   zhouhaihai   羁绊加成去掉
1920
  		-- local activeRelation = self:getHeroActiveRelation(team.heros)
c384626d   zhouhaihai   好友
1921
1922
  
  		for slot, id in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1923
1924
  			local info = {}
  			local hero = self.heros[id]
c384626d   zhouhaihai   好友
1925
  			if not hero then
fa565e0c   zhouhaihai   优化结构
1926
1927
  				print("error heroid " .. id)
  			end
e8ca14c4   zhouhaihai   羁绊加成去掉
1928
1929
  			-- local attrs = hero:getTotalAttrs({activeRelation = activeRelation})
  			local attrs = hero:getTotalAttrs()
fa565e0c   zhouhaihai   优化结构
1930
1931
  			for k, v in pairs(AttsEnumEx) do
  				info[v] = (attrs[v] or 0)
c384626d   zhouhaihai   好友
1932
  			end
c384626d   zhouhaihai   好友
1933
1934
  			info.type = hero:getProperty("type")
  			info.level = hero:getProperty("level")
42f465e5   suhongyang   战斗参数传传入觉醒等级
1935
  			info.wakeL = hero:getProperty("wakeL")
8fd48928   chenyueqi   竞技场保存team数据时增加觉醒字段
1936
  			info.genius = hero:getProperty("genius")
fa565e0c   zhouhaihai   优化结构
1937
1938
  			info.blockLevel = hero:getSkillLevel(4)
  			info.specialLevel = hero:getSkillLevel(1)
aad10fac   suhongyang   战斗获取被动技能等级参数
1939
  			info.passiveLevel = hero:getSkillLevel(3)
a6508219   zhouhaihai   挂机奖励
1940
  			info.runeSkill = hero:getRuneSkill(102)
73db53c3   zhouhaihai   天赋技能
1941
  			info.talentSkills = hero:getTalentSkill()
fa565e0c   zhouhaihai   优化结构
1942
1943
  			teamInfo.heros[slot] = info
  		end
f603a60f   zhouhaihai   支援技实装
1944
1945
1946
  		for slot, id in pairs(team.supports or {}) do
  			teamInfo.supports[slot] = {id, self.dinerData:getProperty("dishTree"):getv(id, 0)}
  		end
f7f26c15   zhouhaihai   编队整理 增加 tactics战术
1947
  		teamInfo.tactics = globalCsv.tactics_skill_passive_cell[team.tactics] and team.tactics or nil
fa565e0c   zhouhaihai   优化结构
1948
1949
1950
  		return teamInfo
  	end
  
821e2704   zhouhaihai   heros 增加 supports
1951
1952
  	function Role:getTeamHerosInfo(team)
  		local format = {}
fa565e0c   zhouhaihai   优化结构
1953
  		local heros = {}
821e2704   zhouhaihai   heros 增加 supports
1954
  		for slot, heroId in pairs(team.heros or {}) do
fa565e0c   zhouhaihai   优化结构
1955
1956
1957
1958
1959
  			local hero = self.heros[heroId]
  			heros[slot] = {
  				type = hero:getProperty("type"),
  				level = hero:getProperty("level"),
  				wakeL = hero:getProperty("wakeL"),
8fd48928   chenyueqi   竞技场保存team数据时增加觉醒字段
1960
  				genius = hero:getProperty("genius"),
fa565e0c   zhouhaihai   优化结构
1961
  			}
c384626d   zhouhaihai   好友
1962
  		end
821e2704   zhouhaihai   heros 增加 supports
1963
1964
  		format.heros = heros
  		format.supports = team.supports or {}
57e52b3d   zhouhaihai   空的是nil
1965
  		format.tactics = team.tactics or nil
821e2704   zhouhaihai   heros 增加 supports
1966
  		return format
c384626d   zhouhaihai   好友
1967
1968
  	end
  
fa565e0c   zhouhaihai   优化结构
1969
  	function Role:getTeamBattleValue(heros)
3dbbc9f3   zhouhaihai   加上新的任务
1970
1971
1972
1973
1974
1975
1976
  		-- 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   优化结构
1977
1978
  	end
  
98d32f92   liuzujun   多编队
1979
1980
1981
1982
1983
  	function Role:updateHangTeamInfo()
  		local team = self:getTeamFormatByType(TeamSystemType.Hang)
  		if not team then return end
  
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
1984
  			hangTS = self:getTeamHerosInfo(team),
98d32f92   liuzujun   多编队
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
  			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   优化结构
2025
  	function Role:savePvpCTeam(team)
4cf74232   zhouhaihai   pvp
2026
  		if not team then
3dbbc9f3   zhouhaihai   加上新的任务
2027
  			team = self:getProperty("pvpTC")
4cf74232   zhouhaihai   pvp
2028
  		else
3dbbc9f3   zhouhaihai   加上新的任务
2029
  			self:updateProperty({field = "pvpTC", value = team})
4cf74232   zhouhaihai   pvp
2030
  		end
fa565e0c   zhouhaihai   优化结构
2031
  		self:setProperties({
821e2704   zhouhaihai   heros 增加 supports
2032
  			pvpTSC = self:getTeamHerosInfo(team),
fa565e0c   zhouhaihai   优化结构
2033
2034
2035
  			pvpTBC = self:getTeamBattleInfo(team),
  			pvpTBVC = self:getTeamBattleValue(team.heros),
  		})
c384626d   zhouhaihai   好友
2036
  	end
dc9d814f   zhouhaihai   邮件
2037
  
ab9f5400   zhouhaihai   临时代码
2038
2039
2040
2041
2042
2043
2044
2045
2046
  	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   报错
2047
  			if team[i] then
821e2704   zhouhaihai   heros 增加 supports
2048
  				pvpTSH[i] = self:getTeamHerosInfo(team[i])
c6940d28   zhouhaihai   报错
2049
2050
2051
  				pvpTBH[i] = self:getTeamBattleInfo(team[i])
  				pvpTBVH[i] = self:getTeamBattleValue(team[i].heros)
  			end
ab9f5400   zhouhaihai   临时代码
2052
2053
2054
2055
2056
2057
2058
2059
2060
  		end
  
  		self:setProperties({
  			pvpTSH = pvpTSH,
  			pvpTBH = pvpTBH,
  			pvpTBVH = pvpTBVH,
  		})
  	end
  
761b3ea8   chenyueqi   再改一波电波塔整容相关信息
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
  	-- 设置电波塔阵容
  	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   邮件
2074
2075
  	-- update
  	function Role:onRecoverTimer(now)
cfd68b3a   zhouhaihai   时间重置 新逻辑
2076
  		self:updateTimeReset(now, true)
dc9d814f   zhouhaihai   邮件
2077
  		self:checkNewEvent(now)
555f745e   zhangqijia   feat: 一番赏
2078
  		self:checkCapsule(now)
e9bfa7a2   liuzujun   其他玩家展示界面数据支持, 更新s...
2079
  		self:saveRoleData(now)
6136eaca   liuzujun   添加好友表
2080
2081
  	end
  
e9bfa7a2   liuzujun   其他玩家展示界面数据支持, 更新s...
2082
2083
      local SAVE_DATA_INTERVAL = 3
  	function Role:saveRoleData(now)
5c8c3b70   liuzujun   离线角色强制保存
2084
          if now and (now - self._lastSaveTs < SAVE_DATA_INTERVAL) then
e9bfa7a2   liuzujun   其他玩家展示界面数据支持, 更新s...
2085
2086
              return
          end
5c8c3b70   liuzujun   离线角色强制保存
2087
          self._lastSaveTs = now or skynet.timex()
6136eaca   liuzujun   添加好友表
2088
2089
2090
2091
2092
  		self:update()
  		local objs = {self.activity, self.dailyData, self.dinerData, self.storeData, self.roleIncre}
  		for _, info in ipairs(objs) do
  			info:update()
  		end
d99a4962   liuzujun   火花系统建表,新增虹光玉
2093
  		local tbObjs = {self.friends, self.heros, self.runeBag, self.sparkBag}
6136eaca   liuzujun   添加好友表
2094
2095
  		for _, tbObj in ipairs(tbObjs) do
  			for _, info in pairs(tbObj) do
d99a4962   liuzujun   火花系统建表,新增虹光玉
2096
  				info:update()
6136eaca   liuzujun   添加好友表
2097
2098
  			end
  		end
dc9d814f   zhouhaihai   邮件
2099
2100
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2101
  	local function breath(sec, name)
dc9d814f   zhouhaihai   邮件
2102
  		local last_breath = 0
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2103
2104
2105
  		return function (now, role)
  			if name == "email" and role.sendMailFlag then
  				last_breath = now + sec
0d892cdf   liuzujun   发送邮件清标记
2106
  				role.sendMailFlag = false
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2107
2108
  				return true
  			end
dc9d814f   zhouhaihai   邮件
2109
2110
2111
2112
2113
2114
2115
2116
  			if now >= last_breath then
  				last_breath = now + sec
  				return true
  			end
  			return false
  		end
  	end
  	local breathes = {
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2117
2118
  		["email"] = breath(120, "email"), -- email
  		["pvphg"] = breath(300, "pvphg"), -- 高级竞技场 奖励满的红点
dc9d814f   zhouhaihai   邮件
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
  	}
  	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
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
2137
  						red:hgetall(string.format("globalEmail:%s", id))
dc9d814f   zhouhaihai   邮件
2138
2139
2140
2141
  					end
  				end)
  				for _, data in ipairs(redret) do
  					local email = tarr2tab(data)
62ed4275   liuzujun   添加新的延時類型郵件
2142
2143
2144
2145
2146
2147
2148
2149
2150
  					-- 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   邮件
2151
2152
2153
2154
2155
2156
2157
  						and ( not email.endtime or tonum(email.endtime) > now )then
  						return true
  					end
  				end
  			end
  
  			local roleId = self:getProperty("id")
2ca93972   liuzujun   添加邮件表
2158
  			local res = mysqlproxy:query(string.format("SELECT `id` FROM `Email` WHERE `roleId` = %d AND `status` = 0;", roleId))
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
2159
2160
  
  			self.SendMailFlag = false
2ca93972   liuzujun   添加邮件表
2161
  			return next(res)
dc9d814f   zhouhaihai   邮件
2162
  		end
42327de8   zhouhaihai   高级竞技场红点
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
  
  		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   未测试版好友能量助力活动
2176
  		end
dc9d814f   zhouhaihai   邮件
2177
2178
2179
  		
  		local events = {}
  		for name, breath in pairs(breathes) do
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2180
  			if breath(now, self) and checks[name] then
dc9d814f   zhouhaihai   邮件
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
  				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 结构
2197
2198
2199
2200
2201
2202
  	function Role:checkHangPass(carbonId)
  		local hangPass = self:getProperty("hangPass")
  		local diff = math.floor(carbonId / 10000)
  		return (hangPass[diff] or 0) >= carbonId
  	end
  
5204a839   liuzujun   活动电台任务结束时候清理任务
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
  	function Role:checkActivityBattlePass(battleId)
  		local isOpen, actId = self.activity:isOpen("ChallengeLevel")
  		if not isOpen then return end
  
  		local actData = self.activity:getActData("ChallengeLevel") or {}
  		local battleInfo = actData[battleId] or {}
  
  		return battleInfo["star"] ~= nil
  	end
  
fe562215   chenyueqi   拾荒章节解锁条件修改
2213
2214
2215
2216
2217
2218
2219
  	function Role:checkAdvChapterPass(chapterId)
  		local chapterData = csvdb["adv_chapterCsv"][chapterId]
  		local advPass = self:getProperty("advPass") or {}
  		local pass = advPass[chapterId] or 0
  		return pass >= chapterData.limitlevel
  	end
  
15e1f084   zhouhaihai   挂机gm
2220
  	function Role:hangFinish(carbonId)
33be3111   zhouhaihai   修改hangPass 结构
2221
2222
  		local hangPass = self:getProperty("hangPass")
  		local diff = math.floor(carbonId / 10000)
15e1f084   zhouhaihai   挂机gm
2223
  		if (hangPass[diff] or 0) < carbonId then
33be3111   zhouhaihai   修改hangPass 结构
2224
2225
2226
2227
2228
  			hangPass[diff] = carbonId
  			self:updateProperty({field = "hangPass", value = hangPass})
  		end
  	end
  
bd4fb541   zhouhaihai   增加物品过期系统
2229
2230
2231
2232
2233
2234
2235
2236
2237
  	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   主推红点 和冒险次数
2238
2239
2240
2241
2242
2243
2244
  	-- 消除指定tag 红点
  	function Role:clearRedPTag(tag)
  		local redp = self:getProperty("redp")
  		redp[tag] = nil
  		self:updateProperty({field = "redp", value = redp})
  	end
  
2bf99d62   zhouhaihai   充值mycard
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
  	-- 网页支付获取订单号
  	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 的方式
2258
  				if v.twd * 100 ~= tonumber(params.money) then
2bf99d62   zhouhaihai   充值mycard
2259
2260
2261
  					return "error money"
  				end
  				-- 发现需要的id
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2262
  				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId, params.choose)
2bf99d62   zhouhaihai   充值mycard
2263
2264
2265
2266
2267
2268
2269
2270
  				if partnerOrderId == "" then
  					return "no product"
  				end
  				return json.encode({order = partnerOrderId})
  			end
  		end
  	end
  
d705a315   zhouhaihai   充值 整理
2271
  	-- 获取充值订单号
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2272
  	function Role:getPurchaseOrder(rechargeId, transactionId, choose)
d705a315   zhouhaihai   充值 整理
2273
2274
2275
2276
2277
2278
2279
  		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翻牌奖励 活动卡池保底...
2280
  	    local rechargeRecord = self.storeData:getProperty("payR") or {}
d705a315   zhouhaihai   充值 整理
2281
2282
  	    if limit ~= 0 and limit <= (rechargeRecord[rechargeId] or 0) then
  	        return ""
8e892c71   liuzujun   挑战关卡活动打完再扣门票
2283
  		end
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2284
2285
2286
2287
2288
2289
2290
  		-- 检查礼包自选奖励合法
  		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修复
2291
2292
  			local groups = rechargeData.itemgift:toTableArray(true)
  			for idx, item in ipairs(set) do
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2293
  				for _, group in ipairs(groups) do
064138fe   liguanghui   定制礼包相关bug修复
2294
  					if group[2] == item[1] and group[3] == item[2] and idx == group[1] then
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2295
2296
2297
2298
2299
2300
2301
  						pass[group[1]] = 1
  						break
  					end
  				end
  			end
  			if #pass ~= slot then return "" end
  		end
8e892c71   liuzujun   挑战关卡活动打完再扣门票
2302
  		--判断是否是活动商品
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2303
2304
2305
2306
2307
  		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   充值 整理
2308
  
811cddfc   GEM0816   payAction Order不缓存
2309
2310
2311
2312
2313
2314
2315
2316
  		-- local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
  		-- if orderId then
  		-- 	local uid = orderId * MAX_SVR_ID + serverId
  		-- 	local orderObject = require("models.Order").new({ key = string.format("%d", uid), id = uid })
  		-- 	if orderObject:load() and orderObject:getProperty("rechargeId") == rechargeId and math.abs(skynet.timex() - orderObject:getProperty("createTime")) < 5 * 60 then
  		-- 		return string.format("%d", uid)
  		-- 	end
  		-- end
d705a315   zhouhaihai   充值 整理
2317
  
811cddfc   GEM0816   payAction Order不缓存
2318
  		local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
913e070e   liuzujun   添加订单表,全局id定时回写数据库
2319
2320
  		local uid = orderId * MAX_SVR_ID + serverId
  		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
d705a315   zhouhaihai   充值 整理
2321
2322
2323
  		local orderKey = string.format(R_ORDER, roleId, orderId)
  		redisproxy:del(orderKey) -- 删掉可能有了
  		local order = require("models.Order").new({ 
913e070e   liuzujun   添加订单表,全局id定时回写数据库
2324
2325
  			key = partnerOrderId, 
  			id = tonum(partnerOrderId), 
d705a315   zhouhaihai   充值 整理
2326
  			rechargeId = rechargeId, 
1ce3adac   zhouhaihai   充值
2327
  			createTime = skynet.timex(),
2bf99d62   zhouhaihai   充值mycard
2328
  			transactionId = transactionId,
913e070e   liuzujun   添加订单表,全局id定时回写数据库
2329
  			roleid = roleId,
8583f6ee   chenyueqi   动态屏蔽字
2330
  			sid = self:getProperty("sid"),
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2331
  			choose = choose or "",
d705a315   zhouhaihai   充值 整理
2332
2333
2334
  		})
  		order:create()
  		-- 正在进行中的订单 缓存
811cddfc   GEM0816   payAction Order不缓存
2335
  		-- redisproxy:hset(string.format(R_ORDERS, roleId), rechargeId, orderId)
d705a315   zhouhaihai   充值 整理
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
  		return partnerOrderId
  	end
  
  	-- 更新订单信息
  	--[[
  
  	status
  
  	success
  	fail
  	finsh
  	unknow
  
  	--]]
  	function Role:updatePurchaseOrder(partnerOrderStr, platformOrder, status)
  		if not partnerOrderStr then return false end
d705a315   zhouhaihai   充值 整理
2352
  		local roleId = self:getProperty("id")
913e070e   liuzujun   添加订单表,全局id定时回写数据库
2353
  		local orderObject = require("models.Order").new({ key = string.format("%d", partnerOrderStr), id = tonum(partnerOrderStr)})
d705a315   zhouhaihai   充值 整理
2354
2355
2356
2357
2358
2359
  		if not orderObject:load() then
  			return false
  		end
  
  		local rechargeId = orderObject:getProperty("rechargeId")
  		local dataSet = csvdb["shop_rechargeCsv"][rechargeId]
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
2360
  		local sid = orderObject:getProperty("sid")
d705a315   zhouhaihai   充值 整理
2361
  
913e070e   liuzujun   添加订单表,全局id定时回写数据库
2362
2363
2364
2365
2366
2367
2368
2369
  		if roleId ~= orderObject:getProperty("roleid") then
  			skynet.error(string.format("[recharge] with a different role id,  current roleId:%d, order role Id:%d, order cpOrder: %s, platformOrder : %s, hadPlatformOrder: %s, id: %s, overTime : %s", 
  				roleId, orderObject:getProperty("roleid"),
  				partnerOrderStr, platformOrder, orderObject:getProperty("transactionId"), rechargeId, orderObject:getProperty("finishTime")
  			))
  			return false, "unknow"
  		end
  
d705a315   zhouhaihai   充值 整理
2370
  		if orderObject:getProperty("finishTime") > 0 then
d778335c   zhouhaihai   同单号充值输出
2371
2372
2373
  			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   充值 整理
2374
2375
2376
  			return false, "finsh"
  		end
  		
ffb3e2c5   zhouhaihai   支付bug
2377
2378
  		if platformOrder then
  			orderObject:setProperty("transactionId", platformOrder)
d705a315   zhouhaihai   充值 整理
2379
  		end
ffb3e2c5   zhouhaihai   支付bug
2380
  		orderObject:setProperty("status", status)
d705a315   zhouhaihai   充值 整理
2381
2382
2383
2384
  
  		-- 开始下单
  		if status == "success" then
  		elseif status == "fail" then
cd597363   zhouhaihai   充值重复
2385
  			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
2386
2387
  		elseif status == "finsh" then
  			orderObject:setProperty("finishTime", skynet.time())
811cddfc   GEM0816   payAction Order不缓存
2388
  			-- redisproxy:hdel(string.format(R_ORDERS, roleId), rechargeId)
d705a315   zhouhaihai   充值 整理
2389
2390
  		end
  
6136eaca   liuzujun   添加好友表
2391
2392
  		orderObject:update()
  
d705a315   zhouhaihai   充值 整理
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
  		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
  
3fbbd115   chenyueqi   Merge branch 'tr/...
2408
  		return true, rechargeId, sid, orderObject:getProperty("choose")
d705a315   zhouhaihai   充值 整理
2409
  	end
192b96d3   zhouhaihai   重置
2410
2411
  
  	-- 充值 --
b6ed652b   zhouhaihai   充值
2412
2413
  	--[[
  	request.order = data.out_trade_no
af2870d8   zhouhaihai   金额使用 乘以 100 的方式
2414
  	request.amount = data.money
b6ed652b   zhouhaihai   充值
2415
2416
2417
2418
  	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
2419
  	request.extension_info = data.extension_info
6df9d5e1   zhouhaihai   mycard twd
2420
  	request.is_mycard = 1
b6ed652b   zhouhaihai   充值
2421
  	]]
192b96d3   zhouhaihai   重置
2422
2423
2424
2425
  	function Role:handlePurchase(params)
  		local roleId = self:getProperty("id")
  		local partnerOrderStr = params.order
  
3fbbd115   chenyueqi   Merge branch 'tr/...
2426
  		local status, back, sid, choose = self:updatePurchaseOrder(partnerOrderStr, params.transactionId, "finsh")
d705a315   zhouhaihai   充值 整理
2427
2428
2429
2430
2431
  		if not status then
  			if back == "finsh" then
  				-- 订单已经处理
  				SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ result = "handled" }))
  			end
192b96d3   zhouhaihai   重置
2432
2433
  			return
  		end
d705a315   zhouhaihai   充值 整理
2434
  		local rechargeId = back
39bcd7ca   zhouhaihai   LOG
2435
  		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
d81f1a3d   liuzujun   ios支付修改
2436
  		if tonumber(params.amount) == 0 then
7e61a962   liuzujun   新增通用生成订单协议,
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
  			if params.product_id ~= rechargeData.iap_product_id then
  				skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
  					params.transactionId, roleId, partnerOrderStr, rechargeData.iap_product_id, params.product_id
  				))
  				return
  			end
  		else
  			if (params.is_mycard and rechargeData.twd * 100 ~= tonumber(params.amount)) or (not params.is_mycard and ((rechargeData.rmb * 100) / globalCsv.QArecharge) ~= tonumber(params.amount)) then
  				skynet.error(string.format("[recharge] fake order: %s, roleId: %d, order: %s,  rmb %s, get %s", 
  					params.transactionId, roleId, partnerOrderStr, rechargeData.rmb, params.amount
  				))
  				return
  			end
192b96d3   zhouhaihai   重置
2450
2451
  		end
  
39bcd7ca   zhouhaihai   LOG
2452
  		local status, reward = self:recharge({ 
f22a33af   zhouhaihai   自己的日志
2453
2454
2455
2456
  			id = rechargeId,
  			transactionId = params.transactionId,
  			pay_time = params.pay_time,
  			order = partnerOrderStr,
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
2457
  			sid = sid,
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2458
  			choose = choose,
192b96d3   zhouhaihai   重置
2459
  		})
39bcd7ca   zhouhaihai   LOG
2460
2461
  
  		if not status then
2bf99d62   zhouhaihai   充值mycard
2462
  			if params.extension_info == "mycard_web" then
2d046fcb   zhouhaihai   通知邮件
2463
  				self:sendMail(MailId.MyCardBuy, nil, nil, {rechargeId})
2bf99d62   zhouhaihai   充值mycard
2464
  			end
d705a315   zhouhaihai   充值 整理
2465
2466
2467
  			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
  				result = "success", reward = reward}))
  		end
192b96d3   zhouhaihai   重置
2468
  
d705a315   zhouhaihai   充值 整理
2469
  		return rechargeId
192b96d3   zhouhaihai   重置
2470
2471
  	end
  
192b96d3   zhouhaihai   重置
2472
2473
2474
2475
  	function Role:recharge(params)
  		local id = tonumber(params.id)
  		local rechargeData = csvdb["shop_rechargeCsv"][id]
  		if not rechargeData then
d705a315   zhouhaihai   充值 整理
2476
  			skynet.error("[recharge] recharge id not exist", id)
39bcd7ca   zhouhaihai   LOG
2477
  			return 1
192b96d3   zhouhaihai   重置
2478
2479
  		end
  
71d319eb   zhangqijia   fix: 使用特殊道具也要增加对应...
2480
  		if not self.storeData:checkRechargeRecord(rechargeData.limit, id)then
39bcd7ca   zhouhaihai   LOG
2481
  			return 2
c5825110   saicom   新增用户商城相关数据
2482
2483
  		end
  
192b96d3   zhouhaihai   重置
2484
  		local diamondCount = 0
c5825110   saicom   新增用户商城相关数据
2485
2486
  		local reward = {}
  		if rechargeData.shop == 1 then -- 钻石
573d5ade   zhouhaihai   充值
2487
  			local rechargeF = self:getProperty("rechargeF")
192b96d3   zhouhaihai   重置
2488
2489
2490
2491
  			diamondCount = rechargeData.diamond + rechargeData.diamondExtra
  			if not rechargeF[id] then
  				diamondCount = diamondCount + rechargeData.diamondFirst
  				rechargeF[id] = 1
573d5ade   zhouhaihai   充值
2492
  				self:updateProperty({field = "rechargeF", value = rechargeF})
192b96d3   zhouhaihai   重置
2493
  			end
4f40cc1a   chenyueqi   付费钻区分ios钻和android钻
2494
  			self:gainDiamond({count = diamondCount, isRecharge = true, sid = params.sid, log = {desc = "recharge", int1 = id}})
e3f6fe34   zhangqijia   feat: 月卡特权,购买魔导石会...
2495
2496
2497
2498
2499
2500
  
  			--已购月卡 购买魔导石 赠送cardReward
  			if not self.storeData:isMonthCardExpire() then
  				reward, _ = self:award(rechargeData.cardReward, {isRecharge = true, log = {desc = "buyDiamondCardReward", int1 = id}})
  			end
  
3e20f499   saicom   完善商城相关协议
2501
  		elseif rechargeData.shop == 2 then  --通行证商店
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
2502
              --签收 + 订阅奖励
c40a6460   zhangqijia   feat: 月卡+特刊
2503
2504
  			local tmpreward, _ = self.storeData:onBuyCard(rechargeData.type, rechargeData.time, rechargeData.id, rechargeData.activity_id)
  			if tmpreward then
eae157a4   zhangqijia   feat: 月卡 + 特刊的道具兑换
2505
  				table.rewardMerge(reward, tmpreward)
c40a6460   zhangqijia   feat: 月卡+特刊
2506
  			end
3e20f499   saicom   完善商城相关协议
2507
  		elseif rechargeData.shop == 3 then  -- 礼包商店
39bcd7ca   zhouhaihai   LOG
2508
  			reward, _ = self:award(rechargeData.itemFirst, {isRecharge = true, log = {desc = "recharge", int1 = id}})
e8dce82e   zhangqijia   fix: 破冰礼包增加购买记录,用...
2509
  
9f21cb8e   zhangqijia   fix: 修改触发礼包逻辑
2510
  			self:checkTaskEnter("BuyLimitPack", {id = id})
192b96d3   zhouhaihai   重置
2511
  		else
d705a315   zhouhaihai   充值 整理
2512
  			skynet.error("[recharge] invalid recharge shop type " .. id)
39bcd7ca   zhouhaihai   LOG
2513
  			return 3
192b96d3   zhouhaihai   重置
2514
2515
  		end
  
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2516
2517
2518
2519
2520
2521
  		-- 自选奖励部分
  		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修复
2522
  			for itemId, value in pairs(tChange or {}) do
2dbe4fb9   chenyueqi   充值礼包自选部分逻辑
2523
2524
2525
2526
  				reward[itemId] = (reward[itemId] or 0) + value
  			end
  		end
  
3e20f499   saicom   完善商城相关协议
2527
  		if diamondCount > 0 then
706b517e   liuzujun   翻倍掉落活动,商城免费宝箱
2528
  			reward[ItemId.Diamond] = (reward[ItemId.Diamond] or 0) + diamondCount
3e20f499   saicom   完善商城相关协议
2529
2530
  		end
  
e52c384f   liuzujun   探索指令bug, 充值返利活动
2531
2532
  		self:checkTaskEnter("Pay", {rmb = rechargeData.rmb, twd = rechargeData.twd})
  
192b96d3   zhouhaihai   重置
2533
2534
  		-- 累充
  		local rmb = rechargeData.rmb
573d5ade   zhouhaihai   充值
2535
  		self:updateProperty({field = "rmbC", delta = rmb})
e52c384f   liuzujun   探索指令bug, 充值返利活动
2536
2537
  		self:updateProperty({field = "twdC", delta = rechargeData.twd})
  
8e524d41   zhouhaihai   优化
2538
  		self:mylog("role_action", {desc = "recharge", int1 = id, int2 = rmb, key1 = params.transactionId, key2 = params.order, long1 = tonum(params.pay_time, 0)})
192b96d3   zhouhaihai   重置
2539
  
39bcd7ca   zhouhaihai   LOG
2540
  		return nil, reward
192b96d3   zhouhaihai   重置
2541
2542
  	end
  
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2543
  	--直接给玩家发送邮件,立即推送小红点
7f9f002d   liuzujun   循环周活动
2544
  	function Role:sendMail(mailId, createTime, reward, contentPms)
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2545
2546
2547
2548
2549
2550
  		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   翻倍掉落活动,商城免费宝箱
2551
  			tgift = reward or {}
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2552
2553
2554
2555
2556
  		end
  		local gift = ""
  		for k, v in pairs(tgift) do
  			gift = gift .. k.."="..v.." "
  		end
2ca93972   liuzujun   添加邮件表
2557
  		mysqlproxy:insertEmail({roleId = self:getProperty("id"), emailId = mailId, createtime = createTime, attachments = gift, contentPms = contentPms})
70fb62d1   liuzujun   服务器数据打点
2558
2559
  
  		self:mylog("role_action", {desc="sendMail", int1 = mailId})
fb3d084d   liuzujun   月卡赛季卡发送邮件奖励
2560
2561
2562
  		self.sendMailFlag = true
  	end
  
1e9cb217   chenyueqi   服务器记录控制引导过程
2563
2564
2565
2566
2567
2568
2569
2570
2571
  	-- 是否需要进行引导
  	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   引导服务端记录
2572
  	-- 保存引导步骤
1e9cb217   chenyueqi   服务器记录控制引导过程
2573
  	function Role:saveGuide(master,slave,force)
a608cccb   chenyueqi   引导服务端记录
2574
2575
2576
2577
  		local newerGuide = self:getProperty("newerGuide")
  		local guide = newerGuide:toArray(true,"=")
  		local sMaster, sSlave = guide[1], guide[2]
  
1e9cb217   chenyueqi   服务器记录控制引导过程
2578
2579
  		if not force and master < sMaster then return end
  		if not force and master <= sMaster and slave < sSlave then return end
a608cccb   chenyueqi   引导服务端记录
2580
  
a7b824ac   chenyueqi   记录新手引导步骤的代码存在bug
2581
2582
2583
2584
2585
2586
2587
  		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   自己的日志
2588
  		self:mylog("guide", {desc = "guide_new",int1 = master*1000+slave})
a608cccb   chenyueqi   引导服务端记录
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
  
  		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   付费签到,抽卡阶段奖励,探索指令
2608
2609
  
  	-- 抽卡阶段奖励
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2610
  	function Role:getDrawCardExtraReward(feedbackId, oldVal, newVal)
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
2611
2612
  		local reward = nil
  		local maxCount = 0
eb5ffd1c   liuzujun   世界boss翻牌奖励 活动卡池保底...
2613
  		for k, v in pairs(csvdb["build_extraRewardCsv"][feedbackId]) do
37bb4611   liuzujun   付费签到,抽卡阶段奖励,探索指令
2614
2615
2616
2617
2618
2619
2620
2621
2622
  			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   自动挂机下一关
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
  	-- 获取下一个挂机关卡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   挂机关卡可以选择,经验金币根据最高...
2635
2636
  				nextId = makeCarbonId(diff + 1, 1, 1)
  				if not csvdb["idle_battleCsv"][nextId] then
53b4b8bd   liuzujun   自动挂机下一关
2637
  					nextId = 0
53b4b8bd   liuzujun   自动挂机下一关
2638
2639
2640
2641
2642
2643
2644
  				end
  			end
  		end
  
  		return nextId
  	end
  
e52c384f   liuzujun   探索指令bug, 充值返利活动
2645
2646
2647
2648
  	-- 根据累计充值金额计算奖励档位
  	function Role:getPaybackReward(oldVal, newVal)
  		local maxVal, diff, extraReward = 0, 0, ""
  		local gift = ""
4709685d   liuzujun   返利邮件拼接充值档位
2649
  		local checkPoint = {}
e52c384f   liuzujun   探索指令bug, 充值返利活动
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
  		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   返利邮件拼接充值档位
2660
2661
  
  				table.insert(checkPoint, k)
e52c384f   liuzujun   探索指令bug, 充值返利活动
2662
2663
2664
2665
  			end
  		end
  		if newVal > maxVal then
  			local cnt = 0
4709685d   liuzujun   返利邮件拼接充值档位
2666
  			local oldCheckPoint = 0
e52c384f   liuzujun   探索指令bug, 充值返利活动
2667
2668
  			if oldVal < maxVal then
  				cnt = math.floor((newVal - maxVal) / diff)
4709685d   liuzujun   返利邮件拼接充值档位
2669
  				oldCheckPoint = maxVal
e52c384f   liuzujun   探索指令bug, 充值返利活动
2670
2671
  			else
  				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
4709685d   liuzujun   返利邮件拼接充值档位
2672
  				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
e52c384f   liuzujun   探索指令bug, 充值返利活动
2673
2674
2675
  			end
  			for i = 1, cnt do
  				gift = gift .. extraReward .. " "
4709685d   liuzujun   返利邮件拼接充值档位
2676
2677
  
  				table.insert(checkPoint, oldCheckPoint + i * diff)
e52c384f   liuzujun   探索指令bug, 充值返利活动
2678
2679
  			end
  		end
56d191ec   liuzujun   充值返利邮件档位排序
2680
2681
2682
  		table.sort(checkPoint, function(a, b)
  			return a < b
  		end)
4709685d   liuzujun   返利邮件拼接充值档位
2683
  		return gift, checkPoint
e52c384f   liuzujun   探索指令bug, 充值返利活动
2684
  	end
072db127   zhouhaihai   推送
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
  	--[[
  	"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, 充值返利活动
2700
  
072db127   zhouhaihai   推送
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
  	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   元旦关卡活动
2715
2716
  
  	local CommonRankTime = toUnixtime("2019010100")
576c791c   liuzujun   玛尼英雄帖活动通过任务bug 元旦...
2717
2718
  	local CommonCoef1 = 10000
  	local CommonCoef2 = 10000
66fe093a   liuzujun   元旦关卡活动
2719
2720
2721
2722
2723
2724
  	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 元旦...
2725
  		local score = (rankVal * CommonCoef1 + ct) * CommonCoef2 + reserve
66fe093a   liuzujun   元旦关卡活动
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
  
  		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 元旦...
2741
  			rankVal = math.floor(math.floor(rankVal / CommonCoef2) / CommonCoef1)
66fe093a   liuzujun   元旦关卡活动
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
  			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   拾荒活动
2761
2762
2763
2764
2765
2766
2767
2768
2769
  	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   元旦关卡活动
2770
  
8583f6ee   chenyueqi   动态屏蔽字
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
  	local function table_keys( t )
  	    local keys = {}
  	    for k, _ in pairs( t ) do
  	        keys[#keys + 1] = k
  	    end
  	    return keys
  	end
  
  	local function makeStr(params, key, urlsign)
  		local keys = table_keys(params)
  		table.sort(keys)
  		local sign2Str, requestStr = "", ""
  		for _, key in ipairs(keys) do
  			sign2Str = sign2Str .. (urlsign and urlencode(params[key]) or params[key])
  			requestStr = requestStr .. string.format("%s=%s&",key,urlencode(params[key]))
  		end
  		local sign = md5.sumhexa(sign2Str .. key):lower()
  		requestStr = requestStr .. string.format("sign=%s",sign)
  
  		return requestStr
  	end
  
  	function Role:biliChatSDK(content)
  		if content == "" then return end
  		local base64Content = base64.encode(content)
  		local uids = self:getProperty("uid"):split2("_")
  		local uid = uids[2] or self:getProperty("uid")
  
  		local urls = {
  			"http://pnew.biligame.net",
  			"http://pserver.bilibiligame.net"
  		}
  		local secret = "8920e9dcf0cb4ebca87393ce48021ead"
  
  		local headers = {
  			["User-Agent"] = 'Mozilla/5.0 GameServer',
  			["Content-Type"] = "application/x-www-form-urlencoded",
  		}
  
  		local send = {
  			game_id = 4818,
95182d53   liuzujun   biliChatSDK uid 写...
2812
  			uid = "90003",
8583f6ee   chenyueqi   动态屏蔽字
2813
2814
2815
2816
2817
2818
2819
2820
  			merchant_id = 1,
  			server_id = 3957,
  			version = "1",
  			timestamp = math.floor(skynet.timex() * 1000),
  			content = base64Content,
  		}
  
  		local params = makeStr(send, secret)
fe41ea5d   chenyueqi   动态屏蔽字设置1秒延时等待。当动态...
2821
  		httpc.timeout = 100
8583f6ee   chenyueqi   动态屏蔽字
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
  		local status, body = httpc.request("POST", urls[1], "/api/server/censor", {}, headers, params)
  	    if tonumber(status) ~= 200 then
  	        status, body = httpc.request("POST", urls[2], "/api/server/censor", {}, headers, params)
  	    end
  	    if tonumber(status) ~= 200 then
  	    	return
  	    end
  	    local result = json.decode(body)
  	    if not result or result.code ~= 0 then
  	    	return
  	    end
  		return result.data.content
  	end
  
  	function Role:uoChatSDK(content)
  		if content == "" then return end
  		local base64Content = base64.encode(content)
  		local uids = self:getProperty("uid"):split2("_")
  		local uid = uids[2] or self:getProperty("uid")
  
  		local urls = {
  			"http://uosdk.biligame.com",
  		}
  		local secret = "4243b5fb44b64175a20a53dcfb1346eb"
  
  		local headers = {
  			["User-Agent"] = 'Mozilla/5.0 CP-Game-Server',
  			["Content-Type"] = "application/x-www-form-urlencoded",
  		}
  
  		local send = {
  			app_id = 4821,
  			user_id = uid,
  			timestamp = math.floor(skynet.timex() * 1000),
  			content = base64Content,
  		}
  
  		local params = makeStr(send, secret, true)
fe41ea5d   chenyueqi   动态屏蔽字设置1秒延时等待。当动态...
2860
  		httpc.timeout = 100
8583f6ee   chenyueqi   动态屏蔽字
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
  		local status, body = httpc.request("POST", urls[1], "/api/server/censor", {}, headers, params)
  	    if tonumber(status) ~= 200 then
  	    	return
  	    end
  	    local result = json.decode(body)
  	    if not result or result.code ~= 0 then
  	    	return
  	    end
  		return result.data.content
  	end
edbc96d2   chenyueqi   Merge branch 'tr/...
2871
  	
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2872
2873
2874
2875
  	function Role:getTowerBnousActive(update)
  		if not update and self.towerBnousActive then
  			return self.towerBnousActive
  		end
4ee2fe31   chenyueqi   电波塔bug
2876
  		local towerInfo = self:getProperty("towerInfo")
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2877
2878
  		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   计算电波塔层数的加成效果
2879
  		local bnousCsv = csvdb["tower_battle_additionCsv"]
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2880
  		self.towerBnousActive = {}
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2881
2882
2883
2884
  
  		for towerIdx, Set in pairs(towerBnous) do
  			for id, _ in pairs(Set) do
  				local data = bnousCsv[towerIdx][id]
a42130ee   chenyueqi   电波塔加成错误
2885
2886
2887
2888
2889
2890
  				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   计算电波塔层数的加成效果
2891
  						end
a42130ee   chenyueqi   电波塔加成错误
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
  						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   计算电波塔层数的加成效果
2909
  						end
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2910
  					end
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2911
2912
2913
  				end
  			end
  		end
e50d0cae   chenyueqi   计算电波塔层数的加成效果
2914
  
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2915
2916
2917
  		return self.towerBnousActive
  	end
  
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
  	function Role:bonusMerged(bonus1, bonus2)
          bonus1 = bonus1 or {}
          bonus2 = bonus2 or {}
  
          local bonus = {}
  		bonus[0] = (bonus1[0] or 0) + (bonus2[0] or 0)
  		bonus[1] = (bonus1[1] or 0) + (bonus2[1] or 0)
  		return bonus
  	end
  
  	--计算公式是 (原价+固有提升数)*(1+赞誉度增幅中的百分比+电波塔中的百分比)
  	--详细做法是 原价 + (原价+固有提升数) * (赞誉度增幅中的百分比+电波塔中的百分比) + 固有提升数
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2930
2931
2932
  	function Role:getDeltaValue(result, value)
  		if not result then return 0 end
  		local delta = 0
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2933
2934
2935
  		if result[0] then
  			delta = delta + result[0]
  		end
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2936
2937
  
  		if result[1] and value then
5b0a99f7   zhangqijia   fix: 修复 getDeltaV...
2938
  			delta = (delta + value )* result[1] / 100
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2939
  		end
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2940
2941
2942
2943
  		return delta
  	end
  
  	function Role:getBnousBattleBuff()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2944
2945
2946
2947
  		local towerBnous = self:getTowerBnousActive()
  		return towerBnous[SystemBnousType.TowerBuff]
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
2948
  	function Role:getBnousCrusade(value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2949
  		local towerBnous = self:getTowerBnousActive()
cea66efd   zhangqijia   fix: 等级效果的bug,
2950
2951
  		local levelBnous = self:getLevelBnous()
  
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2952
  		local bonus = self:bonusMerged(towerBnous[SystemBnousType.CrusadeTask], levelBnous[SystemBnousType.CrusadeTask])
d1944a2b   zhangqijia   fix: 修复 赞誉 加上固有提升数
2953
  		return self:getDeltaValue(bonus, value) +(bonus[0] or 0)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2954
2955
  	end
  
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2956
  	function Role:getBnousDiner(type, value, flag)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2957
  		local towerBnous = self:getTowerBnousActive()
cea66efd   zhangqijia   fix: 等级效果的bug,
2958
  		local levelBnous = self:getLevelBnous()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2959
  		type = type or 1
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2960
  		local bonus
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2961
  		if type == 1 then
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2962
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerGet], levelBnous[SystemBnousType.DinerGet])
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2963
  		elseif type == 2 then
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2964
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerLimit], levelBnous[SystemBnousType.DinerLimit])
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2965
  		elseif type == 3 then
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2966
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerSell], levelBnous[SystemBnousType.DinerSell])
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2967
  		elseif type == 4 then
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2968
2969
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerPrice], levelBnous[SystemBnousType.DinerPrice])
  		end
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2970
2971
2972
2973
  		if not flag then
  			return self:getDeltaValue(bonus, value) + (bonus[0] or 0)
          else
              return self:getDeltaValue(bonus, value)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2974
  		end
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
2975
2976
  	end
  
c3f5ce22   zhangqijia   fix: 赞誉度增幅中的餐厅齿轮增幅修改
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
  	function Role:getBnousByZero(type)
  		local towerBnous = self:getTowerBnousActive()
  		local levelBnous = self:getLevelBnous()
  		type = type or 1
  		local bonus
  		if type == 1 then
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerGet], levelBnous[SystemBnousType.DinerGet])
  		elseif type == 2 then
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerLimit], levelBnous[SystemBnousType.DinerLimit])
  		elseif type == 3 then
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerSell], levelBnous[SystemBnousType.DinerSell])
  		elseif type == 4 then
  			bonus = self:bonusMerged(towerBnous[SystemBnousType.DinerPrice], levelBnous[SystemBnousType.DinerPrice])
  		end
          return (bonus[0] or 0)
      end
  
3e6d391b   zhangqijia   fix: 等级效果的bug-修复无...
2994
  	local function appendAdvBnous(dstBnous, srcBnous)
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
2995
2996
  		if not dstBnous and not srcBnous then return {} end
  		local result = clone(dstBnous or {})
e2e205be   zhangqijia   feat: 玩家等级奖励
2997
  		for time, set in pairs(srcBnous) do
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
2998
2999
  			if not result[time] then
  				result[time] = {}
e2e205be   zhangqijia   feat: 玩家等级奖励
3000
3001
  			end
  			for key, value in pairs(set) do
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3002
  				result[time][key] = (result[time][key] or 0) + value
e2e205be   zhangqijia   feat: 玩家等级奖励
3003
3004
  			end
  		end
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3005
  		return result
e2e205be   zhangqijia   feat: 玩家等级奖励
3006
  	end
3e6d391b   zhangqijia   fix: 等级效果的bug-修复无...
3007
3008
  
  	local function appendTableBnous(dstBnous, srcBnous)
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3009
3010
  		if not dstBnous and not srcBnous then return {} end
  		local result = clone(dstBnous or {})
3e6d391b   zhangqijia   fix: 等级效果的bug-修复无...
3011
  		for k, v in pairs(srcBnous) do
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3012
  			result[k] = (result[k] or 0) + v
3e6d391b   zhangqijia   fix: 等级效果的bug-修复无...
3013
  		end
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3014
          return result
3e6d391b   zhangqijia   fix: 等级效果的bug-修复无...
3015
  	end
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
3016
  	function Role:getBnousAdv()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3017
  		local towerBnous = self:getTowerBnousActive()
cea66efd   zhangqijia   fix: 等级效果的bug,
3018
3019
  		local levelBnous = self:getLevelBnous()
  		local adv = levelBnous[SystemBnousType.Adv] or {}
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3020
          return appendAdvBnous(towerBnous[SystemBnousType.Adv], adv)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3021
3022
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
3023
  	function Role:getBnousHangTime()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3024
  		local towerBnous = self:getTowerBnousActive()
cea66efd   zhangqijia   fix: 等级效果的bug,
3025
3026
  		local levelBnous = self:getLevelBnous()
  		local tmptime = levelBnous[SystemBnousType.HangTime] or 0
e2e205be   zhangqijia   feat: 玩家等级奖励
3027
  		return towerBnous[SystemBnousType.HangTime] or 0 + tmptime
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3028
3029
  	end
  
2e705c94   zhangqijia   feat: 跨周获得的等级效果奖励...
3030
  	function Role:sendLevelBnousPvpTicketMail()
cea66efd   zhangqijia   fix: 等级效果的bug,
3031
3032
  		local levelBnous = self:getLevelBnous()
  		local pvpTicket = levelBnous[SystemBnousType.PvpTicket] or {}
2e705c94   zhangqijia   feat: 跨周获得的等级效果奖励...
3033
3034
3035
3036
3037
3038
3039
3040
3041
  		if next(pvpTicket) then
  			self:sendMail(380, nil, pvpTicket)
  		end
  	end
  
  	function Role:getBnousPvpTicket()
          self:sendLevelBnousPvpTicketMail()
  		local towerBnous = self:getTowerBnousActive()
  		return towerBnous[SystemBnousType.PvpTicket] or {}
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3042
3043
  	end
  
40b19300   chenyueqi   电波塔激活加成效果后对各个系统的加成
3044
  	function Role:getBnousSweep()
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3045
  		local towerBnous = self:getTowerBnousActive()
cea66efd   zhangqijia   fix: 等级效果的bug,
3046
3047
  		local levelBnous = self:getLevelBnous()
  		local sweepReward = levelBnous[SystemBnousType.SweepReward] or {}
666d0bfc   zhangqijia   fix: 扫荡关卡奖励叠加bug
3048
  		return appendTableBnous(towerBnous[SystemBnousType.SweepReward], sweepReward)
03c619fb   chenyueqi   电波塔属性塔功能部分功能草稿
3049
  	end
8583f6ee   chenyueqi   动态屏蔽字
3050
  
e2e205be   zhangqijia   feat: 玩家等级奖励
3051
  	function Role:getBnousDismantlingMaximum()
cea66efd   zhangqijia   fix: 等级效果的bug,
3052
3053
  		local levelBnous = self:getLevelBnous()
  		return levelBnous[SystemBnousType.DismantlingMaximum] or 0
e2e205be   zhangqijia   feat: 玩家等级奖励
3054
3055
3056
  	end
  
  	function Role:getBnousDismantlingImproved(value)
cea66efd   zhangqijia   fix: 等级效果的bug,
3057
3058
  		local levelBnous = self:getLevelBnous()
  		local result = levelBnous[SystemBnousType.DismantlingImproved] or {}
d1944a2b   zhangqijia   fix: 修复 赞誉 加上固有提升数
3059
  		return self:getDeltaValue(result, value) + (result[0] or 0)
e2e205be   zhangqijia   feat: 玩家等级奖励
3060
3061
3062
  	end
  
  	function Role:getBnousDaily()
cea66efd   zhangqijia   fix: 等级效果的bug,
3063
3064
  		local levelBnous = self:getLevelBnous()
  		local dailyReward =  levelBnous[SystemBnousType.DailyReward] or {}
e2e205be   zhangqijia   feat: 玩家等级奖励
3065
  		local reward = {}
cea66efd   zhangqijia   fix: 等级效果的bug,
3066
  		for k, v in pairs(dailyReward) do
e2e205be   zhangqijia   feat: 玩家等级奖励
3067
3068
3069
3070
3071
3072
  			reward[k] = (reward[k] or 0) + v
  		end
  		return reward
  	end
  
  	function Role:getBnousTreasureBaseMaximum()
cea66efd   zhangqijia   fix: 等级效果的bug,
3073
3074
  		local levelBnous = self:getLevelBnous()
  		return levelBnous[SystemBnousType.TreasureBaseMaximum] or 0
e2e205be   zhangqijia   feat: 玩家等级奖励
3075
3076
3077
3078
  	end
  
  	--@upType 加速类型 1探索加速, 2齿轮加速, 3餐厅加速
  	function Role:getBnousUpSpeedNum(upType)
cea66efd   zhangqijia   fix: 等级效果的bug,
3079
3080
3081
  		local levelBnous = self:getLevelBnous()
  		local upSpeedNum =  levelBnous[SystemBnousType.UpSpeedNum] or {}
  		return upSpeedNum[upType] or 0
e2e205be   zhangqijia   feat: 玩家等级奖励
3082
3083
3084
  	end
  
  	function Role:getBnousChangeBaseCount()
cea66efd   zhangqijia   fix: 等级效果的bug,
3085
3086
  		local levelBnous = self:getLevelBnous()
  		return levelBnous[SystemBnousType.ChangeBaseCount] or 0
e2e205be   zhangqijia   feat: 玩家等级奖励
3087
3088
  	end
  
e82cb5dc   zhangqijia   fix: level_additi...
3089
  	function Role:getBnousChangeBuyCount()
cea66efd   zhangqijia   fix: 等级效果的bug,
3090
3091
3092
3093
  		local levelBnous = self:getLevelBnous()
  		return levelBnous[SystemBnousType.ChangeBuyCount] or 0
  	end
  
64dd7a6f   zhangqijia   fix: 每次探索加速额外获得道具
3094
  	function Role:getBnousExtraProps()
21395b80   zhangqijia   feat: 等级效果增加 type...
3095
  		local levelBnous = self:getLevelBnous()
64dd7a6f   zhangqijia   fix: 每次探索加速额外获得道具
3096
  		return levelBnous[SystemBnousType.ExtraProps] or {}
21395b80   zhangqijia   feat: 等级效果增加 type...
3097
3098
  	end
  
e66080dd   zhangqijia   test: 去除关卡卡角色等级;改...
3099
3100
  	function Role:getAccountLevel()
  		local levelBnous = self:getLevelBnous()
e66080dd   zhangqijia   test: 去除关卡卡角色等级;改...
3101
3102
3103
  		return levelBnous[SystemBnousType.AccountLevel] or 0
  	end
  
cea66efd   zhangqijia   fix: 等级效果的bug,
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
  	function Role:getLevelBnous()
  		local levelBnous = {}
          local curLevel = self:getProperty("level")
  		for  level, additionData in pairs(csvdb["level_additionCsv"]) do
  			if level > curLevel then return levelBnous end
  			if additionData then
  				local effects = additionData.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 levelBnous[pm1] then
  						levelBnous[pm1] = {}
e2e205be   zhangqijia   feat: 玩家等级奖励
3115
  					end
cea66efd   zhangqijia   fix: 等级效果的bug,
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
  					if pm1 == SystemBnousType.TowerBuff then
  
  					elseif pm1 == SystemBnousType.Adv then
  						if not levelBnous[pm1][pm4] then
  							levelBnous[pm1][pm4] = {}
  						end
  						levelBnous[pm1][pm4][pm2] = (levelBnous[pm1][pm4][pm2] or 0) + pm3
  					elseif pm1 == SystemBnousType.HangTime or
  							pm1 == SystemBnousType.DismantlingMaximum or
  							pm1 == SystemBnousType.TreasureBaseMaximum or
  							pm1 == SystemBnousType.ChangeBaseCount or
  							pm1 == SystemBnousType.ChangeBuyCount  then
  						if type(levelBnous[pm1]) == "table" then
  							levelBnous[pm1] = 0
  						end
  						levelBnous[pm1] = levelBnous[pm1] + pm2
e66080dd   zhangqijia   test: 去除关卡卡角色等级;改...
3132
3133
3134
3135
3136
  					elseif pm1 == SystemBnousType.AccountLevel  then
  						if type(levelBnous[pm1]) == "table" then
  							levelBnous[pm1] = 0
  						end
  						levelBnous[pm1] = math.max(levelBnous[pm1], pm2)
cea66efd   zhangqijia   fix: 等级效果的bug,
3137
3138
  					else
  						levelBnous[pm1][pm2] = (levelBnous[pm1][pm2] or 0) + pm3
e2e205be   zhangqijia   feat: 玩家等级奖励
3139
  					end
e2e205be   zhangqijia   feat: 玩家等级奖励
3140
3141
3142
  				end
  			end
  		end
e2e205be   zhangqijia   feat: 玩家等级奖励
3143
3144
3145
  		return levelBnous
  	end
  
0df83fa9   liuzujun   料理解锁bug
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
  	function Role:getPotionLevel(id)
  		local level = self.dinerData:getProperty("dishTree"):getv(id, 1)
  		local talentSet = csvdb["diner_talentCsv"][id]
  		if not talentSet then return 0 end
  		local talentData = talentSet[level]
  		if not talentData then return 0 end
  	
  		if talentData.pointFront == "" then
  			if talentData.levelFront ~= "" and not self:checkHangPass(tonumber(talentData.levelFront)) then
  				if level == 0 then return 0 end
  			end
  			return level
  		end
  	
  		if talentData.levelFront ~= "" and not self:checkHangPass(tonumber(talentData.levelFront)) then
  			if level == 0 then return 0 end
  		end
  	
  		for preId, needV in pairs(talentData.pointFront:toNumMap()) do
  			if self.dinerData:getProperty("dishTree"):getv(preId, 0) < needV then
  				if level == 0 then return 0 end
  				if level == 1 then return 0 end
  			end
  		end
  		return level
  	end
  
a33ade6c   liuzujun   rmb礼包改钻石礼包
3173
3174
3175
3176
      function Role:log_battle_hero(heroType, desc)
          self:mylog("hero_action", {desc = desc, int1 = heroType})
      end
  
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3177
      function Role:getRuneBagCount()
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3178
3179
3180
  		local count = 0
          for _, rune in pairs(self.runeBag) do
  			if next(rune) then
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3181
3182
3183
  				if rune:getProperty("refer") == 0 then
  					count = count + 1
  				end
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3184
3185
3186
3187
3188
3189
3190
3191
  			end
          end
  		return count or 0
  	end
  
  	-- 铭文仓库是否满仓
  	function Role:checkRuneFully(count)
  		count = count or 0
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3192
3193
  		if count == 0 then return false end
  
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3194
3195
  		local page = globalCsv.store_type[ItemType.Rune]
  		local limit = self:getProperty("bagLimit")[page]
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
          return self:getRuneBagCount() + count > limit
  	end
  
     local function checkHasRuneByReward(reward)
  		reward = reward or {}
  		for itemId, _ in pairs(reward) do
  			local itemData = csvdb["itemCsv"][itemId]
  			if itemData and itemData.type == ItemType.Rune then
  				return true
  			end
  		end
  		return false
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3208
3209
3210
  	end
  
  	function Role:checkRuneFullyByReward(reward)
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3211
3212
3213
  		if not checkHasRuneByReward(reward) then return false end
  
  		local count = self:getRuneBagCount()
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
  		local page = globalCsv.store_type[ItemType.Rune]
  		local limit = self:getProperty("bagLimit")[page]
  		if count >= limit then
  			return true
  		end
  		for itemId, n in pairs(reward) do
  			local itemData = csvdb["itemCsv"][itemId]
  			if itemData and itemData.type == ItemType.Rune then
  				count = count + n
  				if count > limit then return true end
  			end
  		end
          return false
  	end
  
  	-- 把溢出的铭文奖励通过邮件发送
  	function Role:checkRuneCount(reward)
          local firstMore = false
7ba807d6   zhangqijia   fix: role:getRune...
3232
          local count = self:getRuneBagCount()
76f0493d   zhangqijia   feat: 铭文仓库溢出奖励时,通...
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
  		local page = globalCsv.store_type[ItemType.Rune]
  		local limit = self:getProperty("bagLimit")[page]
  		if count >= limit then
  			firstMore = true
  		end
  
  		local tmpreward = {}
  		for itemId, n in pairs(reward) do
  			local itemData = csvdb["itemCsv"][itemId]
  			if itemData and itemData.type == ItemType.Rune then
  				count = count + n
  				if count > limit then
  					if not firstMore then
  						firstMore = true
  						reward[itemId] = n - (count - limit)
  						tmpreward[itemId] = count - limit
  					else
  						reward[itemId] = nil
  						tmpreward[itemId] = n
  					end
  				end
  			end
  		end
  		if next(tmpreward) then
  			self:sendMail(20, nil, tmpreward)
  		end
  	end
e2e205be   zhangqijia   feat: 玩家等级奖励
3260
  
2660491b   zhangqijia   fix: 铭文仓库爆满限制bug
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
  	function Role:getItemRandomOccupy(itemRandomData)
          local itemRandomOccupy = {}
  		if itemRandomData then
  			for typ, n in pairs(itemRandomData.ware:toNumMap() or {}) do
  				itemRandomOccupy[typ] = n
  			end
  		end
  		return itemRandomOccupy
  	end
  
639bbdff   zhangqijia   fix: 一番赏 获取扭蛋机列表,...
3271
      function Role:getCapsuleList(id)
555f745e   zhangqijia   feat: 一番赏
3272
3273
  		local capsules = {}
  		for k, v in pairs(self.capsules) do
639bbdff   zhangqijia   fix: 一番赏 获取扭蛋机列表,...
3274
  			if v:getProperty("id") == id then
555f745e   zhangqijia   feat: 一番赏
3275
3276
3277
3278
3279
3280
  				local onlineCount= v:getOnlineCount()
  				capsules[k] = {id=v:getProperty("id"), room=v:getProperty("room"), typ=v:getProperty("typ"), people=onlineCount[2], coin= v:getProperty("coin")}
  			end
  		end
          return capsules
  	end
e2e205be   zhangqijia   feat: 玩家等级奖励
3281
  
555f745e   zhangqijia   feat: 一番赏
3282
  	function Role:drawCapsule(capsuleId, full, cares)
01ff9b4b   zhangqijia   fix: 一番赏 优化; 抽奖记录...
3283
3284
3285
3286
3287
3288
3289
          local capsule = self.capsules[capsuleId]
  		if not capsule then return nil end
  
  		local roleId = self:getProperty("id")
  		local ret, drawReward = capsule:draw(roleId, full, cares)
  		drawReward["specials"] = nil
  		return ret, drawReward, capsule:data(roleId)
555f745e   zhangqijia   feat: 一番赏
3290
3291
  	end
  
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
3292
  	function Role:joinCapsule(roleId, capsuleId)
01ff9b4b   zhangqijia   fix: 一番赏 优化; 抽奖记录...
3293
3294
3295
  		local capsule = self.capsules[capsuleId]
  		if not capsule then return nil end
  
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
3296
          return capsule:data(roleId)
555f745e   zhangqijia   feat: 一番赏
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
  	end
  
  	function Role:checkCapsule(now)
  		for _, v in pairs(self.capsules) do
  			if v:refreshing(now) then
  				v:init()
  				v:create()
  			end
  		end
  	end
0eb317fb   zhangqijia   fix: 一番赏奖励抽奖的bug与...
3307
3308
  
  	function Role:goodStock(capsuleId)
01ff9b4b   zhangqijia   fix: 一番赏 优化; 抽奖记录...
3309
3310
3311
  		local capsule = self.capsules[capsuleId]
  		if not capsule then return 0 end
  
0eb317fb   zhangqijia   fix: 一番赏奖励抽奖的bug与...
3312
3313
3314
  		return capsule:getGoodsAmount(),  capsule:getProperty("token")
  	end
  
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
3315
  	function Role:getCapsuleData(roleId, capsuleId)
01ff9b4b   zhangqijia   fix: 一番赏 优化; 抽奖记录...
3316
3317
3318
  		local capsule = self.capsules[capsuleId]
  		if not capsule then return nil end
  
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
3319
  		return capsule:data(roleId)
0eb317fb   zhangqijia   fix: 一番赏奖励抽奖的bug与...
3320
  	end
6304b5ad   zhangqijia   feat: 一番赏 增加重置扭蛋机指令
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
  
  	function Role:resetCapsule()
  		local roleId = self:getProperty("id")
  		local res = redisproxy:smembers(CAPSULE_ID_ROLE:format(roleId)) or {}
  		for _, key in pairs(res) do
  			redisproxy:del(CAPSULE_ROLE:format(roleId, tonumber(key)))
  			redisproxy:srem(CAPSULE_ID_ROLE, key)
  		end
  
  		for _, data in pairs(csvdb["ichibankuji_mainCsv"]) do
  			for _, val in pairs(data) do
  				if val.typ == 0 then
  					local key = val.id..val.room
  					if not self.capsules[key] then
  						local capsule = require("models.Capsule").new({ key = CAPSULE_ROLE:format(roleId, tonumber(key)), id= val.id, room = val.room, typ = 0, name=val.name})
  						capsule:init()
  						capsule:create()
  						self.capsules[key] = capsule
  						redisproxy.sadd(CAPSULE_ID_ROLE:format(roleId), key)
  					end
  				end
  			end
  		end
  	end
01ff9b4b   zhangqijia   fix: 一番赏 优化; 抽奖记录...
3345
3346
3347
3348
3349
3350
3351
  
  	function Role:pageRecord(capsuleId, up, idx)
  		local capsule = self.capsules[capsuleId]
  		if not capsule then return nil end
  
  		return capsule:pageRecord(up, idx)
  	end
da20e384   zhangqijia   feat: 一番赏 特殊赏 通知
3352
3353
3354
3355
3356
3357
3358
  
  	function Role:getSpecialNotify(roleId, capsuleId)
  		local capsule = self.capsules[capsuleId]
  		if not capsule then return nil end
  
  		return capsule:getSpecialNotify(roleId)
  	end
95c9089b   zhangqijia   feat: 新增世界线积分功能。
3359
3360
3361
3362
  
  	function Role:checkWorldChangePoints(param)
          local worldChangePoints = self:getProperty("worldChangePoints") or {}
  		if param[ItemWorldLine.CostJade] then
5db4c63a   zhangqijia   fix: 世界线积分, 修复计算错...
3363
3364
3365
3366
  			worldChangePoints[ItemWorldLine.CostJade] = (worldChangePoints[ItemWorldLine.CostJade] or 0) + param[ItemWorldLine.CostJade]
  			local cost = math.floor(worldChangePoints[ItemWorldLine.CostJade] / globalCsv.worldline_gift)
  			worldChangePoints[ItemWorldLine.CostJade] = worldChangePoints[ItemWorldLine.CostJade] - cost * globalCsv.worldline_gift
  			worldChangePoints[ItemWorldLine.RouletteCount] = (worldChangePoints[ItemWorldLine.RouletteCount] or 0) + cost
95c9089b   zhangqijia   feat: 新增世界线积分功能。
3367
3368
3369
3370
  		end
  
  		if param[ItemWorldLine.CostDiamond] then
  			worldChangePoints[ItemWorldLine.CostDiamond] = (worldChangePoints[ItemWorldLine.CostDiamond] or 0) + param[ItemWorldLine.CostDiamond]
5db4c63a   zhangqijia   fix: 世界线积分, 修复计算错...
3371
3372
3373
              local cost = math.floor(worldChangePoints[ItemWorldLine.CostDiamond] / globalCsv.worldline_count_currency)
  			worldChangePoints[ItemWorldLine.CostDiamond] = worldChangePoints[ItemWorldLine.CostDiamond] - cost * globalCsv.worldline_count_currency
  			worldChangePoints[ItemWorldLine.Points] = (worldChangePoints[ItemWorldLine.Points] or 0) + cost
95c9089b   zhangqijia   feat: 新增世界线积分功能。
3374
  		end
5de23af5   zhangqijia   fix: 世界积分 名字修改成Rp...
3375
  		self:updateProperty({field = "worldChangePoints", value = worldChangePoints})
95c9089b   zhangqijia   feat: 新增世界线积分功能。
3376
  	end
7a515b60   zhangqijia   feat: 增加一个礼包码的接口
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
  
  	function Role:getCodeGift(code)
  		local codeurl = skynet.getenv("codeurl")
  		local codestr = self:getProperty("codeStr")
  		local content = {
  			["platformId"] = self:getProperty("sid"),
  			["code"] = code,
  			["itemIds"] = codestr,
  			["key"] = "zhaolugame20170831",
  		}
  		local status, body = httpc.get(codeurl, "/libaoma?" .. httpGetFormatData(content), {})
  		if status == 200 then
  			local result = json.decode(body)
  			local ret = tonum(result.ret)
  			if ret == 0 then
  				local giftId = tonumber(result.giftId)
  				self:setProperty("codeStr", codestr:setv(giftId, 1))
37c968fa   zhangqijia   fix: 礼包码奖励改为邮件
3394
  				self:sendMail(MailId.DrawCode, nil, result.gift)
7a515b60   zhangqijia   feat: 增加一个礼包码的接口
3395
3396
3397
3398
3399
3400
3401
3402
3403
  
  				self:log("get_gift", {
  					gift_id = giftId, -- 礼包ID
  					gift_key = code, -- 礼包key
  					gift_reward = reward, -- 礼包奖励,json格式记录,{"itemid1":123,"itemid2":12,……….}
  					gift_name = "", -- 礼包名称
  					gift_reason = 0, -- 礼包发放原因,见发放原因枚举表
  				})
  				self:mylog("role_action", {desc = "drawCode", int1 = giftId, key1 = code, key2 = self:getRewardLogStr(result.gift)})
37c968fa   zhangqijia   fix: 礼包码奖励改为邮件
3404
                  return ret, result.gift
7a515b60   zhangqijia   feat: 增加一个礼包码的接口
3405
3406
3407
3408
3409
3410
3411
3412
3413
  			end
  			-- 1 不存在的礼包码
  			-- 2 已经领取过相同类型物品
  			-- 3 领取数量达到上限
  			-- 4 过期了
  			return ret
  		end
  		return -1
  	end
be83d162   zhouahaihai   登陆成功。 增加数据结构修正功能
3414
3415
3416
  end
  
  return RolePlugin