Blame view

src/actions/PvpAction.lua 21.3 KB
440aa055   zhouhaihai   聊天
1
2
3
4
5
  local ipairs = ipairs
  local table = table
  local math = math
  local redisproxy = redisproxy
  local MsgPack = MsgPack
4cf74232   zhouhaihai   pvp
6
7
  local httpc = require("http.httpc")
  local remoteUrl = skynet.getenv("codeurl")
440aa055   zhouhaihai   聊天
8
9
10
  
  
  local _M = {}
4cf74232   zhouhaihai   pvp
11
  local _pvpBattleInfoCacheC = {}  --查询列表 缓存pvp战斗相关数据缓存
4c5d72ab   zhouhaihai   高级pvp
12
13
14
15
16
17
18
19
20
21
  local _pvpBattleInfoCacheH = {}  --查询列表 缓存pvp战斗相关数据缓存
  local _pvpHeroInfoCacheH = {}  --查询列表 缓存pvp 英雄相关数据缓存
  local _pvpStartBattleCacheC = nil -- 当前战斗缓存
  local _pvpStartBattleCacheH = nil -- 当前战斗缓存
  
  local _pvpRecordInfoCacheC = {} -- 记录缓存
  local _pvpRecordInfoCacheH = {} -- 记录缓存
  local _pvpRecordBattleInfoCacheC = {} -- 记录战斗数据缓存
  local _pvpRecordBattleInfoCacheH = {} -- 记录战斗数据缓存
  local _pvpRecordHeroInfoCacheH = {}  --查询列表 缓存pvp 英雄相关数据缓存
f317b790   zhouhaihai   pvp 遗留
22
23
  local _revengeRecord = {} -- 复仇对单人1分钟间隔
  local RevengeWaitTime = 60
440aa055   zhouhaihai   聊天
24
25
26
  
  function _M.formatCommonRpc(agent , data)
  	local role = agent.role
fa565e0c   zhouhaihai   优化结构
27
  	local roleId = role:getProperty("id")
440aa055   zhouhaihai   聊天
28
  	local msg = MsgPack.unpack(data)
fa565e0c   zhouhaihai   优化结构
29
  	local pvpTC = role:getProperty("pvpTC")
3dbbc9f3   zhouhaihai   加上新的任务
30
  	for slot, heroId in pairs(msg.heros or {}) do
440aa055   zhouhaihai   聊天
31
32
33
34
  		if not role.heros[heroId] then
  			return
  		end
  	end
3dbbc9f3   zhouhaihai   加上新的任务
35
  	if not msg.heros or not next(msg.heros) then
fa565e0c   zhouhaihai   优化结构
36
  		return
440aa055   zhouhaihai   聊天
37
  	end
f603a60f   zhouhaihai   支援技实装
38
39
40
41
42
43
44
  	local supports = {}
  	for slot, support in pairs(msg.supports) do
  		if slot ~= 1 and slot ~= 2 then return end
  		local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
  		if level <= 0 then return end
  		supports[slot] = support
  	end
440aa055   zhouhaihai   聊天
45
  
fa565e0c   zhouhaihai   优化结构
46
47
48
49
50
51
  	table.clear(pvpTC)
  	pvpTC.heros = {}
  	for slot, heroId in pairs(msg.heros) do
  		pvpTC.heros[slot] = heroId
  	end
  	pvpTC.leader = msg.leader
f603a60f   zhouhaihai   支援技实装
52
  	pvpTC.supports = supports
fa565e0c   zhouhaihai   优化结构
53
54
  	
  	role:savePvpCTeam(pvpTC)
440aa055   zhouhaihai   聊天
55
56
57
58
  	SendPacket(actionCodes.Pvp_formatCommonRpc, '')
  	return true
  end
  
4c5d72ab   zhouhaihai   高级pvp
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
  function _M.formatHighRpc(agent , data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  
  	local pvpTH = {}
  	local had = {} -- 上阵的角色
  	local supportHad = {}
  	for i = 1, 3 do
  		local team = msg.teams[i]
  		if not team then return end
  
  		if not team.heros or not next(team.heros) then
  			return
  		end
4cf74232   zhouhaihai   pvp
74
  
4c5d72ab   zhouhaihai   高级pvp
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
  		for slot, heroId in pairs(team.heros or {}) do
  			if not role.heros[heroId] or had[heroId] then
  				return
  			end
  			had[heroId] = 1
  		end
  
  		local supports = {}
  		for slot, support in pairs(team.supports) do
  			if slot ~= 1 and slot ~= 2 then return end
  			local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
  			if level <= 0 or supportHad[support] then return end
  			supports[slot] = support
  			supportHad[support] = 1
  		end
  
  		local curTeam = {}
  		curTeam.heros = team.heros
  		curTeam.leader = team.leader
  		curTeam.supports = supports
  
  		table.insert(pvpTH, curTeam)
  	end
  	
  	role:savePvpHTeam(pvpTH)
  	SendPacket(actionCodes.Pvp_formatHighRpc, '')
  	return true
  end
  
  local function getMatchInfo(role, pvpList, battleCache, dbKey, infoFuncName, infoCache)
4cf74232   zhouhaihai   pvp
105
106
107
108
  	table.clear(battleCache)
  	local redret = redisproxy:pipelining(function(red)
  		for _, info in ipairs(pvpList) do
  			if info.t == 1 then
4c5d72ab   zhouhaihai   高级pvp
109
  				red:zscore(dbKey, info.id)
4cf74232   zhouhaihai   pvp
110
111
112
113
114
115
116
117
118
119
  			end
  		end
  	end)
  
  	local matches = {}
  	local curIdx = 1
  	for idx, info in ipairs(pvpList) do
  		local curInfo = {idx = idx}
  		if info.t == 1 then --玩家
  			curInfo.roleId = info.id
3dbbc9f3   zhouhaihai   加上新的任务
120
  			curInfo.score = role:unpackPvpScore(redret[curIdx] or 0)
4cf74232   zhouhaihai   pvp
121
122
  			curIdx = curIdx + 1
  			-- name, level, headId, battleV, heros
4c5d72ab   zhouhaihai   高级pvp
123
  			local online, roleInfo = rpcRole(curInfo.roleId, infoFuncName)
4cf74232   zhouhaihai   pvp
124
125
126
127
  			for k , v in pairs(roleInfo) do
  				if k == "battleInfo" then
  					battleCache[curInfo.roleId] = v
  				else
4c5d72ab   zhouhaihai   高级pvp
128
129
130
  					if k == "heros" and infoCache then
  						infoCache[curInfo.roleId] = v
  					end
4cf74232   zhouhaihai   pvp
131
132
133
134
135
136
137
138
139
140
141
142
143
  					curInfo[k] = v
  				end
  			end
  		elseif info.t == 2 then  	-- robot
  			curInfo.robot = info.id
  		end
  		table.insert(matches, curInfo)
  	end
  	return matches
  end
  
  -- 获取pvp信息
  function _M.infoRpc(agent, data)
440aa055   zhouhaihai   聊天
144
  	local role = agent.role
4cf74232   zhouhaihai   pvp
145
  	local roleId = role:getProperty("id")
440aa055   zhouhaihai   聊天
146
  	local msg = MsgPack.unpack(data)
4cf74232   zhouhaihai   pvp
147
  	local ptype = msg.ptype or 1
d232676a   zhouhaihai   功能解锁 冒险返回
148
149
  	
  	if not role:isFuncUnlock(FuncUnlock.Pvp) then return end
440aa055   zhouhaihai   聊天
150
  
4cf74232   zhouhaihai   pvp
151
152
153
154
155
156
  	local response = {}
  	if ptype == 1 then -- 普通pvp
  		local redret = redisproxy:pipelining(function(red)
  			red:zscore(RANK_PVP_COMMON, roleId)
  			red:zrevrank(RANK_PVP_COMMON, roleId)
  		end)
aaf6a9e6   zhouhaihai   分数默认1000
157
  		local score = role:unpackPvpScore(redret[1])
4cf74232   zhouhaihai   pvp
158
  		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
aaf6a9e6   zhouhaihai   分数默认1000
159
  
4cf74232   zhouhaihai   pvp
160
161
162
163
164
165
166
  		local pvpMC = role:getProperty("pvpMC")
  		if not next(pvpMC) then --没有分配过对手
  			role:refreshPvpMatchC(score)
  			pvpMC = role:getProperty("pvpMC")
  		end
  		if not next(pvpMC) then return end
  		
4cf74232   zhouhaihai   pvp
167
  		response.rank = rank
b115474f   zhouhaihai   默认积分 1000
168
  		response.score = score
4c5d72ab   zhouhaihai   高级pvp
169
  		response.matches = getMatchInfo(role, pvpMC, _pvpBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
4cf74232   zhouhaihai   pvp
170
  	elseif ptype == 2 then -- 高级pvp
4c5d72ab   zhouhaihai   高级pvp
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
  		local redret = redisproxy:pipelining(function(red)
  			red:zscore(RANK_PVP_HIGHT, roleId)
  			red:zrevrank(RANK_PVP_HIGHT, roleId)
  		end)
  		local score = role:unpackPvpScore(redret[1])
  		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
  
  		local pvpMH = role:getProperty("pvpMH")
  		if not next(pvpMH) then --没有分配过对手
  			role:refreshPvpMatchH(score)
  			pvpMH = role:getProperty("pvpMH")
  		end
  		if not next(pvpMH) then return end
  		
  		response.rank = rank
  		response.score = score
  		response.matches = getMatchInfo(role, pvpMH, _pvpBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpHeroInfoCacheH)
4cf74232   zhouhaihai   pvp
188
189
190
191
  	else
  		return
  	end
  	SendPacket(actionCodes.Pvp_infoRpc, MsgPack.pack(response))
440aa055   zhouhaihai   聊天
192
193
194
  	return true
  end
  
4cf74232   zhouhaihai   pvp
195
  function _M.refreshMatchCRpc(agent, data)
440aa055   zhouhaihai   聊天
196
197
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4cf74232   zhouhaihai   pvp
198
199
200
  	role:refreshPvpMatchC()
  
  	local pvpMC = role:getProperty("pvpMC")
4c5d72ab   zhouhaihai   高级pvp
201
  	local matches = getMatchInfo(role, pvpMC, _pvpBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
440aa055   zhouhaihai   聊天
202
  
4cf74232   zhouhaihai   pvp
203
  	SendPacket(actionCodes.Pvp_refreshMatchCRpc, MsgPack.pack({matches = matches}))
440aa055   zhouhaihai   聊天
204
205
206
  	return true
  end
  
4c5d72ab   zhouhaihai   高级pvp
207
208
209
210
211
212
213
214
215
216
217
218
  function _M.refreshMatchHRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  	role:refreshPvpMatchH()
  
  	local pvpMH = role:getProperty("pvpMH")
  	local matches = getMatchInfo(role, pvpMH, _pvpBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpHeroInfoCacheH)
  
  	SendPacket(actionCodes.Pvp_refreshMatchHRpc, MsgPack.pack({matches = matches}))
  	return true
  end
  
440aa055   zhouhaihai   聊天
219
220
221
  function _M.buyCountRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
4cf74232   zhouhaihai   pvp
222
  	local count = msg.count
440aa055   zhouhaihai   聊天
223
  
4cf74232   zhouhaihai   pvp
224
225
226
227
228
229
230
231
  	if math.illegalNum(count, 1, math.huge) then
  		return 1
  	end
  
  	local cost = {[ItemId.Diamond] = globalCsv.pvp_buy_cost * count}
  	if not role:checkItemEnough(cost) then return 2 end
  	role:costItems(cost)
  	role:award({[ItemId.PvpKey] = count})
440aa055   zhouhaihai   聊天
232
233
234
235
236
237
  
  	SendPacket(actionCodes.Pvp_buyCountRpc, '')
  	return true
  end
  
  function _M.startBattleRpc(agent, data)
4cf74232   zhouhaihai   pvp
238
239
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
440aa055   zhouhaihai   聊天
240
  
4cf74232   zhouhaihai   pvp
241
242
243
  	local idx = msg.idx
  	local revenge = msg.revenge
  
3dbbc9f3   zhouhaihai   加上新的任务
244
245
246
  	local pvpTC = role:getProperty("pvpTC")
  	if not pvpTC.heros or not next(pvpTC.heros) then return 1 end
  
85083dba   zhouhaihai   拉黑从申请列表移除
247
  	local matchInfo, result, key, wait
3dbbc9f3   zhouhaihai   加上新的任务
248
  
85083dba   zhouhaihai   拉黑从申请列表移除
249
  	local now = skynet.timex()
4cf74232   zhouhaihai   pvp
250
  	if revenge then  --复仇
4c5d72ab   zhouhaihai   高级pvp
251
  		local temp = _pvpRecordInfoCacheC[idx]
3dbbc9f3   zhouhaihai   加上新的任务
252
  		if not temp then return 2 end
85083dba   zhouhaihai   拉黑从申请列表移除
253
  
f317b790   zhouhaihai   pvp 遗留
254
  		if not _revengeRecord[temp.id] or now >= _revengeRecord[temp.id] then
85083dba   zhouhaihai   拉黑从申请列表移除
255
  			if temp.t == 1 then
4c5d72ab   zhouhaihai   高级pvp
256
  				matchInfo = _pvpRecordBattleInfoCacheC[temp.id]
85083dba   zhouhaihai   拉黑从申请列表移除
257
258
259
260
261
  			elseif temp.t == 2 then
  				matchInfo = {robot = temp.id}
  			end
  		else
  			result = 1
f317b790   zhouhaihai   pvp 遗留
262
  			wait = _revengeRecord[temp.id] - now
4cf74232   zhouhaihai   pvp
263
264
265
  		end
  	else  --打正常
  		local pvpMC = role:getProperty("pvpMC")
3dbbc9f3   zhouhaihai   加上新的任务
266
  		if not pvpMC[idx] then return 3 end
4cf74232   zhouhaihai   pvp
267
268
269
270
271
272
273
  		if pvpMC[idx].t == 1 then
  			matchInfo = _pvpBattleInfoCacheC[pvpMC[idx].id]
  		elseif pvpMC[idx].t == 2 then
  			matchInfo = {robot = pvpMC[idx].id}
  		end
  	end
  
3dbbc9f3   zhouhaihai   加上新的任务
274
  	if not result and not matchInfo then return 4 end
85083dba   zhouhaihai   拉黑从申请列表移除
275
276
277
278
279
280
  
  	if not result then
  		-- 次数扣一波
  		local pvpFree = role.dailyData:getProperty("pvpFree")
  		if pvpFree >= globalCsv.pvp_battle_free_count then
  			local cost = {[ItemId.PvpKey] = 1}
3dbbc9f3   zhouhaihai   加上新的任务
281
  			if not role:checkItemEnough(cost) then return 5 end
85083dba   zhouhaihai   拉黑从申请列表移除
282
283
284
285
  			role:costItems(cost)
  		else
  			role.dailyData:updateProperty({field = "pvpFree", delta = 1})
  		end
4cf74232   zhouhaihai   pvp
286
  
85083dba   zhouhaihai   拉黑从申请列表移除
287
  		key = tostring(math.random())
4c5d72ab   zhouhaihai   高级pvp
288
  		_pvpStartBattleCacheC = {idx = idx, key = key, revenge = revenge}
3dbbc9f3   zhouhaihai   加上新的任务
289
290
  
  		role:checkTaskEnter("PvpBattle")
4cf74232   zhouhaihai   pvp
291
292
  	end
  
85083dba   zhouhaihai   拉黑从申请列表移除
293
  	SendPacket(actionCodes.Pvp_startBattleRpc, MsgPack.pack({matchInfo = matchInfo, key = key, result = result, wait = wait}))
4cf74232   zhouhaihai   pvp
294
  	return true
440aa055   zhouhaihai   聊天
295
296
297
  end
  
  function _M.endBattleRpc(agent, data)
4cf74232   zhouhaihai   pvp
298
299
300
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
440aa055   zhouhaihai   聊天
301
  
4c5d72ab   zhouhaihai   高级pvp
302
  	if not msg.key or not _pvpStartBattleCacheC or msg.key ~= _pvpStartBattleCacheC.key then 
4cf74232   zhouhaihai   pvp
303
304
  		return 1
  	end
3dbbc9f3   zhouhaihai   加上新的任务
305
  
4c5d72ab   zhouhaihai   高级pvp
306
  	if not msg.idx or msg.idx ~= _pvpStartBattleCacheC.idx then
4cf74232   zhouhaihai   pvp
307
308
  		return 2
  	end
440aa055   zhouhaihai   聊天
309
  
4cf74232   zhouhaihai   pvp
310
  	local isWin = msg.starNum and msg.starNum > 0
85083dba   zhouhaihai   拉黑从申请列表移除
311
  	local now = skynet.timex()
4cf74232   zhouhaihai   pvp
312
  
4c5d72ab   zhouhaihai   高级pvp
313
  	local revenge = _pvpStartBattleCacheC.revenge
4cf74232   zhouhaihai   pvp
314
315
  	local match
  	if revenge then
4c5d72ab   zhouhaihai   高级pvp
316
  		match = _pvpRecordInfoCacheC[msg.idx]
f317b790   zhouhaihai   pvp 遗留
317
  		_revengeRecord[match.id] = now + RevengeWaitTime  -- 1分钟内不能再打
4cf74232   zhouhaihai   pvp
318
319
320
321
322
323
324
325
326
327
328
329
  	else
  		local pvpMC = role:getProperty("pvpMC")
  		match = pvpMC[msg.idx]
  	end
  	
  	if not match then return end
  
  	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
  	local reward = role:award({[temp[1]] = temp[2]})
  	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreCommon(match.t == 1 and match.id or -1, isWin)
  
  	_pvpBattleInfoCacheC = {}  --重新发阵容了 没毛病
4c5d72ab   zhouhaihai   高级pvp
330
331
332
  	_pvpRecordInfoCacheC = {} -- 记录刷新了
  	_pvpRecordBattleInfoCacheC = {} -- 取新纪录的时候搞
  	_pvpStartBattleCacheC = nil
4cf74232   zhouhaihai   pvp
333
334
  
  	-- 请求上传录像
4cf74232   zhouhaihai   pvp
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
  	local params = {
  		["roleid"] = roleId,
  		["key"] = "zhaolugame20191016",
  		["time"] = now,
  	}
  	local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
  	local video = nil
  	if tonumber(status) == 200 then
  		local result = json.decode(body)
  		video = result.name
  	else
  		skynet.error("applyvideo", "error", status, body, content)
  	end
  
  	-- 加入战斗记录
  	redisproxy:pipelining(function(red)
  		local dbKey = string.format(RECORD_PVP_COMMON, roleId)
  		red:lpush(dbKey, MsgPack.pack({
  			id = match.id,
  			t = match.t,
  			win = isWin,
  			time = now,
  			video = video,
  			sdelta = myScore - oldmyScore,
  		}))
8c20d812   zhouhaihai   pvp bUg
360
  		red:ltrim(dbKey, 0, 9)
4cf74232   zhouhaihai   pvp
361
362
363
364
365
366
367
368
369
370
371
  		-- 对方加入战斗记录
  		if match.t == 1 then
  			dbKey = string.format(RECORD_PVP_COMMON, match.id)
  			red:lpush(dbKey, MsgPack.pack({
  				id = roleId,
  				t = 1,
  				win = not isWin,
  				time = now,
  				video = video,
  				sdelta = matchScore - oldMatchScore,
  			}))
8c20d812   zhouhaihai   pvp bUg
372
  			red:ltrim(dbKey, 0, 9)
4cf74232   zhouhaihai   pvp
373
374
  		end
  	end)
3dbbc9f3   zhouhaihai   加上新的任务
375
376
377
378
  
  	if isWin then
  		role:checkTaskEnter("PvpWin", {score = myScore})
  	end
440aa055   zhouhaihai   聊天
379
  	
4cf74232   zhouhaihai   pvp
380
381
382
383
384
385
386
387
388
389
390
391
392
  	SendPacket(actionCodes.Pvp_endBattleRpc, MsgPack.pack({
  		reward = reward,
  		myScore = myScore,
  		matchScore = matchScore,
  		oldmyScore = oldmyScore,
  		oldMatchScore = oldMatchScore,
  		myRank = myRank,
  		oldMyRank = oldMyRank,
  		video = video,
  	}))
  	return true
  end
  
4c5d72ab   zhouhaihai   高级pvp
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
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
438
439
440
441
442
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
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
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
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
  
  function _M.startBattleHRpc(agent, data)
  	local role = agent.role
  	local msg = MsgPack.unpack(data)
  
  	local idx = msg.idx
  	local revenge = msg.revenge
  
  	local pvpTH = role:getProperty("pvpTH")
  	if not pvpTH.heros or not next(pvpTH.heros) then return 1 end
  
  	-- 检查并记录玩家队伍
  	local pvpTH = {}
  	local had = {} -- 上阵的角色
  	local supportHad = {}
  	for i = 1, 3 do
  		local team = msg.teams[i]
  		if not team then return end
  
  		if not team.heros or not next(team.heros) then
  			return
  		end
  
  		for slot, heroId in pairs(team.heros or {}) do
  			if not role.heros[heroId] or had[heroId] then
  				return
  			end
  			had[heroId] = 1
  		end
  
  		local supports = {}
  		for slot, support in pairs(team.supports) do
  			if slot ~= 1 and slot ~= 2 then return end
  			local level = role.dinerData:getProperty("dishTree"):getv(support, 0)
  			if level <= 0 or supportHad[support] then return end
  			supports[slot] = support
  			supportHad[support] = 1
  		end
  
  		local curTeam = {}
  		curTeam.heros = team.heros
  		curTeam.leader = team.leader
  		curTeam.supports = supports
  
  		table.insert(pvpTH, curTeam)
  	end
  
  	local enemyTeamRecord, result, key, wait, enemyT, matchInfo
  
  	local now = skynet.timex()
  	if revenge then  --复仇
  		local temp = _pvpRecordInfoCacheH[idx]
  		if not temp then return 2 end
  
  		if not _revengeRecord[temp.id] or now >= _revengeRecord[temp.id] then
  			if temp.t == 1 then
  				enemyTeamRecord = _pvpRecordBattleInfoCacheH[temp.id]
  				enemyT = _pvpRecordHeroInfoCacheH[temp.id]
  			elseif temp.t == 2 then
  				enemyTeamRecord = {robot = temp.id}
  			end
  		else
  			result = 1
  			wait = _revengeRecord[temp.id] - now
  		end
  	else  --打正常
  		local pvpMH = role:getProperty("pvpMH")
  		if not pvpMH[idx] then return 3 end
  		if pvpMH[idx].t == 1 then
  			enemyTeamRecord = _pvpBattleInfoCacheH[pvpMH[idx].id]
  			enemyT = _pvpHeroInfoCacheH[temp.id]
  		elseif pvpMH[idx].t == 2 then
  			enemyTeamRecord = {robot = pvpMH[idx].id}
  		end
  	end
  
  	if not result and not enemyTeamRecord then return 4 end
  
  	if not result then
  		-- 次数扣一波
  		local pvpFreeH = role.dailyData:getProperty("pvpFreeH")
  		if pvpFreeH >= globalCsv.pvp_battle_free_count_high then
  			local cost = {[ItemId.PvpKey] = globalCsv.pvp_battle_high_cost}
  			if not role:checkItemEnough(cost) then return 5 end
  			role:costItems(cost)
  		else
  			role.dailyData:updateProperty({field = "pvpFreeH", delta = 1})
  		end
  
  
  		-- 只发送指定的那个敌人
  		if enemyTeamRecord.robot then
  			matchInfo = enemyTeamRecord
  		else
  			matchInfo = enemyTeamRecord[1]
  		end
  
  		key = tostring(math.random())
  		_pvpStartBattleCacheH = {
  			idx = idx,  -- 数据索引
  			key = key, -- 战斗校验 key
  			revenge = revenge, -- 是否是复仇
  			result = {}, -- 战斗记录
  			pvpTH = pvpTH,  -- 我方队伍缓存
  			enemyTB = enemyTeamRecord,  --敌方战斗队伍缓存
  			enemyT = enemyT,
  		}
  
  		role:checkTaskEnter("PvpBattle")
  	end
  	
  	SendPacket(actionCodes.Pvp_startBattleHRpc, MsgPack.pack({
  		matchInfo = matchInfo, --敌方队伍 信息
  		key = key, --战斗校验 key
  		round = 1, -- 战斗场数索引
  		result = result, -- 返回状态
  		wait = wait -- 等待复仇时间  
  	}))
  	return true
  end
  
  function _M.endBattleHRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
  	local msg = MsgPack.unpack(data)
  
  	if not msg.key or not _pvpStartBattleCacheH or msg.key ~= _pvpStartBattleCacheH.key then 
  		return 1
  	end
  
  	if not msg.idx or msg.idx ~= _pvpStartBattleCacheH.idx then
  		return 2
  	end
  
  	local isWin = msg.starNum and msg.starNum > 0
  	local now = skynet.timex()
  
  	local revenge = _pvpStartBattleCacheH.revenge
  	local match
  	if revenge then
  		match = _pvpRecordInfoCacheH[msg.idx]
  		_revengeRecord[match.id] = now + RevengeWaitTime  -- 1分钟内不能再打
  	else
  		local pvpMH = role:getProperty("pvpMH")
  		match = pvpMH[msg.idx]
  	end
  	
  	if not match then return end
  
  	-- 请求上传录像
  	local params = {
  		["roleid"] = roleId,
  		["key"] = "zhaolugame20191016",
  		["time"] = now,
  	}
  	local status, body = httpc.get(remoteUrl, "/applyvideo?" .. httpGetFormatData(params), {}, {})
  	local video = nil
  	if tonumber(status) == 200 then
  		local result = json.decode(body)
  		video = result.name
  	else
  		skynet.error("applyvideo", "error", status, body, content)
  	end
  
  	table.insert(_pvpStartBattleCacheH.result, {
  		isWin = isWin,
  		video = video,
  	})
  
  	-- 检查是否结束战斗
  	local winCount, loseCount = 0, 0
  	for _, status in pairs(_pvpStartBattleCacheH.result) do
  		if status.isWin then
  			winCount = winCount + 1
  		else
  			loseCount = loseCount + 1
  		end
  	end
  
  	if winCount >= 2 then
  		isWin = true
  	elseif loseCount >= 2 then
  		isWin = false
  	else -- 没结束
  		-- 返回继续战斗
  
  		local key = tostring(math.random())
  		_pvpStartBattleCacheH.key = key
  		local round = #_pvpStartBattleCacheH.result + 1
  		local matchInfo = nil
  		if _pvpStartBattleCacheH.enemyTB.robot then
  			matchInfo = _pvpStartBattleCacheH.enemyTB.robot
  		else
  			matchInfo = _pvpStartBattleCacheH.enemyTB[round]
  		end
  
  		-- 继续战斗
  		SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
  			matchInfo = matchInfo, --敌方队伍 信息
  			key = key, --战斗校验 key
  			round = round, -- 战斗场数索引
  			video = video, -- 返回让客户端上传录像
  		}))
  		return true
  	end
  
  	-- 战斗结束了发奖 
  	local temp = string.randWeight(csvdb["player_expCsv"][role:getProperty("level")].pvpBonus, true)
  	local reward = role:award({[temp[1]] = temp[2]})
  	local myScore, matchScore, oldmyScore, oldMatchScore, myRank, oldMyRank = role:changePvpScoreHigh(match.t == 1 and match.id or -1, isWin)
  
  
  	-- 加入战斗记录
  	local selfTeam = {}
  	local enemyTeam = {}
  	for _idx, info in ipairs(_pvpStartBattleCacheH.result) do
  		info.winId = info.isWin and roleId or match.id
  		info.isWin = nil
  		selfTeam[_idx] = role:getTeamHerosInfo(_pvpStartBattleCacheH.pvpTH[_idx].heros)
  		if match.t == 1 and _pvpStartBattleCacheH.enemyT then
  			enemyTeam[_idx] = _pvpStartBattleCacheH.enemyT[_idx]
  		end
  	end
  	local recordBattle = {
  		result = _pvpStartBattleCacheH.result,
  		[roleId] = selfTeam,
  		[match.id] = enemyTeam
  	}
  
  	redisproxy:pipelining(function(red)
  		local dbKey = string.format(RECORD_PVP_HIGH, roleId)
  		red:lpush(dbKey, MsgPack.pack({
  			id = match.id,
  			t = match.t,
  			win = isWin,
  			time = now,
  			sdelta = myScore - oldmyScore,
  			-- 队伍信息
  			record = recordBattle,
  		}))
  		red:ltrim(dbKey, 0, 9)
  		-- 对方加入战斗记录
  		if match.t == 1 then
  			dbKey = string.format(RECORD_PVP_HIGH, match.id)
  			red:lpush(dbKey, MsgPack.pack({
  				id = roleId,
  				t = 1,
  				win = not isWin,
  				time = now,
  				sdelta = matchScore - oldMatchScore,
  				-- 队伍信息
  				record = recordBattle,
  			}))
  			red:ltrim(dbKey, 0, 9)
  		end
  	end)
  
  	_pvpBattleInfoCacheH = {}  --重新发阵容了 没毛病
  	_pvpRecordInfoCacheH = {} -- 记录刷新了
  	_pvpRecordBattleInfoCacheH = {} -- 取新纪录的时候搞
  	_pvpStartBattleCacheH = nil
  	_pvpHeroInfoCacheH = {}
  	_pvpRecordHeroInfoCacheH = {}
  
  	if isWin then
  		role:checkTaskEnter("PvpWin", {score = myScore})
  	end
  	
  	SendPacket(actionCodes.Pvp_endBattleHRpc, MsgPack.pack({
  		reward = reward,
  		myScore = myScore,
  		matchScore = matchScore,
  		oldmyScore = oldmyScore,
  		oldMatchScore = oldMatchScore,
  		myRank = myRank,
  		oldMyRank = oldMyRank,
  		video = video,
  		isWin = isWin,
  	}))
  	return true
  end
  
  
4cf74232   zhouhaihai   pvp
676
677
678
  function _M.rankListRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
f317b790   zhouhaihai   pvp 遗留
679
  	local msg = MsgPack.unpack(data)
4cf74232   zhouhaihai   pvp
680
681
682
683
684
685
686
687
688
  	local ptype = msg.ptype or 1
  
  	local response = {}
  	if ptype == 1 then -- 普通pvp
  		local redret = redisproxy:pipelining(function(red)
  			red:zscore(RANK_PVP_COMMON, roleId)
  			red:zrevrank(RANK_PVP_COMMON, roleId)
  			red:zrevrange(RANK_PVP_COMMON, 0, 99, "WITHSCORES")
  		end)
aaf6a9e6   zhouhaihai   分数默认1000
689
  		local score = role:unpackPvpScore(redret[1])
4cf74232   zhouhaihai   pvp
690
  		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
4cf74232   zhouhaihai   pvp
691
692
  		local rankList = {}
  		for i = 1, #redret[3], 2 do
f317b790   zhouhaihai   pvp 遗留
693
694
  			local roleId = tonumber(redret[3][i])
  			local score = role:unpackPvpScore(redret[3][i + 1])
4cf74232   zhouhaihai   pvp
695
696
697
698
699
700
701
702
703
704
705
  			local online, curInfo = rpcRole(roleId, "friendSInfo")
  			curInfo.score = score
  			curInfo.roleId = roleId
  			table.insert(rankList, curInfo)
  		end
  		
  		response.score = score
  		response.rank = rank
  		response.rankList = rankList
  
  	elseif ptype == 2 then -- 高级pvp
4c5d72ab   zhouhaihai   高级pvp
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
  		local redret = redisproxy:pipelining(function(red)
  			red:zscore(RANK_PVP_HIGHT, roleId)
  			red:zrevrank(RANK_PVP_HIGHT, roleId)
  			red:zrevrange(RANK_PVP_HIGHT, 0, 99, "WITHSCORES")
  		end)
  		local score = role:unpackPvpScore(redret[1])
  		local rank = tonumber(redret[2] or -2) + 1  --排名 1 - ...  -1 未上榜 没打过pvp
  		local rankList = {}
  		for i = 1, #redret[3], 2 do
  			local roleId = tonumber(redret[3][i])
  			local score = role:unpackPvpScore(redret[3][i + 1])
  			local online, curInfo = rpcRole(roleId, "friendSInfo")
  			curInfo.score = score
  			curInfo.roleId = roleId
  			table.insert(rankList, curInfo)
  		end
  		
  		response.score = score
  		response.rank = rank
  		response.rankList = rankList
4cf74232   zhouhaihai   pvp
726
727
728
729
730
731
732
733
734
735
  	else
  		return
  	end
  	SendPacket(actionCodes.Pvp_rankListRpc, MsgPack.pack(response))
  	return true
  end
  
  function _M.recordListRpc(agent, data)
  	local role = agent.role
  	local roleId = role:getProperty("id")
8c20d812   zhouhaihai   pvp bUg
736
  	local msg = MsgPack.unpack(data)
4cf74232   zhouhaihai   pvp
737
738
739
740
741
742
743
744
745
  	local ptype = msg.ptype or 1
  
  	local recordList = {}
  	local now = skynet.timex()
  	if ptype == 1 then -- 普通pvp
  		local rlist = redisproxy:lrange(string.format(RECORD_PVP_COMMON, roleId), 0 , 9)
  		local tempList = {}
  		for _, temp in ipairs(rlist) do
  			local one = MsgPack.unpack(temp)
85083dba   zhouhaihai   拉黑从申请列表移除
746
  			if now - one.time <= globalCsv.pvp_record_keep_time then -- 大于一天的弃之
4cf74232   zhouhaihai   pvp
747
748
749
  				table.insert(tempList, one)
  			end
  		end
4c5d72ab   zhouhaihai   高级pvp
750
  		_pvpRecordInfoCacheC = tempList
4cf74232   zhouhaihai   pvp
751
  
4c5d72ab   zhouhaihai   高级pvp
752
  		recordList = getMatchInfo(role, tempList, _pvpRecordBattleInfoCacheC, RANK_PVP_COMMON, "pvpCInfo")
4cf74232   zhouhaihai   pvp
753
754
755
756
757
758
759
760
761
  		for idx, info in ipairs(recordList) do
  			local temp = tempList[idx]
  			info.win = temp.win
  			info.time = temp.time
  			info.video = temp.video
  			info.sdelta = temp.sdelta
  		end
  		
  	elseif ptype == 2 then -- 高级pvp
4c5d72ab   zhouhaihai   高级pvp
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
  		local rlist = redisproxy:lrange(string.format(RECORD_PVP_HIGH, roleId), 0 , 9)
  		local tempList = {}
  		for _, temp in ipairs(rlist) do
  			local one = MsgPack.unpack(temp)
  			if now - one.time <= globalCsv.pvp_record_keep_time then -- 大于一天的弃之
  				table.insert(tempList, one)
  			end
  		end
  		_pvpRecordInfoCacheH = tempList
  
  		recordList = getMatchInfo(role, tempList, _pvpRecordBattleInfoCacheH, RANK_PVP_HIGHT, "pvpHInfo", _pvpRecordHeroInfoCacheH)
  		for idx, info in ipairs(recordList) do
  			local temp = tempList[idx]
  			info.win = temp.win
  			info.time = temp.time
  			info.sdelta = temp.sdelta
  			info.record = temp.record
  		end
4cf74232   zhouhaihai   pvp
780
781
782
783
784
  	else
  		return
  	end
  	SendPacket(actionCodes.Pvp_recordListRpc, MsgPack.pack({list = recordList}))
  	return true
440aa055   zhouhaihai   聊天
785
786
787
  end
  
  return _M