c384626d
 
  zhouhaihai
 
好友
 | 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112 
 | 
  local ipairs = ipairs
  local table = table
  local math = math
  local string = string
  local redisproxy = redisproxy
  local MsgPack = MsgPack
  local string_format = string.format
  local tonumber = tonumber
  local table_insert = table.insert
  local table_unpack = table.unpack
  local table_find = table.find
  local table_nums = table.nums
  local math_random = math.randomInt
  
  local _M = {}
  
  local function formatArray(tb)
  	tb = tb or {}
  	local t = {}
  	for _, objectId in ipairs(tb) do
  		t[tonumber(objectId)] = 1
  	end
  	return t
  end
  
  local function checkFriendLimit(roleId)
  	roleId = tonumber(roleId)
  	local count = redisproxy:hlen(FRIEND_KEY:format(roleId))
  	return count < globalCsv.friendListLimit
  end
  
  
  local function addAndCheckApplyLimit(roleId, objId)
  	roleId = tonumber(roleId)
  	local dbKey = FRIEND_APPLY_KEY:format(roleId)
  	local redret = redisproxy:pipelining(function (red)
  		red:zadd(dbKey, skynet.timex(), objId)
  		red:zremrangebyrank(dbKey, 0, -(globalCsv.friendApplyLimit + 1))
  	end)
  end
  
  local function checkBlackLimit(roleId)
  	roleId = tonumber(roleId)
  	local count = redisproxy:scard(FRIEND_BLACK_KEY:format(roleId))
  	return count < globalCsv.friendListLimit
  end
  
  local function getRoleInfo(roleId)
  	local online, info = rpcRole(roleId, "friendSInfo")
  	return online, info
  end
  
  local function getRoleAllInfo(roleId)
  	local online, info = rpcRole(roleId, "friendInfo")
  	return online, info
  end
  
  local function table_merge(tab1, tab2, filter)
  	tab1 = tab1 or {}
  	tab2 = tab2 or {}
  	filter = filter or {}
  	for k_, v_ in pairs(tab2) do
  		if not filter[k_] then
  			tab1[k_] = v_
  		end
  	end
  	return tab1
  end
  
  function _M.searchRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local key = msg.key
  
  	if not key then return end
  
  	local objIds = {}
  	local tempId = tonumber(key)
  	if tempId then
  		if redisproxy:exists(string_format("role:%d", tempId)) then
  			objIds[tempId] = 1
  		end
  	end
  	local tempId = redisproxy:get(string_format("user:%s", string.upper(key)))
  	if tempId then
  		objIds[tonumber(tempId)] = 1
  	end
  	objIds[roleId] = nil --不能有自己
  
  	local searchList = {}
  	for objId, _ in pairs(objIds) do
  		local online, info = getRoleInfo(objId)
  		local redret = redisproxy:pipelining(function (red)
  			red:hexists(FRIEND_KEY:format(roleId), objId)
  			red:zscore(FRIEND_APPLY_KEY:format(objId), roleId)
  			red:sismember(FRIEND_BLACK_KEY:format(roleId), objId)
  		end)
  		local isFriend = redret[1] == 1 and 1 or nil
  		local hadApply = redret[2] and 1 or nil
  		local inBlack = redret[3] == 1 and 1 or nil
  
  		table.insert(searchList, table_merge({
  			roleId = objId, 
  			online = online, 
  			isFriend = isFriend, 
  			hadApply = hadApply,
  			inBlack = inBlack,
  		}, info, {
  
  		}))
  	end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
113 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
114 
 | 
  	role:mylog("role_action", {desc = "searchFriend"})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140 
 | 
  	SendPacket(actionCodes.Friend_searchRpc, MsgPack.pack({searchList = searchList}))
  	return true
  end
  
  
  function _M.applyRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local msg = MsgPack.unpack(data)
  	local objectId = msg.roleId
  
  	if objectId == roleId then
  		return
  	end
  
  	local result = nil
  	local redret = redisproxy:pipelining(function (red)
  		red:exists(string_format("role:%d", objectId))
  		red:hexists(FRIEND_KEY:format(roleId), objectId)
  		red:zscore(FRIEND_APPLY_KEY:format(objectId), roleId)
  		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
  		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
  		red:hlen(FRIEND_KEY:format(roleId))
  		red:hlen(FRIEND_KEY:format(objectId))
  	end)
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
141 
 | 
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160 
 | 
  	-- 玩家id不存在
  	if not result and redret[1] ~= 1 then
  		result = 1	
  	end
  
  	-- 已经有这个好友
  	if not result and redret[2] == 1 then
  		result = 2
  	end
  	-- 已经申请
  	if not result and redret[3] then
  		result = 3
  	end
  	-- 对方把你拉黑
  	if not result and redret[4] == 1 then
  		result = 4
  	end
  
  	-- 你把对方拉黑了
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
161 
 | 
  	if not result and redret[5] == 1 then
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179 
 | 
  		result = 5
  	end
  
  	-- 自己好友已经满
  	if not result and redret[6] >= globalCsv.friendListLimit then
  		result = 6
  	end
  	-- 对方的好友已满
  	if not result and redret[7] >= globalCsv.friendListLimit then
  		result = 7
  	end
  
  	if not result then
  		addAndCheckApplyLimit(objectId, roleId)
  		local myInfo = role:friendSInfo()
  		myInfo.roleId = roleId
  		myInfo.online = true
  		myInfo.hadApply = true
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
180 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
181
182 
 | 
  		role:mylog("role_action", {desc = "addFriend", int1 = 1})
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
183
184 
 | 
  		rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newApply = 1, info = {myInfo}})) 	-- 通知对方
  	end
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
185
186
187 
 | 
  
  	
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211 
 | 
  	SendPacket(actionCodes.Friend_applyRpc, MsgPack.pack({result = result}))
  	return true
  end
  
  function _M.applyListRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local applyList = {}
  
  	local friends = redisproxy:zrange(FRIEND_APPLY_KEY:format(roleId), 0, -1)
  	for _ , id in pairs(friends) do
  		id = tonumber(id)
  		local online, info = getRoleInfo(id)
  		table.insert(applyList, table_merge({
  			roleId = id, online = online
  		}, info, {
  
  		}))
  	end
  	SendPacket(actionCodes.Friend_applyListRpc, MsgPack.pack({list = applyList}))
  	return true
  end
  
 
 | 
763d6396
 
  zhouhaihai
 
批量增加好友bug
 | 
212
213 
 | 
  local function checkHandleApply(roleId, objectId, needAddNew) 
  	needAddNew = needAddNew or 0
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
214
215
216
217
218
219 
 | 
  	local redret = redisproxy:pipelining(function (red)
  		red:hlen(FRIEND_KEY:format(roleId))
  		red:hlen(FRIEND_KEY:format(objectId))
  		red:sismember(FRIEND_BLACK_KEY:format(objectId), roleId)
  		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
  	end)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
220 
 | 
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
221 
 | 
  	--自己好友满了
 
 | 
763d6396
 
  zhouhaihai
 
批量增加好友bug
 | 
222
223 
 | 
  	if (redret[1] + needAddNew) >= globalCsv.friendListLimit then
  		return 1
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
224
225 
 | 
  	end
  	-- 对方好友满了
 
 | 
763d6396
 
  zhouhaihai
 
批量增加好友bug
 | 
226
227 
 | 
  	if redret[2] >= globalCsv.friendListLimit then
  		return 2
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
228
229 
 | 
  	end
  	-- 对方把你拉黑
 
 | 
763d6396
 
  zhouhaihai
 
批量增加好友bug
 | 
230
231 
 | 
  	if redret[3] == 1 then
  		return 3
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
232
233 
 | 
  	end
  	-- 你把对方拉黑了
 
 | 
763d6396
 
  zhouhaihai
 
批量增加好友bug
 | 
234
235 
 | 
  	if redret[4] == 1 then
  		return 4
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
236 
 | 
  	end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
237
238 
 | 
  
  	return nil, redret[1]
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256 
 | 
  end
  
  function _M.handleApplyRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local msg = MsgPack.unpack(data)
  	local cmd = msg.cmd
  
  	local newTag = MsgPack.pack({ skynet.timex(), 1})
  	local result = nil
  	if cmd == 1 then	--同意
  
  		local objectId = msg.roleId
  
  		if not redisproxy:zscore(FRIEND_APPLY_KEY:format(roleId), objectId) then
  			return
  		end
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
257
258 
 | 
  		local curCount
  		result, curCount = checkHandleApply(roleId, objectId)
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282 
 | 
  
  		if not result then
  			redisproxy:pipelining(function (red)
  				red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
  				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
  				red:hsetnx(FRIEND_KEY:format(roleId), objectId, newTag)
  				red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
  			end)
  			local myInfo = role:friendSInfo()
  			myInfo.online = true
  			myInfo.roleId = roleId
  			myInfo.isFriend = 1
  			local redret = redisproxy:pipelining(function (red)
  				red:sismember(FRIEND_POINT:format(objectId), roleId)
  				red:sismember(FRIEND_POINT:format(roleId), objectId)
  			end)
  			myInfo.pGet = redret[1] == 1 and 1 or nil
  			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {myInfo}}))	-- 通知对方
  			local online , otherInfo = getRoleInfo(objectId)
  			otherInfo.roleId = objectId
  			otherInfo.online = online
  			otherInfo.isFriend = true
  			otherInfo.pGet = redret[2] == 1 and 1 or nil
  			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {otherInfo}}))
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
283 
 | 
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
284
285
286
287
288 
 | 
  			role:log("friend_opt", {
  				friend_opt_type = 100, -- 好友操作类型,见枚举表中 好友操作类型枚举表
  				friend_roleid = objectId, -- 好友账户下的角色id
  				friend_cnt = curCount + 1, -- 操作后好友数量
  			})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
289
290 
 | 
  			role:mylog("role_action", {desc = "addFriend", int1 = 1})
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
291
292
293
294
295
296
297
298
299
300
301
302 
 | 
  		end
  
  	elseif cmd == 0 then	-- 不同意
  		local objectId = msg.roleId
  		if not redisproxy:zscore(FRIEND_APPLY_KEY:format(roleId), objectId) then
  			return
  		end
  		redisproxy:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
  	elseif cmd == 2 then    -- 一键拒绝
  		redisproxy:del(FRIEND_APPLY_KEY:format(roleId))
  	elseif cmd == 3 then    -- 一键同意
  		local redret = redisproxy:pipelining(function(red)
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
303 
 | 
  			red:zrange(FRIEND_APPLY_KEY:format(roleId), 0, -1)
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
304
305
306
307
308
309
310
311
312 
 | 
  			red:SMEMBERS(FRIEND_POINT:format(roleId))
  		end)
  		local allIds = redret[1]
  		local fpoint = formatArray(redret[2])
  		local needAdd = {}
  		local needAddMy = {}
  		local needAddInfo = {}
  		for _, objId in ipairs(allIds) do
  			objId = tonumber(objId)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
313 
 | 
  			local cr, curCount = checkHandleApply(roleId, objId, #needAdd)
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
314
315
316
317
318
319
320
321
322
323 
 | 
  			if not cr then 
  				table.insert(needAdd, objId)
  				table.insert(needAddMy, objId)
  				table.insert(needAddMy, newTag)
  				local online, otherInfo = getRoleInfo(objId)
  				otherInfo.online = true
  				otherInfo.roleId = objId
  				otherInfo.isFriend = true
  				otherInfo.pGet = fpoint[objId] and 1 or nil
  				table.insert(needAddInfo, otherInfo)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
324
325
326
327
328
329 
 | 
  
  				role:log("friend_opt", {
  					friend_opt_type = 100, -- 好友操作类型,见枚举表中 好友操作类型枚举表
  					friend_roleid = objId, -- 好友账户下的角色id
  					friend_cnt = curCount + 1, -- 操作后好友数量
  				})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
330
331
332
333 
 | 
  			end
  		end
  
  		redisproxy:pipelining(function (red)
 
 | 
92d7d6ac
 
  zhouhaihai
 
加一些数据保护
 | 
334
335
336
337
338
339
340
341
342 
 | 
  			if next(needAdd) then
  				red:ZREM(FRIEND_APPLY_KEY:format(roleId), table_unpack(needAdd))
  				for _, objectId in pairs(needAdd) do
  					red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
  					red:hsetnx(FRIEND_KEY:format(objectId), roleId, newTag)--告知对放有新好友
  				end
  			end
  			if next(needAddMy) then
  				red:HMSET(FRIEND_KEY:format(roleId), table_unpack(needAddMy))
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
343
344
345
346
347
348
349
350
351
352
353
354 
 | 
  			end
  		end)
  		local myInfo = role:friendSInfo()
  		myInfo.roleId = roleId
  		myInfo.online = true
  		myInfo.isFriend = 1
  		local giveFP = role.dailyData:getProperty("giveFP")
  		for _, objectId in pairs(needAdd) do
  			myInfo.pGet = giveFP[objectId]
  			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = {myInfo}}))	-- 通知对方
  		end
  		if next(needAdd) then
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
355
356 
 | 
  			role:mylog("role_action", {desc = "addFriend", int1 = #needAdd})
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411 
 | 
  			SendPacket(actionCodes.Friend_updateProperty, MsgPack.pack({newFriend = 1, info = needAddInfo}))
  		else
  			result = 1
  		end
  		
  	else 	--不存在
  		return
  	end
  
  	SendPacket(actionCodes.Friend_handleApplyRpc, MsgPack.pack({result = result}))
  	return true
  end
  
  function _M.listRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local friendList = {}
  	local redret = redisproxy:pipelining(function (red)
  		red:hgetall(FRIEND_KEY:format(roleId))
  		red:SMEMBERS(FRIEND_POINT:format(roleId))
  	end)
  
  	local friends = redret[1]
  	local fpoint = formatArray(redret[2])
  	local hadGet = role.dailyData:getProperty("getFP")
  	local hadGive = role.dailyData:getProperty("giveFP")
  
  	local clearRed = {}
  	for i = 1, #friends, 2 do
  		local id = friends[i]
  		local data = friends[i + 1]
  		local friendInfo = MsgPack.unpack(data)
  		id = tonumber(id)
  		local online, info = getRoleInfo(id)
  		local roleInfo = {
  			roleId = id, 
  			online = online, 
  			addTime = friendInfo[1], 
  			isNew = friendInfo[2],
  			pGive = hadGive[id],
  			pGet = hadGet[id] and -1 or (fpoint[id] and 1 or nil)
  		}
  		roleInfo = table_merge(roleInfo, info, {})
  
  		friendList[#friendList + 1] = roleInfo
  
  		if friendInfo[2] then
  			friendInfo[2] = nil	--清除新好友标记
  			clearRed[#clearRed + 1] = id
  			clearRed[#clearRed + 1] = MsgPack.pack(friendInfo)
  		end
  	end
  	if next(clearRed) then
  		redisproxy:hmset(FRIEND_KEY:format(roleId), table_unpack(clearRed))	--清除新好友标记
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
412 
 | 
  		role:checkTaskEnter("AddFriend", {count = #friendList})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437 
 | 
  	end
  
  	SendPacket(actionCodes.Friend_listRpc, MsgPack.pack({list = friendList}))
  	return true
  end
  
  function _M.deleteRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local objectId = msg.roleId
  	if not redisproxy:exists(string_format("role:%d", objectId)) then
  		return
  	end
  	-- 是否在好友列表中
  	if redisproxy:hexists(FRIEND_KEY:format(roleId), objectId) then
  		redisproxy:pipelining(function (red)
  			red:hdel(FRIEND_KEY:format(roleId), objectId)
  			red:hdel(FRIEND_KEY:format(objectId), roleId)
  			red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
  			red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
  		end)
  	end
  	rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({deleteFriend = 1, roleId = roleId}))
  
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
438
439
440
441
442 
 | 
  	role:log("friend_opt", {
  		friend_opt_type = 200, -- 好友操作类型,见枚举表中 好友操作类型枚举表
  		friend_roleid = objectId, -- 好友账户下的角色id
  		friend_cnt = 0, -- 操作后好友数量
  	})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467 
 | 
  	SendPacket(actionCodes.Friend_deleteRpc, MsgPack.pack(""))
  	return true
  end
  
  function _M.blockRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local cmd = msg.cmd
  	local objectId = msg.roleId
  	if not redisproxy:exists(string_format("role:%d", objectId)) then
  		return
  	end
  
  	local result = nil
  	if cmd == 1 then
  		-- 黑名单满了
  		if not result and not checkBlackLimit(roleId) then 
  			result = 1
  		end
  		-- 删除好友
  		if not result then
  			redisproxy:pipelining(function (red)
  				red:hdel(FRIEND_KEY:format(roleId), objectId)
  				red:hdel(FRIEND_KEY:format(objectId), roleId)
 
 | 
85083dba
 
  zhouhaihai
 
拉黑从申请列表移除
 | 
468
469 
 | 
  				red:ZREM(FRIEND_APPLY_KEY:format(roleId), objectId)
  				red:ZREM(FRIEND_APPLY_KEY:format(objectId), roleId)
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
470
471 
 | 
  				red:sadd(FRIEND_BLACK_KEY:format(roleId), objectId)
  			end)
 
 | 
c59e058b
 
  zhouhaihai
 
新一批日志记录
 | 
472
473
474
475
476
477 
 | 
  			rpcRole(objectId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({deleteFriend = 1, roleId = roleId}))
  			role:log("friend_opt", {
  				friend_opt_type = 300, -- 好友操作类型,见枚举表中 好友操作类型枚举表
  				friend_roleid = objectId, -- 好友账户下的角色id
  				friend_cnt = 0, -- 操作后好友数量
  			})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
478
479
480
481
482
483 
 | 
  		end
  	elseif cmd == 2 then
  		redisproxy:SREM(FRIEND_BLACK_KEY:format(roleId), objectId)
  	else
  		return
  	end
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503 
 | 
  	SendPacket(actionCodes.Friend_blockRpc, MsgPack.pack({result = result}))
  	return true
  end
  
  function _M.blockListRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local blockList = {}
  
  	local friends = redisproxy:SMEMBERS(FRIEND_BLACK_KEY:format(roleId))
  	for _ , id in pairs(friends) do
  		id = tonumber(id)
  		local online, info = getRoleInfo(id)
  		table.insert(blockList, table_merge({
  			roleId = id, online = online
  		}, info, {
  
  		}))
  	end
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
504 
 | 
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560 
 | 
  	SendPacket(actionCodes.Friend_blockListRpc, MsgPack.pack({list = blockList}))
  	return true
  end
  
  function _M.infoRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local objectId = msg.roleId
  	if not redisproxy:exists(string_format("role:%d", objectId)) then
  		return
  	end
  
  	local online, info = getRoleAllInfo(objectId)
  	local redret = redisproxy:pipelining(function (red)
  		red:hexists(FRIEND_KEY:format(roleId), objectId)
  		red:zscore(FRIEND_APPLY_KEY:format(objectId), roleId)
  		red:sismember(FRIEND_BLACK_KEY:format(roleId), objectId)
  	end)
  	local isFriend = redret[1] == 1 and 1 or nil
  	local hadApply = redret[2] == 1 and 1 or nil
  	local inBlack = redret[3] == 1 and 1 or nil
  
  	local objInfo = table_merge({
  		roleId = objectId, 
  		online = online, 
  		isFriend = isFriend, 
  		hadApply = hadApply,
  		inBlack = inBlack,
  	}, info, {
  
  	})
  	SendPacket(actionCodes.Friend_infoRpc, MsgPack.pack({info = objInfo}))
  	return true
  end
  
  function _M.pointRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local cmd = msg.cmd
  	local result = nil
  	local reward = {}
  	if cmd == 1 then  -- 赠送
  		local objId = msg.roleId
  		local giveP = role.dailyData:getProperty("giveFP")
  		if not result and giveP[objId] then 
  			result = 1
  		end
  		if not result and not redisproxy:hexists(FRIEND_KEY:format(roleId), objId) then
  			result = 2
  		end
  		if not result then
  			redisproxy:sadd(FRIEND_POINT:format(objId), roleId)
  			giveP[objId] = 1
  			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
561 
 | 
  			role:checkTaskEnter("GiveFriendP", {count = 1})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
562 
 | 
  			rpcRole(objId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newPoint = 1, roleId = roleId}))
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
563
564 
 | 
  
  			role:mylog("role_action", {desc = "giveFPoint", int1 = 1})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579 
 | 
  		end
  	elseif cmd == 2 then -- 领取
  		local objId = msg.roleId
  		local getP = role.dailyData:getProperty("getFP")
  		if not result and table.numbers(getP) >= globalCsv.friendPointLimit then
  			result = 1
  		end
  		if not result and getP[objId] then
  			result = 2
  		end
  		if not redisproxy:sismember(FRIEND_POINT:format(roleId), objId) then
  			result = 3
  		end
  		if not result then
  			getP[objId] = 1
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
580 
 | 
  			reward = role:award({[ItemId.FriendPoint] = 1}, {log = {desc = "friendPoint"}})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
581 
 | 
  			role.dailyData:updateProperty({field = "getFP", value = getP})
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
582 
 | 
  			role:checkTaskEnter("GetFriendP", {count = 1})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
583 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
584 
 | 
  			role:mylog("role_action", {desc = "getFPoint", int1 = 1})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
585
586
587
588
589 
 | 
  		end
  	elseif cmd == 3 then -- 一键赠送领取
  		-- 赠送
  		local giveP = role.dailyData:getProperty("giveFP")
  		local friends = redisproxy:hgetall(FRIEND_KEY:format(roleId))
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
590 
 | 
  		local change = 0
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
591
592
593
594
595 
 | 
  		redisproxy:pipelining(function(red)
  			for i = 1, #friends , 2 do
  				local objId = tonumber(friends[i])
  				if not giveP[objId] then
  					giveP[objId] = 1
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
596 
 | 
  					change = change + 1
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
597
598
599
600
601 
 | 
  					red:sadd(FRIEND_POINT:format(objId), roleId)
  					rpcRole(objId, "SendPacket", actionCodes.Friend_updateProperty, MsgPack.pack({newPoint = 1, roleId = roleId}))
  				end
  			end
  		end)
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
602 
 | 
  		if change > 0 then
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
603 
 | 
  			role.dailyData:updateProperty({field = "giveFP", value = giveP})
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
604 
 | 
  			role:checkTaskEnter("GiveFriendP", {count = change})
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
605 
 | 
  
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
606
607 
 | 
  			role:mylog("role_action", {desc = "giveFPoint", int1 = change})
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628 
 | 
  		else
  			result = 1
  		end
  		
  		--领取
  		local getP = role.dailyData:getProperty("getFP")
  		local curCount = table.numbers(getP)
  		local getCount = 0
  		if curCount < globalCsv.friendPointLimit then
  			for _, objId in pairs(redisproxy:SMEMBERS(FRIEND_POINT:format(roleId))) do
  				local objId = tonumber(objId)
  				if not getP[objId] then
  					getCount = getCount + 1
  					curCount = curCount + 1
  					getP[objId] = 1
  					if curCount >= globalCsv.friendPointLimit then
  						break
  					end
  				end
  			end
  			if getCount > 0 then
 
 | 
3133cb76
 
  zhouhaihai
 
日志
 | 
629 
 | 
  				reward = role:award({[ItemId.FriendPoint] = getCount}, {log = {desc = "friendPoint"}})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
630 
 | 
  				role.dailyData:updateProperty({field = "getFP", value = getP})
 
 | 
3dbbc9f3
 
  zhouhaihai
 
加上新的任务
 | 
631 
 | 
  				role:checkTaskEnter("GetFriendP", {count = getCount})
 
 | 
f22a33af
 
  zhouhaihai
 
自己的日志
 | 
632 
 | 
  				role:mylog("role_action", {desc = "getFPoint", int1 = getCount})
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
633 
 | 
  			else
 
 | 
8474ca36
 
  zhouhaihai
 
聊天
 | 
634 
 | 
  				result = (result or 0) + 2
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
635
636
637
638
639
640
641
642
643
644
645
646
647
648 
 | 
  			end
  		end
  	else
  		return
  	end
  	SendPacket(actionCodes.Friend_pointRpc, MsgPack.pack({result = result, reward = reward}))
  	return true
  end
  function _M.randomRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  
  	local redret = redisproxy:pipelining(function (red)
  		red:hgetall(FRIEND_KEY:format(roleId))
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
649
650 
 | 
  		red:zrevrange(FRIEND_RECOMMEND, 0, globalCsv.friendRecommendLimit + globalCsv.friendListLimit + 10) --扩充10个
  		red:SMEMBERS(FRIEND_BLACK_KEY:format(roleId))
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
651 
 | 
  	end)
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
652
653
654
655
656 
 | 
  	local friends = {}
  	for i = 1, #redret[1], 2 do
  		friends[tonumber(redret[1][i])] = redret[1][i + 1]
  	end
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
657 
 | 
  	local newList = redret[2]
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
658
659 
 | 
  	local hadBlack = formatArray(redret[3])
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
660
661
662 
 | 
  	local needRoleIds = {}
  	for _, newId in pairs(newList) do
  		local numNewId = tonumber(newId)
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
663 
 | 
  		if numNewId ~= roleId and not friends[numNewId] and not hadBlack[numNewId] then
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
664
665
666
667
668 
 | 
  			table.insert(needRoleIds, numNewId)
  		end
  	end
  
  	local randomRoles = {}
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
669
670 
 | 
  	local redret = redisproxy:pipelining(function (red)
  		for _, objId in ipairs(needRoleIds) do
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
671 
 | 
  			red:zscore(FRIEND_APPLY_KEY:format(objId), roleId)
 
 | 
5dfc4978
 
  zhouhaihai
 
好友完善
 | 
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686 
 | 
  		end
  	end)
  	for idx, objId in ipairs(needRoleIds) do
  		if not redret[idx] then
  			local online, info = getRoleInfo(objId)
  			table.insert(randomRoles, table_merge({
  				roleId = objId, 
  				online = online,  
  				hadApply = hadApply,
  				inBlack = inBlack,
  			}, info, {
  
  			}))
  			if #randomRoles >= globalCsv.friendRecommendLimit then break end
  		end
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
687
688
689
690
691
692 
 | 
  	end
  
  	SendPacket(actionCodes.Friend_randomRpc, MsgPack.pack({list = randomRoles}))
  	return true
  end
  
 
 | 
f603a60f
 
  zhouhaihai
 
支援技实装
 | 
693
694
695
696
697
698
699
700
701
702 
 | 
  function _M.battleInfoRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  	local objId = msg.roleId
  	local online, matchInfo = rpcRole(objId, "friendBattleInfo")
  	SendPacket(actionCodes.Friend_battleInfoRpc, MsgPack.pack({matchInfo = matchInfo}))
  	return true
  end
  
 
 | 
c384626d
 
  zhouhaihai
 
好友
 | 
703
704 
 | 
  
  return _M
 
 |