From 950a3fabc810551ea7176ddaf06c37e9cc81d058 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 09 五月 2025 19:45:13 +0800
Subject: [PATCH] 10367 【越南】【英语】【BT】【砍树】仙盟攻城战-服务端（修复击杀修罗城守卫后无法正常切换下一个守卫bug；）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBillboard.py | 150 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 108 insertions(+), 42 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBillboard.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBillboard.py
index 71537ac..9fac72d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBillboard.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBillboard.py
@@ -17,16 +17,20 @@
import CommFunc
import ShareDefine
+import IpyGameDataPY
import CrossRealmMsg
+import PlayerViewCache
import PyGameDataStruct
import ChPyNetSendPack
import DataRecordPack
import NetPackCommon
import PyDataManager
+import CrossRealmPK
import GameWorld
import operator
import time
+import json
class CrossBillboardManager(object):
## 跨服排行榜管理，注意该类只处理数据逻辑，功能相关逻辑不要写在该类，不然重读脚本不会生效
@@ -64,6 +68,27 @@
for key in self.__billboardDict.keys():
if key[0] == billboardType:
self.__billboardDict.pop(key)
+ return
+
+ def ClearBillboard(self, billboardType, groupValue1=None, groupValue2=None):
+ '''清除某个类型的榜单所有数据，可指定过滤groupValue，有流向记录
+ @param groupValue1: 不为None时验证 groupValue1 是否相同
+ @param groupValue2: 不为None时验证 groupValue2 是否相同
+ 如果groupValue1 groupValue2 都传入None，相当于清空 billboardType 类型的所有榜单数据
+ '''
+ clearList = []
+ for bType, gValue1, gValue2 in self.__billboardDict.keys():
+ if bType != billboardType:
+ continue
+ if groupValue1 != None and groupValue1 != gValue1:
+ continue
+ if groupValue2 != None and groupValue2 != gValue2:
+ continue
+ key = (bType, gValue1, gValue2)
+ clearList.append(key)
+
+ for bType, gValue1, gValue2 in clearList:
+ self.GetCrossBillboard(bType, gValue1, gValue2).ClearData()
return
# 保存数据 存数据库和realtimebackup
@@ -110,7 +135,6 @@
self.__billboardType = billboardType
self.__groupValue1 = groupValue1
self.__groupValue2 = groupValue2
- self.__maxCount = ShareDefine.CrossBillboard_MaxDataCount.get(billboardType, 100)
self.__crossServerDataVer = 0 # 主服榜单数据版本
self.__clientServerDataVer = 0 # 子服榜单数据版本
self.__billboardList = [] # [tagDBCrossBillboard, ...]
@@ -268,10 +292,17 @@
return
def GetCount(self): return len(self.__billboardList)
- def GetMaxCount(self): return self.__maxCount
+ def GetMaxCount(self):
+ maxCountDict = IpyGameDataPY.GetFuncEvalCfg("CrossBillboardSet", 1, {})
+ return maxCountDict.get(self.__billboardType, 100)
- def At(self, i): return self.__billboardList[i]
- def IsFull(self): return len(self.__billboardList) >= self.__maxCount
+ def At(self, i):
+ billData = self.__billboardList[i]
+ if not billData and False:
+ billData = PyGameDataStruct.tagDBCrossBillboard() # 不会执行到，只为了.出代码提示
+ return billData
+
+ def IsFull(self): return len(self.__billboardList) >= self.GetMaxCount()
def UpdCrossServerDataVer(self, version=None):
## 更新跨服榜单数据版本号，用于跨服主服、子服验证数据版本，同步榜单数据用
@@ -344,7 +375,7 @@
def CopyBillboardOnDay():
billboardMgr = PyDataManager.GetCrossBillboardManager()
for billboardType in ShareDefine.CrossBillboardTypeList:
- if billboardType in [ShareDefine.Def_CBT_BossTrialSubmitBak, ShareDefine.Def_CBT_BossTrialSubmitFamilyBak]:
+ if billboardType in [ShareDefine.Def_CBT_BossTrialSubmitBak, ShareDefine.Def_CBT_BossTrialSubmitFamilyBak, ShareDefine.Def_CBT_CrossRealmPK]:
continue
groupList = billboardMgr.GetBillboardGroupList(billboardType)
for billboardType, groupValue1, groupValue2 in groupList:
@@ -442,8 +473,8 @@
#{
# tagHead Head;
# BYTE Type; //榜单类型
-# BYTE GroupValue1; // 分组值1
-# BYTE GroupValue2; // 分组值2，与分组值1组合归为同组榜单数据
+# DWORD GroupValue1; // 分组值1
+# DWORD GroupValue2; // 分组值2，与分组值1组合归为同组榜单数据
# DWORD StartIndex; //查看的起始名次索引， 默认0
# BYTE WatchCnt; //查看条数，默认20，最大不超过100
# DWORD WatchID; //查看指定ID名次前后，如玩家ID、家族ID等
@@ -466,8 +497,21 @@
GameWorld.DebugLog("玩家请求查看跨服排行榜: billboardType=%s,groupValue1=%s,groupValue2=%s" % (billboardType, groupValue1, groupValue2))
# 请求查询跨服服务器
- dataMsg = {"BillboardType":billboardType, "GroupValue1":groupValue1, "GroupValue2":groupValue2,
- "QueryData":{"EventName":"View", "PlayerID":playerID, "StartIndex":startIndex, "WatchCnt":watchCnt, "WatchID":watchID}}
+ dataMsg = {"BillboardType":billboardType, "GroupValue1":groupValue1, "GroupValue2":groupValue2, "PlayerID":playerID,
+ "QueryType":"View", "QueryData":{"StartIndex":startIndex, "WatchCnt":watchCnt, "WatchID":watchID}}
+ CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_QueryBillboard, dataMsg)
+ return
+
+def OnQueryPlayerBillboardRank(playerID, funcName, funcData, billboardType, groupValue1, groupValue2=0, tagPlayerID=0):
+ ## 查询玩家ID排名
+ if GameWorld.IsCrossServer():
+ return
+ if billboardType not in ShareDefine.CrossBillboardTypeList:
+ return
+ if not tagPlayerID:
+ tagPlayerID = playerID # 默认查自己
+ dataMsg = {"BillboardType":billboardType, "GroupValue1":groupValue1, "GroupValue2":groupValue2, "PlayerID":playerID,
+ "QueryType":"Ranking", "QueryData":{"PlayerID":tagPlayerID, "funcName":funcName, "funcData":funcData}}
CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_QueryBillboard, dataMsg)
return
@@ -476,11 +520,13 @@
billboardType = msgData["BillboardType"]
groupValue1 = msgData["GroupValue1"]
groupValue2 = msgData["GroupValue2"]
+ playerID = msgData.get("PlayerID", 0) # 发起的玩家ID
+ queryType = msgData.get("QueryType", "") # 原数据返回子服
queryData = msgData.get("QueryData", {}) # 原数据返回子服
- SyncCrossBillboardToClientServer(billboardType, groupValue1, groupValue2, [serverGroupID], queryData)
+ SyncCrossBillboardToClientServer(billboardType, groupValue1, groupValue2, [serverGroupID], playerID, queryType, queryData)
return
-def SyncCrossBillboardToClientServer(billboardType, groupValue1, groupValue2, serverGroupIDList=None, queryData=None):
+def SyncCrossBillboardToClientServer(billboardType, groupValue1, groupValue2, serverGroupIDList=None, playerID=0, queryType="", queryData=None):
## 同步跨服榜单到子服
if not GameWorld.IsCrossServer():
return
@@ -492,9 +538,17 @@
billboardObj = billboardMgr.GetCrossBillboard(billboardType, groupValue1, groupValue2)
billboardObj.DoDelaySort()
idOrderDict = billboardObj.GetIDOrderDict()
- crossServerDataVer = billboardObj.GetCrossServerDataVer()
- msgData = {"BillboardType":billboardType, "GroupValue1":groupValue1, "GroupValue2":groupValue2,
- "QueryData":queryData, "CrossServerDataVer":crossServerDataVer}
+ msgData = {"BillboardType":billboardType, "GroupValue1":groupValue1, "GroupValue2":groupValue2, "PlayerID":playerID,
+ "QueryType":queryType, "QueryData":queryData}
+
+ # 查询名次
+ if queryType == "Ranking":
+ tagPlayerID = queryData.get("PlayerID", 0)
+ if not tagPlayerID:
+ return
+ queryData["OrderIndex"] = idOrderDict.get(tagPlayerID, 0) - 1 # -1-未上榜，0-第一名
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_SyncBillboard, msgData, serverGroupIDList)
+ return
# 有查询数据时才同步榜单数据列表，否则只同步数据版本号
if queryData:
@@ -560,38 +614,30 @@
billboardType = msgData["BillboardType"]
groupValue1 = msgData["GroupValue1"]
groupValue2 = msgData["GroupValue2"]
- crossServerDataVer = msgData["CrossServerDataVer"]
- syncBillboardList = msgData.get("BillboardDataList")
- GameWorld.DebugLog("收到跨服服务器同步的排行榜信息: billboardType=%s,groupValue1=%s,groupValue2=%s,crossServerDataVer=%s"
- % (billboardType, groupValue1, groupValue2, crossServerDataVer))
-
- #billboardMgr = PyDataManager.GetCrossBillboardManager()
- #billboardObj = billboardMgr.GetCrossBillboard(billboardType, groupValue1, groupValue2)
- #billboardObj.UpdClientServerBillboard(crossServerDataVer, syncBillboardList)
-
- queryData = msgData.get("QueryData")
- if not queryData:
+ playerID = msgData.get("PlayerID", 0) # 发起的玩家ID
+ queryType = msgData.get("QueryType", "")
+ queryData = msgData.get("QueryData", {})
+ GameWorld.DebugLog("收到跨服服务器同步的排行榜信息: billboardType=%s,groupValue1=%s,groupValue2=%s,queryType=%s"
+ % (billboardType, groupValue1, groupValue2, queryType), playerID)
+ if not queryType or not queryData:
return
- eventName = queryData.get("EventName")
- #eventData = queryData.get("EventData")
- queryPlayerID = queryData.get("PlayerID", 0)
- if not eventName or not queryPlayerID:
- return
-
- queryPlayer = GameWorld.GetPlayerManager().FindPlayerByID(queryPlayerID)
- if not queryPlayer:
- return
-
- if eventName == "View":
+ if queryType == "View":
+ queryPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if not queryPlayer:
+ return
watchID = queryData.get("WatchID", 0)
+ syncBillboardList = msgData.get("BillboardDataList")
SyncCrossBillboardToPlayer(queryPlayer, billboardType, groupValue1, groupValue2, syncBillboardList, watchID)
- #else:
- # idOrderDict = billboardObj.GetIDOrderDict()
- # order = idOrderDict.get(queryPlayerID, 0)
- # sysMsg = str([billboardType, groupValue1, groupValue2, eventName, eventData, order])
- # queryPlayer.MapServer_QueryPlayerResult(0, 0, "CrossBillboardOrder", sysMsg, len(sysMsg))
+ elif queryType == "Ranking":
+ funcName = queryData.get("funcName", "")
+ funcData = queryData.get("funcData", {})
+ #tagPlayerID = queryData.get("PlayerID", 0)
+ orderIndex = queryData.get("OrderIndex", 0)
+ if funcName == "QueryCrossPKSeasonOrder":
+ CrossRealmPK.OnQueryCrossPKSeasonOrderRet(playerID, funcData, orderIndex)
+
return
def SyncCrossBillboardToPlayer(curPlayer, billboardType, groupValue1, groupValue2, billboardList, watchID):
@@ -748,6 +794,21 @@
id2=id2, autoSort=autoSort, value3=value3, value4=value4, value5=value5)
return
+def UpdCrossBillboardPlayer(bType, playerID, groupValue1, cmpValue, cmpValue2=0, value1=0, value2=0, groupValue2=0, autoSort=True, **kwargs):
+ ## 通用的更新跨服玩家榜，GameServer直接调用
+ playerInfo = PlayerViewCache.GetShotCacheDict(playerID, "AccID", "ServerID", "Face", "FacePic")
+ name1 = playerInfo.get("Name", "")
+ name2 = playerInfo.get("AccID", "")
+ type2 = playerInfo.get("Job", 1)
+ if not value1:
+ value1 = playerInfo.get("RealmLV", 1)
+ value3 = playerInfo.get("Face", 0)
+ value4 = playerInfo.get("FacePic", 0)
+ value5 = playerInfo.get("ServerID", 0)
+ UpdCrossBillboard(bType, groupValue1, playerID, name1, name2, type2, value1, value2, cmpValue, cmpValue2,
+ autoSort=autoSort, value3=value3, value4=value4, value5=value5)
+ return
+
def UpdCrossBillboard(billboardType, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue,
cmpValue2=0, cmpValue3=0, groupValue2=0, id2=0, autoSort=True, noSortAndSync=False,
**kwargs):
@@ -820,7 +881,12 @@
billboardData.Value6 = kwargs.get("value6", 0)
billboardData.Value7 = kwargs.get("value7", 0)
billboardData.Value8 = kwargs.get("value8", 0)
- billboardData.UserData = kwargs.get("userData", "")
+ userData = kwargs.get("userData", "")
+ if userData and not isinstance(userData, str):
+ if isinstance(userData, dict) or isinstance(userData, list):
+ userData = json.dumps(userData, ensure_ascii=False)
+ userData = userData.replace(" ", "")
+ billboardData.UserData = userData
billboardData.DataLen = len(billboardData.UserData)
billboardData.CmpValue = cmpValue
billboardData.CmpValue2 = cmpValue2
--
Gitblit v1.8.0