From a98e28b6487ea5634459d3e425124de6df143b2d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 19 三月 2025 14:21:01 +0800
Subject: [PATCH] 10263 【英文】【BT】【GM】后端支持NPC仿真实玩家战斗和快速战斗（触发被动死循环防范修改；）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 125 ++++++++++++++++++++++++++++++++---------
1 files changed, 97 insertions(+), 28 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 45a4c8b..580e7a9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -19,15 +19,18 @@
import ShareDefine
import PlayerAssist
import PlayerControl
+import PlayerPackData
import PlayerFuncTeam
import CrossLuckyCloudBuy
import IPY_GameServer
+import PlayerViewCache
import CrossRealmPlayer
import PlayerCompensation
import PlayerActBossTrial
import PlayerActXianXiaMJ
import PlayerActGubao
import PlayerActHorsePetTrain
+import PlayerActLianqi
import CrossActionControl
import CrossActAllRecharge
import CrossFamilyFlagwar
@@ -37,6 +40,7 @@
import CrossYaomoBoss
import GameWorldBoss
import CrossRealmPK
+import GameXiangong
import GameWorship
import PlayerQuery
import PlayerTalk
@@ -51,20 +55,37 @@
import cPickle
import time
+# 仅输出简短日志的信息类型
+ClientServerMsg_ShortLogTypeList = [ShareDefine.ClientServerMsg_PushPlayerCache, ShareDefine.ClientServerMsg_PlayerPackData]
+CrossServerMsg_ShortLogTypeList = [ShareDefine.CrossServerMsg_PushPlayerPackData, ShareDefine.CrossServerMsg_ViewPlayerCacheRet]
+
def SendMsgToCrossServer(msgType, dataMsg):
## 发送信息到跨服服务器上
if GameWorld.IsCrossServer():
return
if not dataMsg:
return
-
+ if msgType not in [ShareDefine.ClientServerMsg_ServerInitOK]:
+ isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+ if not isOpen:
+ GameWorld.Log("跨服服务器未开启或维护中不发送消息! SendMsgToCrossServer => %s" % msgType)
+ return
# 协议要用最高级2，可减少长度
srcMsg = {"MsgType":msgType, "Data":dataMsg, "ServerGroupID":GameWorld.GetServerGroupID()}
sendMsg = cPickle.dumps(srcMsg, 2)
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
return
- GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))
+ if msgType in ClientServerMsg_ShortLogTypeList:
+ playerID = 0
+ if isinstance(dataMsg, dict):
+ playerID = dataMsg.get("playerID", 0)
+ if not playerID:
+ playerID = dataMsg.get("PlayerID", 0)
+ msgLen = len(str(srcMsg))
+ GameWorld.Log("SendMsgToCrossServer => %s, playerID=%s,msgLen=%s" % (msgType, playerID, msgLen))
+ else:
+ GameWorld.Log("SendMsgToCrossServer => %s, %s" % (msgType, srcMsg))
GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
return
@@ -76,23 +97,26 @@
return
msgDict = cPickle.loads(recvMsg)
- GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
-
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
serverGroupID = msgDict.get("ServerGroupID", 0)
+ if msgType in ClientServerMsg_ShortLogTypeList:
+ playerID = 0
+ if isinstance(msgData, dict):
+ playerID = msgData.get("playerID", 0)
+ if not playerID:
+ playerID = msgData.get("PlayerID", 0)
+ msgLen = len(str(msgDict))
+ GameWorld.Log("OnCrossServerReceiveMsg: %s, serverGroupID=%s,playerID=%s,msgLen=%s" % (msgType, serverGroupID, playerID, msgLen))
+ else:
+ GameWorld.Log("OnCrossServerReceiveMsg: %s, serverGroupID=%s, %s" % (msgType, serverGroupID, msgDict))
+
if msgType == ShareDefine.ClientServerMsg_PKMatch:
CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
- elif msgType == ShareDefine.ClientServerMsg_PKRobotOver:
- CrossRealmPK.ClientServerMsg_PKRobotOver(serverGroupID, msgData, tick)
-
- elif msgType == ShareDefine.ClientServerMsg_PKCancel:
- CrossRealmPK.ClientServerMsg_PKCancel(msgData, tick)
-
- elif msgType == ShareDefine.ClientServerMsg_PKPrepareOK:
- CrossRealmPK.ClientServerMsg_PKPrepareOK(msgData, tick)
+ elif msgType == ShareDefine.ClientServerMsg_PKOver:
+ CrossRealmPK.ClientServerMsg_PKOver(serverGroupID, msgData, tick)
elif msgType == ShareDefine.ClientServerMsg_PKBillboard:
CrossRealmPK.ClientServerMsg_PKBillboard(serverGroupID, msgData)
@@ -122,7 +146,16 @@
ClientServerMsg_ServerInitOK(serverGroupID, tick)
elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
- CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+ PlayerViewCache.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PushPlayerCache:
+ PlayerViewCache.ClientServerMsg_PushPlayerCache(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PullOtherPlayerPackData:
+ PlayerPackData.ClientServerMsg_PullOtherPlayerPackData(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_PlayerPackData:
+ PlayerPackData.ClientServerMsg_PlayerPackData(serverGroupID, msgData)
elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
@@ -150,6 +183,9 @@
elif msgType == ShareDefine.ClientServerMsg_BattlefieldCallChange:
CrossBattlefield.ClientServerMsg_BattlefieldCallChange(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_ChampionshipPKOver:
+ CrossChampionship.ClientServerMsg_ChampionshipPKOver(serverGroupID, msgData)
elif msgType == ShareDefine.ClientServerMsg_ChampionshipOfficialApply:
CrossChampionship.ClientServerMsg_ChampionshipOfficialApply(serverGroupID, msgData)
@@ -190,6 +226,9 @@
elif msgType == ShareDefine.ClientServerMsg_HorsePetTrainScore:
PlayerActHorsePetTrain.ClientServerMsg_HorsePetTrainScore(serverGroupID, msgData)
+ elif msgType == ShareDefine.ClientServerMsg_LianqiScore:
+ PlayerActLianqi.ClientServerMsg_LianqiScore(serverGroupID, msgData)
+
elif msgType == ShareDefine.ClientServerMsg_CreateFuncTeam:
PlayerFuncTeam.ClientServerMsg_CreateFuncTeam(serverGroupID, msgData)
@@ -201,6 +240,9 @@
elif msgType == ShareDefine.ClientServerMsg_QueryFuncTeam:
PlayerFuncTeam.ClientServerMsg_QueryFuncTeam(serverGroupID, msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_QueryXiangong:
+ GameXiangong.ClientServerMsg_QueryXiangong(serverGroupID, msgData)
# 需要发送到地图服务器处理的
elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:
@@ -218,6 +260,10 @@
当子服启动成功后，可同步一次跨服服务器活动状态及活动数据给子服
'''
GameWorld.Log("收到跨服子服连接成功通知! serverGroupID=%s" % serverGroupID)
+ isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+ if not isOpen:
+ GameWorld.Log("跨服服务器维护中不处理! serverGroupID=%s" % serverGroupID)
+ return
Sync_CrossServerInitDataToClientServer(tick, serverGroupID)
return
@@ -299,7 +345,16 @@
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.ErrLog("跨服服务器未启动好,不允许向子服发送数据! serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
return
- GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
+ if msgType in CrossServerMsg_ShortLogTypeList:
+ playerID = 0
+ if isinstance(dataMsg, dict):
+ playerID = dataMsg.get("playerID", 0)
+ if not playerID:
+ playerID = dataMsg.get("PlayerID", 0)
+ msgLen = len(str(srcMsg))
+ GameWorld.Log("SendMsgToClientServer => %s, %s, playerID=%s,msgLen=%s" % (msgType, serverGroupIDList, playerID, msgLen))
+ else:
+ GameWorld.Log("SendMsgToClientServer => %s, %s, %s" % (msgType, serverGroupIDList, srcMsg))
if not serverGroupIDList:
GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
else:
@@ -324,7 +379,18 @@
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
crossServerTimeStr = msgDict.get("CrossServerTime", "")
- GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
+
+ if msgType in CrossServerMsg_ShortLogTypeList:
+ playerID = 0
+ if isinstance(msgData, dict):
+ playerID = msgData.get("playerID", 0)
+ if not playerID:
+ playerID = msgData.get("PlayerID", 0)
+ msgLen = len(str(msgDict))
+ GameWorld.Log("OnClientServerReceiveMsg: %s, playerID=%s,msgLen=%s" % (msgType, playerID, msgLen))
+ else:
+ GameWorld.Log("OnClientServerReceiveMsg: %s, %s" % (msgType, msgDict))
+
if crossServerTimeStr:
curServerTime = int(time.time())
crossServerTime = GameWorld.ChangeTimeStrToNum(crossServerTimeStr)
@@ -352,28 +418,28 @@
PlayerTalk.CrossServerMsg_ChatCrossWorld(msgData)
elif msgType == ShareDefine.CrossServerMsg_ViewPlayerCacheRet:
- CrossRealmPlayer.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+ PlayerViewCache.CrossServerMsg_ViewPlayerCacheRet(msgData, tick)
+
+ elif msgType == ShareDefine.CrossServerMsg_PullPlayerViewCache:
+ PlayerViewCache.CrossServerMsg_PullPlayerViewCache(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PlayerPackDataState:
+ PlayerPackData.CrossServerMsg_PlayerPackDataState(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PullPlayerPackData:
+ PlayerPackData.CrossServerMsg_PullPlayerPackData(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_PushPlayerPackData:
+ PlayerPackData.CrossServerMsg_PushPlayerPackData(msgData)
elif msgType == ShareDefine.CrossServerMsg_PKMatchReqRet:
CrossRealmPK.CrossServerMsg_PKMatchReqRet(msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_PKMatchResult:
- CrossRealmPK.CrossServerMsg_PKMatchResult(msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_PKReadyOKRoomList:
- CrossRealmPK.CrossServerMsg_PKReadyOKRoomList(msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_PKTimeoutRoomList:
- CrossRealmPK.CrossServerMsg_PKTimeoutRoomList(msgData)
elif msgType == ShareDefine.CrossServerMsg_PKOverInfo:
CrossRealmPK.CrossServerMsg_PKOverInfo(msgData)
elif msgType == ShareDefine.CrossServerMsg_PKSeasonInfo:
CrossRealmPK.CrossServerMsg_PKSeasonInfo(msgData)
-
- elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
- CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
elif msgType == ShareDefine.CrossServerMsg_LuckyCloudBuyLottery:
CrossLuckyCloudBuy.CrossServerMsg_LuckyCloudBuyLottery(msgData)
@@ -408,6 +474,9 @@
elif msgType == ShareDefine.CrossServerMsg_Worship:
GameWorship.CrossServerMsg_Worship(msgData)
+ elif msgType == ShareDefine.CrossServerMsg_Xiangong:
+ GameXiangong.CrossServerMsg_Xiangong(msgData)
+
elif msgType == ShareDefine.CrossServerMsg_ChampionshipState:
CrossChampionship.CrossServerMsg_ChampionshipState(msgData)
--
Gitblit v1.8.0