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