From 01a0e539b786ae0f1c46646874502367f5410aca Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 04 二月 2026 18:18:51 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（优化游戏服及跨服启动、通讯逻辑；服务器类型增加跨服中心、跨服事件、时间管理；跨服玩家在线状态、基础信息、玩家资源增减管理、发送跨服个人邮件等；跨服公会初版，修复公会成员审核、成员战力刷新等bug，增加公会名次同步；跨服公会暂未测试；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py | 89 ++++++++++++++++++++++----------------------
1 files changed, 44 insertions(+), 45 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 d4a30f2..c2d6f9b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.py
@@ -28,9 +28,11 @@
import PlayerControl
import ReadChConfig
import traceback
-import PlayerTJG
import FBLogic
import GameObj
+import CrossMsg
+import ShareDefine
+import CrossPlayer
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -38,7 +40,6 @@
GameWorld.ImportAll("Script\\GM\\" , "Commands")
GameWorld.ImportAll("Script\\GM\\" , "")
-TestPlatformList = ["test", "yun"]
#---------------------------------------------------------------------
## 重新导入GM全部命令
# @param tick 当前时间
@@ -75,7 +76,7 @@
# curIP = curPlayer.GetIP()
# if (curIP.find('10.30.') == 0 or curIP.find('192.168.') == 0) and playerPF == "173on_lan":
#测试修改
- if playerPF in TestPlatformList:
+ if GameWorld.IsTestPlatform(playerPF):
curPlayer.SetGMLevel(gmLV)
GameWorld.DebugAnswer(curPlayer, "SetGMLevel %s" % gmLV)
else:
@@ -96,24 +97,29 @@
#验证权限失败
elif not CheckGMLV(curPlayer , callFunName):
+ GameWorld.DebugAnswer(curPlayer, 'GM等级不足!')
return
+
+ #把剩余参数转换为整型
+ for i in range(1, len(inputList)):
+ value = GameWorld.ToNumDef(inputList[i], None)
+ if value == None:
+ #GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
+ 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:
- #删除命令，只将参数传入
- del inputList[0]
- #把剩余参数转换为整型
- for i in range(0, len(inputList)):
- value = GameWorld.ToNumDef(inputList[i], None)
- if value == None:
- #GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
- continue
- inputList[i] = value
-
- isSendGameServer = callFunc(curPlayer, inputList)
+ #删除命令，只将参数传入
+ callFunc(curPlayer, inputList[1:])
DR_UseGMCMD(curPlayer, inputStr)
- if isSendGameServer:
- curPlayer.GameServer_GMCmd(inputStr)
return
# GameObj 的 Get、Set函数
@@ -179,10 +185,7 @@
if value == None:
GameWorld.DebugAnswer(curPlayer, "参数错误, 必须为纯数字!")
return
- if callFunName == "SetHappyPoint":
- PlayerTJG.SetTJGTime(curPlayer, value)
- else:
- callObj(value)
+ callObj(value)
else:
GameWorld.DebugAnswer(curPlayer, "不支持该命令!curPlayer.%s" % callFunName)
return
@@ -191,13 +194,33 @@
DR_UseGMCMD(curPlayer, inputStr)
return
- curPlayer.GameServer_GMCmd(inputStr)
+ #没有此命令
+ GameWorld.Log("###使用GM命令 = %s, 没有该命令!" % callFunName, curPlayer.GetPlayerID())
+ GameWorld.DebugAnswer(curPlayer, 'no cmd !!!')
except BaseException:
GameWorld.DebugAnswer(curPlayer, "执行GM命令错误, 请查看所在地图日志!")
errorMsg = str(traceback.format_exc())
GameWorld.ErrLog('GM命令错误 - > %s' % errorMsg, curPlayer.GetPlayerID())
#if GameWorld.GetGameWorld().GetDebugLevel():
# 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)
+
+ crossPlayer = CrossPlayer.GetCrossPlayerMgr().FindCrossPlayer(playerID)
+ if not crossPlayer:
+ crossPlayer = CrossPlayer.GetCrossPlayerMgr().RegistPlayer(playerID)
+
+ #只将实际参数传入
+ callFunc(crossPlayer, cmdList[1:])
return
## 使用GM命令流向
@@ -228,30 +251,6 @@
if curPlayer_GMLV == 90:
#内部测试人员,不限制
return True
-
- GMLVPowerDict = ReadChConfig.GetEvalChConfig("GMLVPower")
- if curPlayer_GMLV in GMLVPowerDict:
- powerList = GMLVPowerDict[curPlayer_GMLV]
- if not powerList or callFunName in powerList:
- return True
-
- #验证权限
- if callFunName in ChConfig.Def_GMPower_Disc:
- gmPowerList = ChConfig.Def_GMPower_Disc[callFunName]
-
- if curPlayer_GMLV not in gmPowerList:
- #GM等级异常
- GameWorld.Log("###使用GM命令 = %s,GM等级 = %s异常"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
- return
-
- if not gmPowerList[curPlayer_GMLV]:
- GameWorld.Log("###使用GM命令 = %s,权限 = %s不足"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
- return
-
- #内部测试用GM命令
- else:
- GameWorld.Log("###非内部人员, 使用调试GM命令 = %s,权限 = %s不足"%(callFunName , curPlayer_GMLV) , curPlayer.GetPlayerID())
- return
return True
--
Gitblit v1.8.0