From cdf7a25b04904eb5a2f6ae4bd6c5cb7226961b4e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 八月 2022 14:46:23 +0800
Subject: [PATCH] 9685 【后台】开服时间整合（邮件内容附加MsgInfo信息默认字符串）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 582 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 392 insertions(+), 190 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 81227c2..553dfd8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -35,7 +35,6 @@
import operator
import random
import time
-import cPickle
class CrossPKPlayer():
## 跨服PK玩家类
@@ -59,12 +58,13 @@
self.serverGroupID = 0 # 所属服务器ID，一个服务器ID由多个服组成
self.pkZoneID = 0 # 所属赛区ID，一个赛区由多个服务器ID组成
self.seasonID = 0 # 赛季ID
+ self.notifyMatchRobotTick = 0 # 通知匹配到机器人的tick
return
def GetDRInfo(self):
## 流向记录信息
- return {"accID":self.accID, "playerID":self.playerID, "fightPower":self.fightPower, "pkScore":self.pkScore,
- "danLV":self.danLV, "matchTick":self.matchTick, "prepareOKTick":self.prepareOKTick, "cWinCount":self.cWinCount,
+ return {"accID":self.accID, "playerID":self.playerID, "fightPower":self.fightPower, "pkScore":self.pkScore,
+ "danLV":self.danLV, "matchTick":self.matchTick, "prepareOKTick":self.prepareOKTick, "cWinCount":self.cWinCount,
"ondayScore":self.ondayScore, "serverGroupID":self.serverGroupID, "ondayScore":self.ondayScore}
class CrossPKRoom():
@@ -84,7 +84,7 @@
return
def GetDRInfo(self):
- return {"zoneID":self.pkZoneID, "seasonID":self.seasonID, "roomID":self.roomID, "mapID":self.mapID, "openTick":self.openTick,
+ return {"zoneID":self.pkZoneID, "seasonID":self.seasonID, "roomID":self.roomID, "mapID":self.mapID, "openTick":self.openTick,
"readyTick":self.readyTick, "roomPlayerIDList":self.roomPlayerIDList, "mapFBOpenTick":self.mapFBOpenTick}
#跨服PK排行榜管理，注意该类只处理数据逻辑，功能相关逻辑不要写在该类，不然重读脚本不会生效
@@ -200,7 +200,7 @@
cnt += 1
savaData += billboardData.getBuffer()
- GameWorld.Log("SaveCrossPKBillboard cnt :%s" % cnt)
+ GameWorld.Log("SaveCrossPKBillboard cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -242,14 +242,16 @@
return
maxCount = min(2000, maxCount)
upBillboardList = []
- if winner.danLV >= danLVLimit:
- upBillboardList.append(winner)
- else:
- GameWorld.DebugLog(" 段位不足，无法上榜! winnerDanLV=%s < danLVLimit=%s" % (winner.danLV, danLVLimit), winner.playerID)
- if loser.danLV >= danLVLimit:
- upBillboardList.append(loser)
- else:
- GameWorld.DebugLog(" 段位不足，无法上榜! loserDanLV=%s < danLVLimit=%s" % (loser.danLV, danLVLimit), loser.playerID)
+ if winner:
+ if winner.danLV >= danLVLimit:
+ upBillboardList.append(winner)
+ else:
+ GameWorld.DebugLog(" 段位不足，无法上榜! winnerDanLV=%s < danLVLimit=%s" % (winner.danLV, danLVLimit), winner.playerID)
+ if loser:
+ if loser.danLV >= danLVLimit:
+ upBillboardList.append(loser)
+ else:
+ GameWorld.DebugLog(" 段位不足，无法上榜! loserDanLV=%s < danLVLimit=%s" % (loser.danLV, danLVLimit), loser.playerID)
if not upBillboardList:
return
@@ -445,7 +447,7 @@
def SyncPKSyncBillboardToClientServer(zoneID, seasonID, serverGroupIDList, exData={}):
## 同步赛区赛季榜单到子服
crossPKBillboardMgr = PyDataManager.GetCrossPKBillboardManager()
- billboardList, orderDict = crossPKBillboardMgr.GetCrossPKBillboardInfo(zoneID, seasonID, True) # 同步子服前需触发排序
+ billboardList, orderDict = crossPKBillboardMgr.GetCrossPKBillboardInfo(zoneID, seasonID, True) # 同步子服前需触发排序
isFinalBillboardData = False # 是否最终的榜单数据
gameWorld = GameWorld.GetGameWorld()
curZoneSeasonID = gameWorld.GetDictByKey(ChConfig.Def_WorldKey_CrossPKZoneSeasonID % zoneID)
@@ -669,7 +671,10 @@
if not preState and isOpen:
PyGameData.g_crossPKPlayerDict = {}
PyGameData.g_crossPKZoneMatchPlayerDict = {}
+ PyGameData.g_crossPKZoneMatchRobotPlayerDict = {}
PyGameData.g_crossPKRoomDict = {}
+ PyGameData.g_crossPKTodayPKRecordInfo = {}
+ PyGameData.g_crossPKBesureMatchRobotInfo = {}
GameWorld.Log("跨服PK匹配状态开启，重置相关匹配数据!")
crossZoneName = GameWorld.GetCrossZoneName()
@@ -882,20 +887,25 @@
playerLV = playerInfoDict["playerLV"] # 职业
maxHP = playerInfoDict["maxHP"] # 职业
maxProDef = playerInfoDict["maxProDef"] # 护盾
- fightPower = playerInfoDict["fightPower"] # 战斗力
+ fightPower = min(playerInfoDict["fightPower"], ChConfig.Def_UpperLimit_DWord) # 战斗力，暂无用，限制不超过20E
realmLV = playerInfoDict["realmLV"] # 境界
pkScore = playerInfoDict["pkScore"] # 当前积分
danLV = playerInfoDict["danLV"] # 当前段位
cWinCount = playerInfoDict["cWinCount"] # 连胜次数
+ cLoseCount = playerInfoDict["cLoseCount"] # 连败次数
ondayScore = playerInfoDict["ondayScore"] # 过天时的积分
+ if playerID in PyGameData.g_crossPKZoneMatchRobotPlayerDict:
+ GameWorld.Log("玩家已匹配机器人，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 2], [serverGroupID])
+ return
zoneMatchPlayerList = PyGameData.g_crossPKZoneMatchPlayerDict.get(pkZoneID, [])
if playerID in zoneMatchPlayerList:
- GameWorld.Log("玩家正在匹配中，无法重复发起匹配！playerID=%s,accID=%s" % (playerID, accID))
+ GameWorld.Log("玩家正在匹配中，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 1], [serverGroupID])
return
if playerID in PyGameData.g_crossPKPlayerDict:
- GameWorld.Log("玩家正在战斗中，无法重复发起匹配！playerID=%s,accID=%s" % (playerID, accID))
+ GameWorld.Log("玩家正在战斗中，无法重复发起匹配! playerID=%s,accID=%s" % (playerID, accID))
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, -2], [serverGroupID])
return
@@ -917,16 +927,100 @@
pkPlayer.serverGroupID = serverGroupID
pkPlayer.pkZoneID = pkZoneID
pkPlayer.seasonID = seasonID
+
+ # 判断是否匹配机器人
+ matchRobotRate = 0
+ danIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)
+ if danIpyData:
+ matchRobotRate = danIpyData.GetMatchRobotRate() + danIpyData.GetMatchRobotRateEx() * cLoseCount
+
+ # 判断是否必定匹配机器人: 连输X局必定连续匹配机器人Y局
+ cLoseCount = 0
+ todayPKRecordList = PyGameData.g_crossPKTodayPKRecordInfo.get(playerID, [])
+ for pkRecord in todayPKRecordList[::-1]:
+ _, winnerID = pkRecord
+ if playerID == winnerID:
+ break
+ cLoseCount += 1
+ cLoseBesureMatchRobot, besureMatchRobotCount = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKRobot", 2)
+ if cLoseCount >= cLoseBesureMatchRobot:
+ PyGameData.g_crossPKBesureMatchRobotInfo[playerID] = besureMatchRobotCount
+ GameWorld.DebugLog("连输X局必定连续匹配机器人Y局! playerID=%s,cLoseCount(%s) >= X(%s),Y(%s)"
+ % (playerID, cLoseCount, cLoseBesureMatchRobot, besureMatchRobotCount))
+
+ matchRobotMaxRate = 100
+
+ # 还有必定匹配机器人次数
+ nowBesureMatchRobotCount = PyGameData.g_crossPKBesureMatchRobotInfo.get(playerID, 0)
+ if nowBesureMatchRobotCount > 0:
+ matchRobotRate = matchRobotMaxRate
+ PyGameData.g_crossPKBesureMatchRobotInfo[playerID] = nowBesureMatchRobotCount - 1
+ GameWorld.DebugLog("玩家必定匹配机器人! playerID=%s,nowBesureMatchRobotCount=%s" % (playerID, nowBesureMatchRobotCount))
+
+ if matchRobotRate and GameWorld.CanHappen(matchRobotRate, matchRobotMaxRate):
+ pkPlayer.notifyMatchRobotTick = tick + random.randint(3, 5) * 1000
+ PyGameData.g_crossPKZoneMatchRobotPlayerDict[playerID] = pkPlayer
+ GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s"
+ % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount))
+ GameWorld.DebugLog(" 本次匹配到机器人: danLV=%s,cLoseCount=%s,概率=%s" % (danLV, cLoseCount, matchRobotRate), playerID)
+ #这里优化下暂通知开始匹配，实际匹配到机器人做延迟通知
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 1], [serverGroupID])
+ return
+
PyGameData.g_crossPKPlayerDict[playerID] = pkPlayer
# 加入赛区匹配列表
zoneMatchPlayerList.append(playerID)
PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID] = zoneMatchPlayerList
- GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s,len(zoneMatchPlayerList)=%s"
- % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount, len(zoneMatchPlayerList)))
+ GameWorld.DebugLog("玩家加入匹配: seasonID=%s,pkZoneID=%s,serverGroupID=%s,accID=%s,playerID=%s,pkScore=%s,fightPower=%s,cWinCount=%s,cLoseCount=%s,概率=%s,len(zoneMatchPlayerList)=%s"
+ % (seasonID, pkZoneID, serverGroupID, accID, playerID, pkScore, fightPower, cWinCount, cLoseCount, matchRobotRate, len(zoneMatchPlayerList)))
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 1], [serverGroupID])
+ return
+
+def __DelayNotifyMatchRobot(tick):
+ ## 做体验，延迟通知匹配到机器人
+ for playerID, pkPlayer in PyGameData.g_crossPKZoneMatchRobotPlayerDict.items():
+ if pkPlayer.notifyMatchRobotTick == -1:
+ #GameWorld.DebugLog("已通知过玩家匹配到机器人", playerID)
+ continue
+ if tick < pkPlayer.notifyMatchRobotTick:
+ continue
+ pkPlayer.notifyMatchRobotTick = -1
+ serverGroupID = pkPlayer.serverGroupID
+ GameWorld.DebugLog("延迟通知玩家匹配到机器人: serverGroupID=%s" % (serverGroupID), playerID)
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 2], [serverGroupID])
+
+ return
+
+def __DoTimeOutPlayerMatchRobot(matchTickSortList, matchPlayerIDList, tick):
+ ## 超时很久很久的玩家系统匹配机器人
+ if not matchPlayerIDList:
+ return
+
+ matchRobotTimeoutInfo = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKRobot", 1)
+ if len(matchRobotTimeoutInfo) != 2:
+ return
+ matchRobotTick = random.randint(matchRobotTimeoutInfo[0], matchRobotTimeoutInfo[1]) * 1000 # 超时匹配机器人时间tick
+
+ for matchPlayer in matchTickSortList:
+
+ playerID = matchPlayer.playerID
+ if playerID not in matchPlayerIDList:
+ continue
+
+ if tick - matchPlayer.matchTick < matchRobotTick:
+ #GameWorld.DebugLog(" i=%s,玩家未满足超时匹配机器人时间条件！" % (i))
+ break
+
+ matchPlayerIDList.remove(playerID) # 这个列表为分区对应匹配中的玩家列表 PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID]
+
+ PyGameData.g_crossPKZoneMatchRobotPlayerDict[playerID] = matchPlayer
+ matchPlayer.notifyMatchRobotTick = -1
+ serverGroupID = matchPlayer.serverGroupID
+ GameWorld.DebugLog("直接通知超时玩家匹配到机器人: serverGroupID=%s" % (serverGroupID), playerID)
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKMatchReqRet, [playerID, 2], [serverGroupID])
return
def ClientServerMsg_PKCancel(playerInfoDict, tick):
@@ -988,6 +1082,9 @@
DR_CrossReamlPK("CancelRoom", dataDict)
break
+ if playerID in PyGameData.g_crossPKZoneMatchRobotPlayerDict:
+ PyGameData.g_crossPKZoneMatchRobotPlayerDict.pop(playerID)
+ GameWorld.DebugLog(" 从匹配机器人队列中移除！")
return
def ClientServerMsg_PKPrepareOK(playerInfoDict, tick):
@@ -1066,7 +1163,8 @@
return
#
-#def TestAddMatch(tick, addCount, maxDanLV=None, isClear=False):
+#def TestAddMatch(addCount, maxDanLV=None, isClear=False):
+# tick = GameWorld.GetGameWorld().GetTick()
# if isClear:
# PyGameData.g_crossPKPlayerDict = {}
# PyGameData.g_crossPKZoneMatchPlayerDict = {}
@@ -1129,6 +1227,8 @@
return
GameWorld.GetGameWorld().SetDict(processTickKey, tick)
+ # 延迟通知匹配到机器人的
+ __DelayNotifyMatchRobot(tick)
# 处理超时的房间
__DoCheckRoomTimeout(tick)
# 通知已准备好的房间玩家可进入跨服
@@ -1139,10 +1239,13 @@
# 每个赛区单独匹配
for pkZoneID, matchPlayerIDList in PyGameData.g_crossPKZoneMatchPlayerDict.items():
- matchPlayerCount = len(matchPlayerIDList)
- if matchPlayerCount < 2:
- #GameWorld.Log("匹配PK人数不足，不处理！pkZoneID=%s, 总人数:%s" % (pkZoneID, matchPlayerCount))
+ if not matchPlayerIDList:
+ #GameWorld.Log("没有玩家匹配PK，不处理！pkZoneID=%s" % (pkZoneID))
continue
+ matchPlayerCount = len(matchPlayerIDList)
+# if matchPlayerCount < 2:
+# #GameWorld.Log("匹配PK人数不足，不处理！pkZoneID=%s, 总人数:%s" % (pkZoneID, matchPlayerCount))
+# continue
GameWorld.DebugLog("★★★★★★★★★★开始跨服PK匹配(pkZoneID=%s, 总人数:%s)★★★★★★★★★★" % (pkZoneID, matchPlayerCount))
@@ -1153,16 +1256,16 @@
matchPlayerList.append(PyGameData.g_crossPKPlayerDict[matchPlayerID])
# 按匹配时间、积分升序排序
matchTickSortList = sorted(matchPlayerList, key=operator.attrgetter("matchTick"))
- scoreSortList = sorted(matchPlayerList, key=operator.attrgetter("pkScore"))
+ #scoreSortList = sorted(matchPlayerList, key=operator.attrgetter("pkScore")) # 新匹配规则暂时用不到积分排序的
matchPlayerVSList = [] # 成功匹配玩家对战列表
# 优先匹配等待超时玩家
- __DoMatch_OutTimePlayer(matchTickSortList, scoreSortList, outTimeTick, matchPlayerVSList, tick)
+ __DoMatchPlayer(matchTickSortList, matchPlayerVSList, maxGroupCnt, tick, outTimeTick)
if len(matchPlayerVSList) < maxGroupCnt:
# 再按积分段匹配玩家
- __DoMatch_DanScorePlayer(scoreSortList, maxGroupCnt, matchPlayerVSList)
+ __DoMatchPlayer(matchTickSortList, matchPlayerVSList, maxGroupCnt, tick)
# 给成功匹配的玩家非配对战房间
matchPlayerVSList = matchPlayerVSList[:maxGroupCnt]
@@ -1170,185 +1273,153 @@
GameWorld.DebugLog("==========匹配结束(总匹配队伍:%s)==========" % len(matchPlayerVSList))
#GameWorld.DebugLog("crossPlayerIDList=%s" % PyGameData.g_crossPKPlayerDict.keys())
#GameWorld.DebugLog("matchPlayerIDList=%s" % PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID])
+
+ __DoTimeOutPlayerMatchRobot(matchTickSortList, matchPlayerIDList, tick)
return
-
-def __DoMatch_OutTimePlayer(matchTickSortList, scoreSortList, outTimeTick, matchPlayerVSList, tick):
- '''匹配超时玩家
- 匹配中的玩家按积分排序，最后一个默认匹配上一个，第一个默认匹配下一个，其他匹配前后积分差绝对值较小的一个
+def __DoMatchPlayer(matchTickSortList, matchPlayerVSList, maxGroupCnt, tick, outTimeTick=0):
+ ''' 匹配玩家
+ @param matchTickSortList: 按匹配时间升序排序后的匹配玩家列表
+ @param maxGroupCnt: 最大匹配组数
+ @param matchPlayerVSList: 已经匹配的PK组列表
+ @param outTimeTick: 超时tick设定，0为匹配非超时玩家
'''
- GameWorld.DebugLog(" ==优先匹配超时等待玩家==最大等待时间:%s, tick=%s" % (outTimeTick, tick))
- GameWorld.DebugLog(" scoreSortListLen=%s" % len(scoreSortList))
- for i, matchPlayer in enumerate(matchTickSortList):
- # 只有一个玩家
- if len(scoreSortList) <= 1:
- #GameWorld.DebugLog(" 当前玩家数%s<=1，不再匹配！" % len(scoreSortList))
+
+ matchPlayerCount = 0
+ danPlayerListDict = {}
+ for matchPlayer in matchTickSortList:
+ if outTimeTick and tick - matchPlayer.matchTick < outTimeTick:
+ # 未超时，不再匹配，因为只有一个玩家
break
-
- if tick - matchPlayer.matchTick < outTimeTick:
- #GameWorld.DebugLog(" i=%s,玩家未超时，不再匹配！" % (i))
- break
-
- GameWorld.DebugLog(" i=%s,超时玩家, %s-%s=%s >= outTimeTick(%s)"
- % (i, tick, matchPlayer.matchTick, tick - matchPlayer.matchTick, outTimeTick))
- # 已经被匹配走了
- if matchPlayer not in scoreSortList:
- GameWorld.DebugLog(" 已经被匹配走了！")
- continue
-
- outTimeIndex = scoreSortList.index(matchPlayer)
- # 最后一个默认匹配上一个
- if outTimeIndex == len(scoreSortList) - 1:
- vsIndex = outTimeIndex - 1
- GameWorld.DebugLog(" 超时玩家积分排序索引%s,最后一个,默认匹配上一个索引%s！" % (outTimeIndex, vsIndex))
- # 第一个默认匹配下一个
- elif outTimeIndex == 0:
- vsIndex = outTimeIndex + 1
- GameWorld.DebugLog(" 超时玩家积分排序索引%s,第一个,默认匹配下一个索引%s！" % (outTimeIndex, vsIndex))
- # 其他情况匹配积分较近的一个
- else:
- preIndex = outTimeIndex - 1
- nextIndex = outTimeIndex + 1
- prePlayer = scoreSortList[preIndex]
- nextPlayer = scoreSortList[nextIndex]
- preDiff = abs(prePlayer.pkScore - matchPlayer.pkScore)
- nextDiff = abs(matchPlayer.pkScore - nextPlayer.pkScore)
- vsIndex = preIndex if preDiff <= nextDiff else nextIndex
- GameWorld.DebugLog(" 超时玩家积分排序索引-积分(%s-%s),上一个(%s-%s),下一个(%s-%s),preDiff=%s,nextDiff=%s,vsIndex=%s"
- % (outTimeIndex, matchPlayer.pkScore, preIndex, prePlayer.pkScore,
- nextIndex, nextPlayer.pkScore, preDiff, nextDiff, vsIndex))
-
- if outTimeIndex > vsIndex:
- scoreSortList.pop(outTimeIndex)
- vsPlayer = scoreSortList.pop(vsIndex)
- elif outTimeIndex < vsIndex:
- vsPlayer = scoreSortList.pop(vsIndex)
- scoreSortList.pop(outTimeIndex)
- else:
- continue
-
- # 加入成功匹配列表
- matchPlayerVSList.append([matchPlayer, vsPlayer])
-
- return
-
-def __DoMatch_DanScorePlayer(scoreSortList, maxGroupCnt, matchPlayerVSList):
- ''' 匹配积分分段玩家
- 匹配中的玩家按段位积分归组，归组后，随机段位顺序，每个段位组中的玩家随机两两PK
- '''
- GameWorld.DebugLog(" ==匹配积分分段玩家== maxGroupCnt=%s,scoreSortListLen=%s" % (maxGroupCnt, len(scoreSortList)))
- danPlayerListDict = {} # 按积分分段列表分散玩家
- for matchPlayer in scoreSortList:
danLV = matchPlayer.danLV
danPlayerList = danPlayerListDict.get(danLV, [])
danPlayerList.append(matchPlayer)
danPlayerListDict[danLV] = danPlayerList
+ matchPlayerCount += 1
- # 按分段玩家随机匹配
+ if outTimeTick:
+ GameWorld.DebugLog(" ==优先匹配超时等待玩家==最大等待时间:%s, matchPlayerCount=%s" % (outTimeTick, matchPlayerCount))
+ else:
+ GameWorld.DebugLog(" ==常规段位玩家== maxGroupCnt=%s,matchPlayerCount=%s" % (maxGroupCnt, matchPlayerCount))
+
+ if matchPlayerCount < 2:
+ #GameWorld.DebugLog(" 匹配玩家不足！不处理！matchPlayerCount=%s" % matchPlayerCount)
+ return
+
danList = danPlayerListDict.keys()
- random.shuffle(danList) # 打乱段位顺序
+ random.shuffle(danList) # 打乱段位处理顺序
- GameWorld.DebugLog(" 积分分段个数: %s, %s" % (len(danList), danList))
+ matchProtectRound = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch2", 1) # 几局内不能匹配到同一个玩家
+ matchDanDiffList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKMatch2", 2) # 初始匹配段位差|超时匹配段位差
+ matchDanDiff = matchDanDiffList[1] if outTimeTick else matchDanDiffList[0]
- # 优先匹配相同段位
- doCount = 0
- while len(matchPlayerVSList) < maxGroupCnt and doCount < maxGroupCnt:
- doCount += 1
- isMatchOK = False
-# # 日志输出分组明细
-# GameWorld.DebugLog(" -------------")
-# for danLV in danList:
-# strList = []
-# for player in danPlayerListDict[danLV]:
-# strList.append((player.playerID, player.pkScore, player.fightPower))
-# GameWorld.DebugLog(" 积分段组, danLV=%s, %s" % (danLV, str(strList)))
-# # -------------------------------
-
- for danLV in danList:
- danPlayerList = danPlayerListDict[danLV]
- danPlayerCount = len(danPlayerList)
- if danPlayerCount < 2:
- #GameWorld.DebugLog(" 段位人数少于2个，不处理！doCount=%s,danLV=%s" % (doCount, danLV))
+ #GameWorld.DebugLog(" 匹配玩家数=%s,同对手匹配保护局数=%s,匹配段位差=%s,danList=%s"
+ # % (matchPlayerCount, matchProtectRound, matchDanDiff, danList))
+
+ for danLV in danList:
+ danPlayerList = danPlayerListDict[danLV]
+ lowDanPlayerList, highDanPlayerList = [], [] # 相对danLV的高低段位玩家需要分开处理，如果一起处理的话可能导致匹配到不应该匹配到的段位
+ for vsDanLV in xrange(max(0, danLV - matchDanDiff), danLV + matchDanDiff + 1):
+ if danLV == vsDanLV:
continue
-
- vsIndexList = random.sample(xrange(danPlayerCount), 2) # 随机取两个索引对战
- vsIndexList.sort()
- aPlayer = danPlayerList.pop(vsIndexList[1])
- bPlayer = danPlayerList.pop(vsIndexList[0])
-
- matchPlayerVSList.append([aPlayer, bPlayer])
- isMatchOK = True
- GameWorld.DebugLog(" 成功匹配相同段位玩家: aPlayerID=%s,aDanLV=%s VS bPlayerID=%s,bDanLV=%s" % (aPlayer.playerID, aPlayer.danLV, bPlayer.playerID, bPlayer.danLV))
-
- if len(matchPlayerVSList) >= maxGroupCnt:
- GameWorld.DebugLog(" 已经达到最大匹配数! 已匹配对战数=%s, 不再匹配！doCount=%s" % (len(matchPlayerVSList), doCount))
- break
-
- if not isMatchOK:
- GameWorld.DebugLog(" 已经没有满足匹配条件的玩家! 不再匹配！doCount=%s" % (doCount))
- break
-
- # 不足再匹配范围段位
- doCount = 0
- while len(matchPlayerVSList) < maxGroupCnt and doCount < maxGroupCnt:
- doCount += 1
- isMatchOK = False
-# # 日志输出分组明细
-# GameWorld.DebugLog(" -------------")
-# for danLV in danList:
-# strList = []
-# for player in danPlayerListDict[danLV]:
-# strList.append((player.playerID, player.pkScore, player.fightPower))
-# GameWorld.DebugLog(" 积分段组, danLV=%s, %s" % (danLV, str(strList)))
-# # -------------------------------
-
- for danLV in danList:
- danMatchRange = []
- danMatchPlayerList = []
- danIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)
- matchDanRange = [] if not danIpyData else danIpyData.GetMatchRange()
- if matchDanRange and len(matchDanRange) == 2:
- danMatchRange = range(matchDanRange[0], matchDanRange[1] + 1)
-
- if danLV not in danMatchRange:
- danMatchRange.append(danLV)
-
- for matchDanLV in danMatchRange:
- if matchDanLV not in danPlayerListDict:
- continue
- danMatchPlayerList += danPlayerListDict[matchDanLV]
-
- #matchPlayerIDList = [matchPlayer.playerID for matchPlayer in danMatchPlayerList]
- #GameWorld.DebugLog("danLV=%s,danMatchRange=%s,matchPlayerIDList=%s" % (danLV, danMatchRange, matchPlayerIDList))
- matchPlayerCount = len(danMatchPlayerList)
- if matchPlayerCount < 2:
- #GameWorld.DebugLog(" 段位范围人数少于2个，不处理！doCount=%s,danLV=%s,danMatchRange=%s" % (doCount, danLV, danMatchRange))
+ if vsDanLV not in danPlayerListDict:
continue
-
- vsIndexList = random.sample(xrange(matchPlayerCount), 2) # 随机取两个索引对战
- aPlayer, bPlayer = danMatchPlayerList[vsIndexList[0]], danMatchPlayerList[vsIndexList[1]]
-
- aDanPlayerList = danPlayerListDict.get(aPlayer.danLV, [])
- bDanPlayerList = danPlayerListDict.get(bPlayer.danLV, [])
- if aPlayer in aDanPlayerList and bPlayer in bDanPlayerList:
- aDanPlayerList.remove(aPlayer)
- bDanPlayerList.remove(bPlayer)
+ if vsDanLV < danLV:
+ lowDanPlayerList += danPlayerListDict[vsDanLV]
else:
+ highDanPlayerList += danPlayerListDict[vsDanLV]
+
+ #GameWorld.DebugLog(" danLV=%s,danPlayerCount=%s,lowPlayerCount=%s,highPlayerCount=%s"
+ # % (danLV, len(danPlayerList), len(lowDanPlayerList), len(highDanPlayerList)))
+
+ # 非超时的，优先匹配同段位玩家
+ if not outTimeTick:
+ __MatchDanPlayerList(matchTickSortList, matchPlayerVSList, danPlayerList, danPlayerListDict, matchProtectRound, maxGroupCnt)
+
+ # 分别匹配低段位、高段位
+ __MatchDanPlayerList(matchTickSortList, matchPlayerVSList, danPlayerList + lowDanPlayerList, danPlayerListDict, matchProtectRound, maxGroupCnt)
+ __MatchDanPlayerList(matchTickSortList, matchPlayerVSList, danPlayerList + highDanPlayerList, danPlayerListDict, matchProtectRound, maxGroupCnt)
+
+ return
+
+def __MatchDanPlayerList(matchTickSortList, matchPlayerVSList, matchPlayerList, danPlayerListDict, matchProtectRound, maxGroupCnt):
+ ## 执行匹配段位玩家列表
+
+ matchPlayerCount = len(matchPlayerList)
+ if matchPlayerCount < 2:
+ return
+ random.shuffle(matchPlayerList) # 打乱匹配顺序，相当于随机两两分组，然后下面直接按顺序处理即可
+ #GameWorld.DebugLog(" 总未匹配人数=%s,已匹配组数=%s,待匹配人数=%s" % (len(matchTickSortList), len(matchPlayerVSList), len(matchPlayerList)))
+ #for i, mPlayer in enumerate(matchPlayerList):
+ # GameWorld.DebugLog(" i=%s,playerID=%s,danLV=%s" % (i, mPlayer.playerID, mPlayer.danLV))
+ #maxGroupCnt = 99999 # 测试批量匹配用
+
+ nextIndex = 0
+ doCount = matchPlayerCount
+ # 至少需要两个 且 未达到最大成功匹配组数 且 限制最大可循环次数大于0
+ while nextIndex < len(matchPlayerList) - 1 and len(matchPlayerVSList) < maxGroupCnt and doCount > 0:
+ doCount -= 1
+ i = nextIndex
+ aPlayer = matchPlayerList[i]
+ nextIndex += 1
+
+ aPlayerID = aPlayer.playerID
+ aDanLV = aPlayer.danLV
+ #if maxGroupCnt == 99999 and random.randint(1, 10) > 5:
+ # GameWorld.DebugLog(" i=%s,aPlayerID=%s,aDanLV=%s 测试随机不匹配" % (i, aPlayerID, aDanLV))
+ # continue
+ if aPlayer not in matchTickSortList:
+ #GameWorld.DebugLog(" i=%s,aPlayerID=%s,aDanLV=%s 已经被匹配走了" % (i, aPlayerID, aDanLV))
+ continue
+ aTodayPKRecordList = PyGameData.g_crossPKTodayPKRecordInfo.get(aPlayerID, [])
+ aMatchProtectPlayerIDList = [pkRecord[0] for pkRecord in aTodayPKRecordList[:-matchProtectRound - 1:-1]] # 最近X局匹配的玩家ID
+ #GameWorld.DebugLog(" i=%s,aPlayerID=%s,aMatchProtectPlayerIDList=%s" % (i, aPlayerID, aMatchProtectPlayerIDList))
+
+ isMatchOK = False
+ for j, bPlayer in enumerate(matchPlayerList[nextIndex:], nextIndex):
+ bPlayerID = bPlayer.playerID
+ bDanLV = bPlayer.danLV
+ #if maxGroupCnt == 99999 and random.randint(1, 10) > 5:
+ # GameWorld.DebugLog(" j=%s,bPlayerID=%s,bDanLV=%s 测试随机不匹配" % (j, bPlayerID, bDanLV))
+ # continue
+ if bPlayer not in matchTickSortList:
+ #GameWorld.DebugLog(" j=%s,bPlayerID=%s,bDanLV=%s 已经被匹配走了" % (j, bPlayerID, bDanLV))
+ continue
+ if bPlayerID in aMatchProtectPlayerIDList:
+ GameWorld.DebugLog(" j=%s,bPlayerID=%s,bDanLV=%s %s局内不匹配同对手! bPlayerID=%s in aMatchProtectPlayerIDList=%s"
+ % (j, bPlayerID, bDanLV, matchProtectRound, bPlayerID, aMatchProtectPlayerIDList))
continue
- matchPlayerVSList.append([aPlayer, bPlayer])
+ bTodayPKRecordList = PyGameData.g_crossPKTodayPKRecordInfo.get(bPlayerID, [])
+ bMatchProtectPlayerIDList = [pkRecord[0] for pkRecord in bTodayPKRecordList[:-matchProtectRound - 1:-1]] # 最近X局匹配的玩家ID
+ if aPlayerID in bMatchProtectPlayerIDList:
+ GameWorld.DebugLog(" j=%s,bPlayerID=%s,bDanLV=%s %s局内不匹配同对手! aPlayerID=%s in bMatchProtectPlayerIDList=%s"
+ % (j, bPlayerID, bDanLV, matchProtectRound, aPlayerID, bMatchProtectPlayerIDList))
+ continue
+
+ matchTickSortList.remove(aPlayer)
+ matchTickSortList.remove(bPlayer)
+
+ matchPlayerList.remove(aPlayer)
+ matchPlayerList.remove(bPlayer)
+
+ aDanPlayerList = danPlayerListDict.get(aDanLV, [])
+ if aPlayer in aDanPlayerList:
+ aDanPlayerList.remove(aPlayer)
+ bDanPlayerList = danPlayerListDict.get(bDanLV, [])
+ if bPlayer in bDanPlayerList:
+ bDanPlayerList.remove(bPlayer)
+
+ # 加入成功匹配列表
isMatchOK = True
- GameWorld.DebugLog(" 成功匹配范围段位玩家: aPlayerID=%s,aDanLV=%s VS bPlayerID=%s,bDanLV=%s | danLV=%s,danMatchRange=%s"
- % (aPlayer.playerID, aPlayer.danLV, bPlayer.playerID, bPlayer.danLV, danLV, danMatchRange))
-
- if len(matchPlayerVSList) >= maxGroupCnt:
- GameWorld.DebugLog(" 已经达到最大匹配数! 已匹配对战数=%s, 不再匹配！doCount=%s" % (len(matchPlayerVSList), doCount))
- break
-
- if not isMatchOK:
- GameWorld.DebugLog(" 已经没有满足匹配条件的玩家! 不再匹配! doCount=%s" % (doCount))
+ matchPlayerVSList.append([aPlayer, bPlayer])
+ GameWorld.DebugLog(" i=%s,j=%s,aPlayerID=%s(danLV:%s) VS bPlayerID=%s(danLV:%s) 匹配成功!"
+ % (i, j, aPlayerID, aDanLV, bPlayerID, bDanLV))
break
+ if isMatchOK:
+ nextIndex -= 1
+
return
def __DoSetVSRoom(pkZoneID, matchPlayerVSList, tick):
@@ -1559,6 +1630,18 @@
# 更新排行榜
UpdateCrossPKBillboard(zoneID, seasonID, winner, loser)
+ # 更新今日PK记录
+ if winnerID not in PyGameData.g_crossPKTodayPKRecordInfo:
+ PyGameData.g_crossPKTodayPKRecordInfo[winnerID] = []
+ winnerPKRecordList = PyGameData.g_crossPKTodayPKRecordInfo[winnerID]
+ winnerPKRecordList.append([loserID, winnerID])
+
+ if loserID not in PyGameData.g_crossPKTodayPKRecordInfo:
+ PyGameData.g_crossPKTodayPKRecordInfo[loserID] = []
+ loserPKRecordList = PyGameData.g_crossPKTodayPKRecordInfo[loserID]
+ loserPKRecordList.append([winnerID, winnerID])
+ #GameWorld.DebugLog("PyGameData.g_crossPKTodayPKRecordInfo=%s" % PyGameData.g_crossPKTodayPKRecordInfo)
+
timeStr = GameWorld.GetCurrentDataTimeStr()
playerOverDict = {}
# 通知客户端战斗结果
@@ -1605,6 +1688,113 @@
dataDict = {"roundWinnerIDList":roundWinnerIDList, "overType":overType, "winner":winner.GetDRInfo(), "loser":loser.GetDRInfo()}
dataDict.update(vsRoom.GetDRInfo())
DR_CrossReamlPK("PKOverRoom", dataDict)
+ return
+
+def UpdatePKPlayerScore(roomID, pkPlayer, isWin):
+ ## 更新PK玩家积分
+
+ playerID = pkPlayer.playerID
+ cWinCount = pkPlayer.cWinCount
+ pkScore = pkPlayer.pkScore
+ danLV = pkPlayer.danLV
+ dayScore = max(0, pkScore - pkPlayer.ondayScore)# 今日已获得积分，正积分
+
+ GameWorld.DebugLog("roomID=%s,playerID=%s,isWin=%s,dayScore=%s,pkScore=%s,danLV=%s,cWinCount=%s"
+ % (roomID, playerID, isWin, dayScore, pkScore, danLV, cWinCount))
+
+ pkDanIpyData = IpyGameDataPY.GetIpyGameData("CrossRealmPKDan", danLV)
+ if not pkDanIpyData:
+ GameWorld.ErrLog("跨服PK房间段位数据异常! roomID=%s,playerID=%s,danLV=%s" % (roomID, playerID, danLV))
+
+ baseScoreList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKScore", 2) # 胜负保底分
+ wBaseScore = baseScoreList[0] if len(baseScoreList) > 0 else 0
+ lBaseScore = baseScoreList[1] if len(baseScoreList) > 1 else 0
+ wExScore = eval(IpyGameDataPY.GetFuncCompileCfg("CrossRealmPKScore", 3)) # 胜方附加分
+ lExScore = 0
+
+ if isWin:
+ addScore = wBaseScore + wExScore
+ pkPlayer.cWinCount += 1
+ else:
+ addScore = lBaseScore + lExScore
+ pkPlayer.cWinCount = 0
+
+ dayMaxScore = IpyGameDataPY.GetFuncCfg("CrossRealmPKScore", 1) # 每日获得积分上限，0为不限制
+ if dayMaxScore and addScore:
+ addScore = min(dayMaxScore - dayScore, addScore)
+ pkPlayer.pkScore += addScore
+
+ if pkDanIpyData and pkDanIpyData.GetLVUpScore() and pkPlayer.pkScore >= pkDanIpyData.GetLVUpScore():
+ pkPlayer.danLV += 1
+
+ return addScore
+
+def ClientServerMsg_PKRobotOver(serverGroupID, playerInfoDict, tick):
+ ## 收到子服同步的PK机器人结算
+
+ if not GameWorld.IsCrossServer():
+ GameWorld.ErrLog("非跨服服务器不处理跨服PK匹配请求！")
+ return
+
+ playerID = playerInfoDict["playerID"] # 角色ID
+ isWinner = playerInfoDict["isWinner"] # 是否获胜
+
+ if playerID not in PyGameData.g_crossPKZoneMatchRobotPlayerDict:
+ GameWorld.DebugLog("玩家没有匹配到机器人，无法结算PK机器人奖励!", playerID)
+ return
+ pkPlayer = PyGameData.g_crossPKZoneMatchRobotPlayerDict.pop(playerID)
+ if playerID in PyGameData.g_crossPKPlayerDict:
+ PyGameData.g_crossPKPlayerDict.pop(playerID)
+ zoneID = pkPlayer.pkZoneID
+ seasonID = pkPlayer.seasonID
+
+ GameWorld.Log("机器人跨服PK结算: isWinner=%s,zoneID=%s,seasonID=%s,pkScore=%s,danLV=%s,cWinCount=%s"
+ % (isWinner, zoneID, seasonID, pkPlayer.pkScore, pkPlayer.danLV, pkPlayer.cWinCount), playerID)
+
+ roomID = 0
+ addScore = UpdatePKPlayerScore(roomID, pkPlayer, isWinner)
+ pkScore = pkPlayer.pkScore
+ danLV = pkPlayer.danLV
+ cWinCount = pkPlayer.cWinCount
+
+ GameWorld.Log(" 更新: addScore=%s,pkScore=%s,danLV=%s,cWinCount=%s" % (addScore, pkScore, danLV, cWinCount), playerID)
+
+ if isWinner:
+ winner, loser = pkPlayer, None
+ else:
+ winner, loser = None, pkPlayer
+
+ # 更新排行榜
+ UpdateCrossPKBillboard(zoneID, seasonID, winner, loser)
+
+ # PK机器人默认结果数据
+ overType = 0
+ roundWinnerIDList = []
+ notifyState = False
+ winnerID = winner.playerID if winner else 0
+ tagPlayerID = 0
+ tagPlayerName = ""
+
+ timeStr = GameWorld.GetCurrentDataTimeStr()
+ playerOverDict = {}
+ playerOverDict[playerID] = [roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList] \
+ + [serverGroupID, pkScore, danLV, cWinCount, addScore, tagPlayerID, tagPlayerName, notifyState]
+
+ serverGroupIDList = [pkPlayer.serverGroupID]
+ GameWorld.DebugLog("同步子服战斗结果: seasonID=%s,timeStr=%s,roomID=%s,overType=%s,winnerID=%s,roundWinnerIDList=%s"
+ % (seasonID, timeStr, roomID, overType, winnerID, roundWinnerIDList))
+ # 同步子服
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKOverInfo, playerOverDict, serverGroupIDList)
+
+ if playerID not in PyGameData.g_crossPKTodayPKRecordInfo:
+ PyGameData.g_crossPKTodayPKRecordInfo[playerID] = []
+ pkRecordList = PyGameData.g_crossPKTodayPKRecordInfo[playerID]
+ pkRecordList.append([0, winnerID])
+ #GameWorld.DebugLog("PyGameData.g_crossPKTodayPKRecordInfo=%s" % PyGameData.g_crossPKTodayPKRecordInfo)
+
+ # 记录流向
+ dataDict = {"zoneID":zoneID, "seasonID":seasonID, "pkPlayer":pkPlayer.GetDRInfo()}
+ DR_CrossReamlPK("PKOverRobot", dataDict)
return
##================================== 以下是子服逻辑 ==========================================
@@ -1721,14 +1911,23 @@
if not curPlayer:
return
+ if not result:
+ return
+
if result == -2:
PlayerControl.NotifyCode(curPlayer, "CrossMatching17")
return
+ startMatchPack = ChPyNetSendPack.tagGCCrossRealmPKStartMatch()
+
if result == 1:
SetIsCrossPKMatching(curPlayer, 1)
- NetPackCommon.SendFakePack(curPlayer, ChPyNetSendPack.tagGCCrossRealmPKStartMatch())
+ startMatchPack.IsRobot = 0
+ elif result == 2:
+ SetIsCrossPKMatching(curPlayer, 0)
+ startMatchPack.IsRobot = 1
+ NetPackCommon.SendFakePack(curPlayer, startMatchPack)
return
## 跨服匹配状态
@@ -1808,7 +2007,8 @@
matchPlayer.NameLen = len(matchPlayer.PlayerName)
matchPlayer.Job = readyPlayerInfo["Job"]
matchPlayer.LV = readyPlayerInfo["LV"]
- matchPlayer.MaxHP = readyPlayerInfo["MaxHP"]
+ matchPlayer.MaxHP = readyPlayerInfo["MaxHP"] % ShareDefine.Def_PerPointValue
+ matchPlayer.MaxHPEx = readyPlayerInfo["MaxHP"] / ShareDefine.Def_PerPointValue
matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]
break
@@ -1881,7 +2081,7 @@
cnt += 1
savaData += overInfoData.getBuffer()
- GameWorld.Log("SaveDBCrossPKUnNotifyOverInfo cnt :%s" % cnt)
+ GameWorld.Log("SaveDBCrossPKUnNotifyOverInfo cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -1912,6 +2112,8 @@
sendMapOverInfo = [roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList, pkScore, danLV, cWinCount, addScore, tagPlayerID, tagPlayerName, notifyState]
player = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if not player:
+ CrossRealmPlayer.DoOfflinePlayerExitCrossServer(playerID)
if not player or PlayerControl.GetIsTJG(player):
GameWorld.DebugLog(" 玩家不在线 或脱机中，先缓存，玩家上线后再同步，playerID=%s" % (playerID))
overInfoData = PyGameDataStruct.tagDBCrossPKUnNotifyOverInfo()
@@ -1923,7 +2125,7 @@
overInfoData.OverType = overType
overInfoData.PlayerID = playerID
overInfoData.WinnerID = winnerID
- overInfoData.RoundWinnerInfo = cPickle.dumps(roundWinnerIDList, 2)
+ overInfoData.RoundWinnerInfo = str(roundWinnerIDList)
overInfoData.RoundWinnerLen = len(overInfoData.RoundWinnerInfo)
overInfoData.PKScore = pkScore
overInfoData.DanLV = danLV
@@ -1958,7 +2160,7 @@
winnerID = overInfoData.WinnerID
roundWinnerIDList = []
try:
- roundWinnerIDList = cPickle.loads(overInfoData.RoundWinnerInfo)
+ roundWinnerIDList = eval(overInfoData.RoundWinnerInfo)
except:
GameWorld.ErrLog("__OnLoginNotifyPKOverInfo roundWinnerIDList eval error! RoundWinnerInfo=%s" % overInfoData.RoundWinnerInfo, playerID)
pkScore = overInfoData.PKScore
--
Gitblit v1.8.0