From f2cf64ffabcd15d5497aee8914b8d37d8b9a88b0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 07 二月 2026 15:39:43 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（公会GM命令支持跨服 CreateFamily、Family、Zhenbaoge；跨服公会聊天支持，包含公会聊天缓存；查看玩家A705回包增加公会所在服务器ID信息；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py | 70 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
index c2d6f9b..5d74c1c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
@@ -25,12 +25,13 @@
import Commands
import IPY_GameWorld
import DataRecordPack
+import ChServerToServerPyPack
+import NetPackCommon
import PlayerControl
import ReadChConfig
import traceback
import FBLogic
import GameObj
-import CrossMsg
import ShareDefine
import CrossPlayer
#---------------------------------------------------------------------
@@ -108,18 +109,25 @@
continue
inputList[i] = value
- if GameWorld.IsMainServer():
- callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "GetGMServerIDList"))
- if callFunc != None:
- gmServerIDList = callFunc(curPlayer)
- if gmServerIDList:
- CrossMsg.SendToCrossServer(ShareDefine.S2C_GMCMD, {"CMD":inputList}, gmServerIDList, curPlayer.GetPlayerID())
-
+
callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "OnExec"))
if callFunc:
#删除命令，只将参数传入
callFunc(curPlayer, inputList[1:])
DR_UseGMCMD(curPlayer, inputStr)
+
+ # 检查是否额外发给其他跨服服务器
+ if GameWorld.IsMainServer():
+ callFunc = GameWorld.GetExecFunc(Commands, "%s.%s"%(callFunName, "GetGMServerIDList"))
+ if callFunc != None:
+ gmServerIDList = callFunc(curPlayer)
+ pack = ChServerToServerPyPack.tagSSGMCMD()
+ pack.FromServerID = GameWorld.GetGameWorld().GetServerID()
+ pack.ServerType = GameWorld.GetServerType()
+ pack.PlayerID = curPlayer.GetPlayerID()
+ pack.CMDStr = str(inputList)
+ pack.CMDLen = len(pack.CMDStr)
+ NetPackCommon.SendCrossServerToServerPack(pack, gmServerIDList, dirType=ShareDefine.dirType_Cross)
return
# GameObj 的 Get、Set函数
@@ -205,22 +213,40 @@
# raise Exception(errorMsg)
return
-def S2C_GMCMD(dataMsg, fromServerID, playerID):
- cmdList = dataMsg["CMD"]
-
- callName = "%s.%s" % (cmdList[0], "OnExecCross")
- callFunc = GameWorld.GetExecFunc(Commands, callName)
- if callFunc == None:
- GameWorld.ErrLog("找不到此GM命令处理函数%s" % callName)
- return
- GameWorld.Log("跨服执行GM命令：%s" % cmdList)
-
+#// C2 04 跨服GM命令 #tagSSGMCMD
+#
+#struct tagSSGMCMD
+#{
+# tagHead Head;
+# DWORD FromServerID; //哪个服发的
+# BYTE ServerType; //服务器类型
+# DWORD PlayerID; //哪个玩家触发发送的
+# BYTE CMDLen;
+# char CMDStr[CMDLen];
+#};
+def OnSSGMCMD(netPack):
+ fromServerID = netPack.FromServerID
+ playerID = netPack.PlayerID
+ cmdStr = netPack.CMDStr
+ GameWorld.Log("OnSSGMCMD cmdStr=%s,fromServerID=%s" % (cmdStr, fromServerID), playerID)
crossPlayer = CrossPlayer.GetCrossPlayerMgr().FindCrossPlayer(playerID)
if not crossPlayer:
- crossPlayer = CrossPlayer.GetCrossPlayerMgr().RegistPlayer(playerID)
-
- #只将实际参数传入
- callFunc(crossPlayer, cmdList[1:])
+ GameWorld.ErrLog("本服找不到crossPlayer!", playerID)
+ return
+ cmdList = eval(cmdStr)
+ callFunName = cmdList[0]
+ callName = "%s.%s" % (callFunName, "OnExec")
+ callFunc = GameWorld.GetExecFunc(Commands, callName)
+ if not callFunc:
+ GameWorld.DebugAnswer(crossPlayer, "找不到该跨服命令! %s" % callName)
+ return
+ try:
+ #只将实际参数传入
+ callFunc(crossPlayer, cmdList[1:])
+ except BaseException:
+ GameWorld.DebugAnswer(crossPlayer, "跨服执行GM命令错误!serverID=%s" % GameWorld.GetGameWorld().GetServerID())
+ errorMsg = str(traceback.format_exc())
+ GameWorld.ErrLog('GM命令错误 - > %s' % errorMsg, crossPlayer.GetPlayerID())
return
## 使用GM命令流向
--
Gitblit v1.8.0