From 0684a9b035835b1e97e7ebc2ff9b949e72181e8c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 21 一月 2025 14:15:18 +0800
Subject: [PATCH] 10263 【越南】【英文】【BT】【砍树】后端支持NPC仿真实玩家战斗和快速战斗（优化镜像玩家移动）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 50 +++++++++++++++++++++++---------------------------
1 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index ccff39a..b02d8a8 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -23,12 +23,14 @@
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 CrossChampionship
@@ -65,7 +67,7 @@
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_GameWorldInitOK):
GameWorld.ErrLog("服务器未启动好,不允许向跨服服务器发送数据! %s" % (srcMsg))
return
- GameWorld.Log("SendMsgToCrossServer => %s" % (srcMsg))
+ GameWorld.Log("SendMsgToCrossServer => %s, %s" % (msgType, srcMsg))
GameWorld.GetGameWorld().SendMergerChildToCenterStringData(sendMsg, len(sendMsg))
return
@@ -77,23 +79,17 @@
return
msgDict = cPickle.loads(recvMsg)
- GameWorld.Log("OnCrossServerReceiveMsg: %s" % msgDict)
-
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
serverGroupID = msgDict.get("ServerGroupID", 0)
+ GameWorld.Log("OnCrossServerReceiveMsg: %s, %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)
@@ -123,7 +119,10 @@
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)
@@ -157,6 +156,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)
@@ -196,6 +198,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)
@@ -309,7 +314,7 @@
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))
+ GameWorld.Log("SendMsgToClientServer => %s, %s, %s" % (msgType, serverGroupIDList, srcMsg))
if not serverGroupIDList:
GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
else:
@@ -334,7 +339,7 @@
msgType = msgDict.get("MsgType", -1)
msgData = msgDict.get("Data", "")
crossServerTimeStr = msgDict.get("CrossServerTime", "")
- GameWorld.Log("OnClientServerReceiveMsg: %s" % msgDict)
+ GameWorld.Log("OnClientServerReceiveMsg: %s, %s" % (msgType, msgDict))
if crossServerTimeStr:
curServerTime = int(time.time())
crossServerTime = GameWorld.ChangeTimeStrToNum(crossServerTimeStr)
@@ -362,7 +367,10 @@
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)
@@ -376,23 +384,11 @@
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)
--
Gitblit v1.8.0