From ea35a6c42253a7b8fce96f998db74de0920d74ee Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 04 一月 2019 17:58:15 +0800
Subject: [PATCH] 860312 任务增加输出
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 301 insertions(+), 31 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index f560d96..1a90d0e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -18,6 +18,7 @@
import GameWorld
import PlayerControl
import CrossRealmMsg
+import DataRecordPack
import ChPyNetSendPack
import CrossRealmPlayer
import PyGameDataStruct
@@ -45,17 +46,25 @@
self.playerJob = 0
self.playerLV = 0
self.maxHP = 0
+ self.maxProDef = 0
self.fightPower = 0
self.realmLV = 0
self.pkScore = 0
self.danLV = 0
self.matchTick = 0
+ self.prepareOKTick = 0
self.cWinCount = 0 # 连胜次数
self.ondayScore = 0 # 过天时的积分
self.serverGroupID = 0 # 所属服务器ID，一个服务器ID由多个服组成
self.pkZoneID = 0 # 所属赛区ID，一个赛区由多个服务器ID组成
self.seasonID = 0 # 赛季ID
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,
+ "ondayScore":self.ondayScore, "serverGroupID":self.serverGroupID, "ondayScore":self.ondayScore}
class CrossPKRoom():
## 跨服PK房间类
@@ -70,9 +79,13 @@
self.roomState = ShareDefine.Def_VsRoom_State_WaitPlayer # 默认状态
self.roomPlayerIDList = [] # 对战玩家ID列表
self.readyPlayerIDList = [] # 已经准备好的玩家ID列表
- self.isMapOpen = False # 地图是否已经开启该房间，未开启的房间超时后，本次匹配视为无效，有玩家进地图才会开启副本分线
+ self.mapFBOpenTick = 0 # 地图开启该房间tick，未开启的房间超时后，本次匹配视为无效，有玩家进地图才会开启副本分线
return
+ def GetDRInfo(self):
+ 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排行榜管理，注意该类只处理数据逻辑，功能相关逻辑不要写在该类，不然重读脚本不会生效
class CrossPKBillboardManager(object):
@@ -644,8 +657,16 @@
return
gameWorld = GameWorld.GetGameWorld()
+ preState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)
gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK, isOpen)
-
+
+ # 匹配状态从关闭到开启
+ if not preState and isOpen:
+ PyGameData.g_crossPKPlayerDict = {}
+ PyGameData.g_crossPKZoneMatchPlayerDict = {}
+ PyGameData.g_crossPKRoomDict = {}
+ GameWorld.Log("跨服PK匹配状态开启，重置相关匹配数据!")
+
ipyDataMgr = IpyGameDataPY.IPY_Data()
for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):
zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)
@@ -830,6 +851,7 @@
job = playerInfoDict["playerJob"] # 职业
playerLV = playerInfoDict["playerLV"] # 职业
maxHP = playerInfoDict["maxHP"] # 职业
+ maxProDef = playerInfoDict["maxProDef"] # 护盾
fightPower = playerInfoDict["fightPower"] # 战斗力
realmLV = playerInfoDict["realmLV"] # 境界
pkScore = playerInfoDict["pkScore"] # 当前积分
@@ -854,6 +876,7 @@
pkPlayer.playerJob = job
pkPlayer.playerLV = playerLV
pkPlayer.maxHP = maxHP
+ pkPlayer.maxProDef = maxProDef
pkPlayer.pkScore = pkScore
pkPlayer.danLV = danLV
pkPlayer.fightPower = fightPower
@@ -893,7 +916,7 @@
vsRoomID = playerInfoDict["vsRoomID"] # 所属对战房间ID
if vsRoomID in PyGameData.g_crossPKRoomDict:
pkRoom = PyGameData.g_crossPKRoomDict[vsRoomID]
- if pkRoom.isMapOpen or pkRoom.readyTick:
+ if pkRoom.mapFBOpenTick or pkRoom.readyTick:
GameWorld.Log("跨服对战房间已经开启了线路，或者双方数据都已传输完毕，不可再取消匹配！vsRoomID=%s" % vsRoomID)
return
@@ -928,6 +951,11 @@
PyGameData.g_crossPKRoomDict.pop(roomID)
GameWorld.Log(" 移除房间: popRoomID=%s" % (roomID))
+
+ # 记录流向
+ dataDict = {"cancelPlayerID":playerID}
+ dataDict.update(pkRoom.GetDRInfo())
+ DR_CrossReamlPK("CancelRoom", dataDict)
break
return
@@ -945,8 +973,9 @@
if playerID not in PyGameData.g_crossPKPlayerDict:
GameWorld.ErrLog("玩家跨服对战数据准备OK, 但找不到该对战玩家信息！vsRoomID=%s,playerID=%s" % (vsRoomID, playerID))
return
- #pkPlayer = PyGameData.g_crossPKPlayerDict[playerID]
-
+ pkPlayer = PyGameData.g_crossPKPlayerDict[playerID]
+ pkPlayer.prepareOKTick = tick
+
if vsRoomID not in PyGameData.g_crossPKRoomDict:
GameWorld.ErrLog("玩家跨服对战数据准备OK, 但找不到该对战房间(%s)！可能对手已取消！" % vsRoomID)
return
@@ -981,15 +1010,15 @@
isAllReady = True
roomGroupIDList = []
readyMemberDict = {} # 已准备好的玩家信息
- for roomPlayerID in vsRoom.roomPlayerIDList:
+ for num, roomPlayerID in enumerate(vsRoom.roomPlayerIDList, 1):
if roomPlayerID not in vsRoom.readyPlayerIDList or roomPlayerID not in PyGameData.g_crossPKPlayerDict:
isAllReady = False
break
roomPlayer = PyGameData.g_crossPKPlayerDict[roomPlayerID]
pkZoneID = roomPlayer.pkZoneID
roomGroupIDList.append(roomPlayer.serverGroupID)
- readyMemberDict[roomPlayerID] = {"ServerGroupID":roomPlayer.serverGroupID, "Name":roomPlayer.playerName,
- "Job":roomPlayer.playerJob, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP}
+ readyMemberDict[roomPlayerID] = {"ServerGroupID":roomPlayer.serverGroupID, "Name":roomPlayer.playerName, "Number":num,
+ "Job":roomPlayer.playerJob, "LV":roomPlayer.playerLV, "MaxHP":roomPlayer.maxHP, "MaxProDef":roomPlayer.maxProDef}
if not isAllReady:
continue
@@ -1006,6 +1035,45 @@
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKReadyOKRoomList, sendReadyOKRoomList, serverGroupIDList)
return
+#
+#def TestAddMatch(tick, addCount, maxDanLV=None, isClear=False):
+# if isClear:
+# PyGameData.g_crossPKPlayerDict = {}
+# PyGameData.g_crossPKZoneMatchPlayerDict = {}
+# PyGameData.g_crossPKRoomDict = {}
+# PyGameData.g_crossPKRoomID = 0
+#
+# ipyDataMgr = IpyGameDataPY.IPY_Data()
+# if maxDanLV == None:
+# maxDanLV = ipyDataMgr.GetCrossRealmPKDanCount() - 1
+# for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):
+# zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)
+# pkZoneID = zoneIpyData.GetZoneID()
+#
+# addPlayerList = []
+# zoneMatchPlayerList = PyGameData.g_crossPKZoneMatchPlayerDict.get(pkZoneID, [])
+# maxPlayerID = pkZoneID * 1000 if not zoneMatchPlayerList else max(zoneMatchPlayerList)
+# for i in xrange(1, addCount + 1):
+# playerID = maxPlayerID + i
+#
+# pkPlayer = CrossPKPlayer()
+# pkPlayer.playerID = playerID
+# danLV = random.randint(0, maxDanLV)
+# pkPlayer.danLV = danLV
+# pkPlayer.matchTick = tick
+# pkPlayer.pkScore = danLV * 1000 + random.randint(0, 999)
+# pkPlayer.pkZoneID = pkZoneID
+# pkPlayer.seasonID = 1
+#
+# PyGameData.g_crossPKPlayerDict[playerID] = pkPlayer
+# addPlayerList.append([playerID, danLV])
+# # 加入赛区匹配列表
+# zoneMatchPlayerList.append(playerID)
+# PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID] = zoneMatchPlayerList
+# GameWorld.Log("Add zoneID=%s,addPlayerList=%s" % (pkZoneID, addPlayerList))
+#
+# #GameWorld.Log("PyGameData.g_crossPKPlayerDict=%s" % PyGameData.g_crossPKPlayerDict)
+# return
def OnPKMatchProcess(tick):
## 玩家跨服PK匹配定时处理逻辑
@@ -1067,6 +1135,8 @@
matchPlayerVSList = matchPlayerVSList[:maxGroupCnt]
__DoSetVSRoom(pkZoneID, matchPlayerVSList, tick)
GameWorld.Log("==========匹配结束(总匹配队伍:%s)==========" % len(matchPlayerVSList))
+ #GameWorld.Log("crossPlayerIDList=%s" % PyGameData.g_crossPKPlayerDict.keys())
+ #GameWorld.Log("matchPlayerIDList=%s" % PyGameData.g_crossPKZoneMatchPlayerDict[pkZoneID])
return
@@ -1079,11 +1149,11 @@
for i, matchPlayer in enumerate(matchTickSortList):
# 只有一个玩家
if len(scoreSortList) <= 1:
- GameWorld.Log(" 当前玩家数%s<=1，不再匹配！" % len(scoreSortList))
+ #GameWorld.Log(" 当前玩家数%s<=1，不再匹配！" % len(scoreSortList))
break
if tick - matchPlayer.matchTick < outTimeTick:
- GameWorld.Log(" i=%s,玩家未超时，不再匹配！" % (i))
+ #GameWorld.Log(" i=%s,玩家未超时，不再匹配！" % (i))
break
GameWorld.Log(" i=%s,超时玩家, %s-%s=%s >= outTimeTick(%s)"
@@ -1147,22 +1217,25 @@
GameWorld.Log(" 积分分段个数: %s, %s" % (len(danList), danList))
- # 日志输出分组明细
- for danLV in danList:
- strList = []
- for player in danPlayerListDict[danLV]:
- strList.append((player.playerID, player.pkScore, player.fightPower))
- GameWorld.Log(" 积分段组, danLV=%s, %s" % (danLV, str(strList)))
-
+ # 优先匹配相同段位
doCount = 0
while len(matchPlayerVSList) < maxGroupCnt and doCount < maxGroupCnt:
doCount += 1
isMatchOK = False
+# # 日志输出分组明细
+# GameWorld.Log(" -------------")
+# for danLV in danList:
+# strList = []
+# for player in danPlayerListDict[danLV]:
+# strList.append((player.playerID, player.pkScore, player.fightPower))
+# GameWorld.Log(" 积分段组, danLV=%s, %s" % (danLV, str(strList)))
+# # -------------------------------
+
for danLV in danList:
danPlayerList = danPlayerListDict[danLV]
danPlayerCount = len(danPlayerList)
if danPlayerCount < 2:
- GameWorld.Log(" 段位人数少于2个，此段位本轮轮空！doCount=%s,danLV=%s" % (doCount, danLV))
+ #GameWorld.Log(" 段位人数少于2个，不处理！doCount=%s,danLV=%s" % (doCount, danLV))
continue
vsIndexList = random.sample(xrange(danPlayerCount), 2) # 随机取两个索引对战
@@ -1172,8 +1245,7 @@
matchPlayerVSList.append([aPlayer, bPlayer])
isMatchOK = True
- GameWorld.Log(" 成功匹配玩家: aPlayerID=%s,aScore=%s,aFP=%s VS bPlayerID=%s,bScore=%s,bFP=%s"
- % (aPlayer.playerID, aPlayer.pkScore, aPlayer.fightPower, bPlayer.playerID, bPlayer.pkScore, bPlayer.fightPower))
+ GameWorld.Log(" 成功匹配相同段位玩家: aPlayerID=%s,aDanLV=%s VS bPlayerID=%s,bDanLV=%s" % (aPlayer.playerID, aPlayer.danLV, bPlayer.playerID, bPlayer.danLV))
if len(matchPlayerVSList) >= maxGroupCnt:
GameWorld.Log(" 已经达到最大匹配数! 已匹配对战数=%s, 不再匹配！doCount=%s" % (len(matchPlayerVSList), doCount))
@@ -1181,6 +1253,67 @@
if not isMatchOK:
GameWorld.Log(" 已经没有满足匹配条件的玩家! 不再匹配！doCount=%s" % (doCount))
+ break
+
+ # 不足再匹配范围段位
+ doCount = 0
+ while len(matchPlayerVSList) < maxGroupCnt and doCount < maxGroupCnt:
+ doCount += 1
+ isMatchOK = False
+# # 日志输出分组明细
+# GameWorld.Log(" -------------")
+# for danLV in danList:
+# strList = []
+# for player in danPlayerListDict[danLV]:
+# strList.append((player.playerID, player.pkScore, player.fightPower))
+# GameWorld.Log(" 积分段组, 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.Log("danLV=%s,danMatchRange=%s,matchPlayerIDList=%s" % (danLV, danMatchRange, matchPlayerIDList))
+ matchPlayerCount = len(danMatchPlayerList)
+ if matchPlayerCount < 2:
+ #GameWorld.Log(" 段位范围人数少于2个，不处理！doCount=%s,danLV=%s,danMatchRange=%s" % (doCount, danLV, danMatchRange))
+ 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)
+ else:
+ continue
+
+ matchPlayerVSList.append([aPlayer, bPlayer])
+ isMatchOK = True
+ GameWorld.Log(" 成功匹配范围段位玩家: 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.Log(" 已经达到最大匹配数! 已匹配对战数=%s, 不再匹配！doCount=%s" % (len(matchPlayerVSList), doCount))
+ break
+
+ if not isMatchOK:
+ GameWorld.Log(" 已经没有满足匹配条件的玩家! 不再匹配! doCount=%s" % (doCount))
break
return
@@ -1227,6 +1360,11 @@
GameWorld.Log(" 开房:pkZoneID=%s,mapID=%s,roomID=%s,aPlayerID=%s,bPlayerID=%s" % (pkZoneID, mapID, roomID, aPlayerID, bPlayerID))
vsRoomDict[roomID] = [mapID, [[aServerGroupID, aPlayerID], [bServerGroupID, bPlayerID]]]
+ # 记录流向
+ dataDict = {"aPlayer":aPlayer.GetDRInfo(), "bPlayer":bPlayer.GetDRInfo()}
+ dataDict.update(newRoom.GetDRInfo())
+ DR_CrossReamlPK("OpenRoom", dataDict)
+
serverGroupIDList.append(aServerGroupID)
serverGroupIDList.append(bServerGroupID)
@@ -1261,7 +1399,7 @@
serverGroupIDList = []
roomTimeout = IpyGameDataPY.GetFuncCfg("CrossRealmPKCfg", 2) * 1000 # 这个时间尽量长点，目前暂时不确定玩家从准备到进入到地图的时长
for roomID, pkRoom in PyGameData.g_crossPKRoomDict.items():
- if pkRoom.isMapOpen or not pkRoom.readyTick:
+ if pkRoom.mapFBOpenTick or not pkRoom.readyTick:
continue
if tick - pkRoom.readyTick <= roomTimeout:
continue
@@ -1280,22 +1418,25 @@
timeoutRoomDict[roomID] = roomPlayerInfo
PyGameData.g_crossPKRoomDict.pop(roomID)
+ # 记录流向
+ DR_CrossReamlPK("TimeoutRoom", pkRoom.GetDRInfo())
+
# 将超时房间广播到子服
if timeoutRoomDict:
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKTimeoutRoomList, timeoutRoomDict, serverGroupIDList)
return
-def MapServer_CrossPKRoomOpen(msgList):
+def MapServer_CrossPKRoomOpen(msgList, tick):
roomID = msgList[0]
if roomID not in PyGameData.g_crossPKRoomDict:
GameWorld.ErrLog("MapServer_CrossPKRoomOpen => PK房间不存在！roomID=%s" % roomID)
return
pkRoom = PyGameData.g_crossPKRoomDict[roomID]
- pkRoom.isMapOpen = True
+ pkRoom.mapFBOpenTick = tick
GameWorld.Log("MapServer_CrossPKRoomOpen => roomID=%s" % roomID)
return
-def MapServer_CrossPKOver(infoList):
+def MapServer_CrossPKOver(infoList, tick):
## 收到MapServer副本跨服PK结果同步
GameWorld.Log("收到MapServer_跨服PK战斗结果: %s" % str(infoList))
@@ -1426,9 +1567,34 @@
% (seasonID, timeStr, roomID, overType, winnerID, roundWinnerIDList))
# 同步子服
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PKOverInfo, playerOverDict, serverGroupIDList)
+
+ # 记录流向
+ dataDict = {"roundWinnerIDList":roundWinnerIDList, "overType":overType, "winner":winner.GetDRInfo(), "loser":loser.GetDRInfo()}
+ dataDict.update(vsRoom.GetDRInfo())
+ DR_CrossReamlPK("PKOverRoom", dataDict)
return
##================================== 以下是子服逻辑 ==========================================
+
+def OnGameServerInitOK():
+
+ if GameWorld.IsCrossServer():
+ return
+
+ dbZoneID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ dbSeasonID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
+ dbSeasonState = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
+ GameWorld.Log("OnGameServerInitOK dbZoneID=%s,dbSeasonID=%s,dbSeasonState=%s" % (dbZoneID, dbSeasonID, dbSeasonState))
+
+ gameWorld = GameWorld.GetGameWorld()
+ zoneID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ if not zoneID:
+ gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID, dbZoneID)
+ gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID, dbSeasonID)
+ gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState, dbSeasonState)
+ GameWorld.Log(" 服务器启动取DB值设置本服赛区赛季信息: ")
+
+ return
def OnMapServerInitOK():
# 通知地图服务器状态
@@ -1470,8 +1636,23 @@
gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState, seasonState)
gameWorld.SetDict(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK, matchState)
+ # 强制覆盖存DB
+ dbZoneID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ dbSeasonID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
+ dbSeasonState = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
+ GameWorld.Log(" before dbZoneID=%s,dbSeasonID=%s,dbSeasonState=%s" % (dbZoneID, dbSeasonID, dbSeasonState))
+
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID, zoneID)
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID, seasonID)
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState, seasonState)
+ dbZoneID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ dbSeasonID = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
+ dbSeasonState = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
+ GameWorld.Log(" update dbZoneID=%s,dbSeasonID=%s,dbSeasonState=%s" % (dbZoneID, dbSeasonID, dbSeasonState))
+
if curSeasonState == 1 and seasonState == 2:
- PlayerControl.WorldNotify(0, "NotifySeasonOver")
+ pass
+ #PlayerControl.WorldNotify(0, "NotifySeasonOver")
# 通知地图服务器状态
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID, zoneID)
@@ -1501,7 +1682,7 @@
return
if result == -2:
- PlayerControl.NotifyCode(curPlayer, "InCrossPKing")
+ PlayerControl.NotifyCode(curPlayer, "CrossMatching17")
return
if result == 1:
@@ -1557,10 +1738,15 @@
GameWorld.Log("===收到跨服服务器通知已准备好的对战PK房间信息处理=== curServerGroupID=%s" % curServerGroupID)
# serverGroupID, playerName, playerJob
+ if not CrossRealmPlayer.IsCrossServerOpen():
+ GameWorld.Log("跨服服务器维护中，不处理!")
+ return
+
for roomID, readyMemberDict in readyOKRoomList:
for playerID, playerInfo in readyMemberDict.items():
serverGroupID = playerInfo["ServerGroupID"]
playerName = playerInfo["Name"]
+ number = playerInfo["Number"]
if serverGroupID != curServerGroupID:
GameWorld.DebugLog(" 不是本服玩家，不处理!playerID=%s,serverGroupID=%s" % (playerID, serverGroupID))
@@ -1584,6 +1770,7 @@
matchPlayer.Job = readyPlayerInfo["Job"]
matchPlayer.LV = readyPlayerInfo["LV"]
matchPlayer.MaxHP = readyPlayerInfo["MaxHP"]
+ matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]
break
PlayerControl.SetCrossRealmState(player, 1)
@@ -1594,6 +1781,7 @@
matchOKPack.RoomID = roomID
matchOKPack.PlayerName = playerName
matchOKPack.NameLen = len(matchOKPack.PlayerName)
+ matchOKPack.Number = number
matchOKPack.MatchPlayer = [matchPlayer]
matchOKPack.MatchPlayerCount = len(matchOKPack.MatchPlayer)
NetPackCommon.SendFakePack(player, matchOKPack)
@@ -1632,6 +1820,44 @@
return
+#跨服竞技场未通知玩家的比赛结果，注意该类只处理数据逻辑，功能相关逻辑不要写在该类，不然重读脚本不会生效
+class CrossPKUnNotifyOverInfoManager(object):
+
+ def __init__(self):
+ self.__unNotifyOverInfoDict = {} # {playerID:tagDBCrossPKUnNotifyOverInfo, ...}
+ return
+
+ def AddUnNotifyOverInfo(self, playerID, overInfoData):
+ self.__unNotifyOverInfoDict[playerID] = overInfoData
+ return
+
+ def GetPlayerUnNotifyOverInfo(self, playerID): return self.__unNotifyOverInfoDict.pop(playerID, None)
+
+ # 保存数据 存数据库和realtimebackup
+ def GetSaveData(self):
+ savaData = ""
+ cntData = ""
+ cnt = 0
+ for overInfoData in self.__unNotifyOverInfoDict.values():
+ cnt += 1
+ savaData += overInfoData.getBuffer()
+
+ GameWorld.Log("SaveDBCrossPKUnNotifyOverInfo cnt :%s" % cnt)
+ return CommFunc.WriteDWORD(cntData, cnt) + savaData
+
+ # 从数据库载入数据
+ def LoadPyGameData(self, datas, pos, dataslen):
+ cnt, pos = CommFunc.ReadDWORD(datas, pos)
+ GameWorld.Log("LoadDBCrossPKUnNotifyOverInfo cnt :%s" % cnt)
+
+ for _ in xrange(cnt):
+ overInfoData = PyGameDataStruct.tagDBCrossPKUnNotifyOverInfo()
+ overInfoData.clear()
+ pos += overInfoData.readData(datas, pos, dataslen)
+ self.__unNotifyOverInfoDict[overInfoData.PlayerID] = overInfoData
+
+ return pos
+
def CrossServerMsg_PKOverInfo(playerOverDict):
## 子服接收跨服PK结果信息
@@ -1649,7 +1875,24 @@
player = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
if not player or PlayerControl.GetIsTJG(player):
GameWorld.Log(" 玩家不在线 或脱机中，先缓存，玩家上线后再同步，playerID=%s" % (playerID))
- PyGameData.g_crossPKUnNotifyOverInfo[playerID] = sendMapOverInfo
+ overInfoData = PyGameDataStruct.tagDBCrossPKUnNotifyOverInfo()
+ overInfoData.clear()
+ overInfoData.ZoneID = zoneID
+ overInfoData.SeasonID = seasonID
+ overInfoData.RoomID = roomID
+ overInfoData.TimeStr = timeStr
+ overInfoData.OverType = overType
+ overInfoData.PlayerID = playerID
+ overInfoData.WinnerID = winnerID
+ overInfoData.RoundWinnerInfo = str(roundWinnerIDList)
+ overInfoData.RoundWinnerLen = len(overInfoData.RoundWinnerInfo)
+ overInfoData.PKScore = pkScore
+ overInfoData.DanLV = danLV
+ overInfoData.CWinCount = cWinCount
+ overInfoData.AddScore = addScore
+ overInfoData.TagPlayerID = tagPlayerID
+ overInfoData.TagPlayerName = tagPlayerName
+ PyDataManager.GetCrossPKUnNotifyOverInfoManager().AddUnNotifyOverInfo(playerID, overInfoData)
continue
PlayerControl.SetVsRoomId(player, 0)
@@ -1661,14 +1904,41 @@
def __OnLoginNotifyPKOverInfo(curPlayer):
playerID = curPlayer.GetPlayerID()
- if playerID not in PyGameData.g_crossPKUnNotifyOverInfo:
+ overInfoData = PyDataManager.GetCrossPKUnNotifyOverInfoManager().GetPlayerUnNotifyOverInfo(playerID)
+ if not overInfoData:
return
- overInfo = PyGameData.g_crossPKUnNotifyOverInfo.pop(playerID)
PlayerControl.SetCrossRealmState(curPlayer, 0)
PlayerControl.SetVsRoomId(curPlayer, 0)
- sysMsg = str(overInfo)
+
+ zoneID = overInfoData.ZoneID
+ seasonID = overInfoData.SeasonID
+ roomID = overInfoData.RoomID
+ timeStr = overInfoData.TimeStr
+ overType = overInfoData.OverType
+ #playerID = overInfoData.PlayerID
+ winnerID = overInfoData.WinnerID
+ roundWinnerIDList = []
+ try:
+ roundWinnerIDList = eval(overInfoData.RoundWinnerInfo)
+ except:
+ GameWorld.ErrLog("__OnLoginNotifyPKOverInfo roundWinnerIDList eval error! RoundWinnerInfo=%s" % overInfoData.RoundWinnerInfo, playerID)
+ pkScore = overInfoData.PKScore
+ danLV = overInfoData.DanLV
+ cWinCount = overInfoData.CWinCount
+ addScore = overInfoData.AddScore
+ tagPlayerID = overInfoData.TagPlayerID
+ tagPlayerName = overInfoData.TagPlayerName
+ notifyState = 0 # 登录才通知的默认未通知
+ sendMapOverInfo = [roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList, pkScore, danLV, cWinCount, addScore, tagPlayerID, tagPlayerName, notifyState]
+ sysMsg = str(sendMapOverInfo)
curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossPKOverInfo", sysMsg, len(sysMsg))
- GameWorld.Log("玩家上线通知地图未结算的跨服PK结算: mapID=%s,overInfo=%s" % (curPlayer.GetMapID(), overInfo), playerID)
+ GameWorld.Log("玩家上线通知地图未结算的跨服PK结算: roomID=%s,zoneID=%s,seasonID=%s,timeStr=%s,overType=%s,winnerID=%s,roundWinnerIDList=%s, pkScore=%s,danLV=%s,cWinCount=%s,addScore=%s,tagPlayerID=%s,notifyState=%s,mapID=%s"
+ % (roomID, zoneID, seasonID, timeStr, overType, winnerID, roundWinnerIDList, pkScore, danLV, cWinCount, addScore, tagPlayerID, notifyState, curPlayer.GetMapID()), playerID)
return
+def DR_CrossReamlPK(eventName, dataDict={}):
+ drDataDict = {}
+ drDataDict.update(dataDict)
+ DataRecordPack.SendEventPack("CrossPK_%s" % eventName, drDataDict)
+ return
--
Gitblit v1.8.0