From fd1197fd91110938802a68d998e6f45bb65495ed Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 二月 2026 20:12:07 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(公会讨伐支持跨服;test_OnDay等命令支持跨服同步过天等;)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.py | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.py
index 56f9470..4b32228 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/CreateFamily.py
@@ -33,37 +33,18 @@
GameWorld.DebugAnswer(curPlayer, "本服公会未互通")
return []
-def OnExec(curPlayer, gmList):
- ## 游戏服执行命令
-
- isMainServer = GameWorld.IsMainServer()
+def OnExecCross(crossPlayer, gmList):
if not gmList:
- if not isMainServer:
- return
- GameWorld.DebugAnswer(curPlayer, "-----%s-----" % GameWorld.GetCurrentDataTimeStr())
- GameWorld.DebugAnswer(curPlayer, "创建假人公会: CreatFamily 个数 [总战力 ServerID 等级 成员数 是否审核 官职限制]")
- GameWorld.DebugAnswer(curPlayer, "删除假人公会: CreatFamily 0")
- GameWorld.DebugAnswer(curPlayer, "输出公会列表: CreatFamily pl [条数 从第x名]")
- GameWorld.DebugAnswer(curPlayer, "输出公会明细: CreatFamily pf 公会ID")
- GameWorld.DebugAnswer(curPlayer, "添加假申请人: CreatFamily sq [申请数 公会ID]")
- GameWorld.DebugAnswer(curPlayer, "添加公会成员: CreatFamily m 人数 [公会ID]")
+ return
+ if GameWorld.IsMainServer() and DBDataMgr.GetFamilyMgr().GetCurCrossServerID():
+ # 本服公会已互通不再执行本服命令
return
- if isMainServer:
- crossServerID = DBDataMgr.GetFamilyMgr().GetCurCrossServerID()
- if crossServerID:
- # 本服公会已互通不再执行本服命令
- return
-
- crossPlayer = CrossPlayer.GetCrossPlayerMgr().FindCrossPlayer(curPlayer.GetPlayerID())
- if not crossPlayer:
- return
-
+ playerID = crossPlayer.GetPlayerID()
+ familyMgr = DBDataMgr.GetFamilyMgr()
+ familyID = familyMgr.GetPlayerFamilyID(playerID)
+ zoneID = familyMgr.GetFamilyZoneID(familyID)
if GameWorld.IsCrossServer():
- playerID = crossPlayer.GetPlayerID()
- familyMgr = DBDataMgr.GetFamilyMgr()
- familyID = familyMgr.GetPlayerFamilyID(playerID)
- zoneID = familyMgr.GetFamilyZoneID(familyID)
GameWorld.DebugAnswer(crossPlayer, "跨服公会ID:%s,zoneID=%s" % (familyID, zoneID))
value1 = gmList[0]
@@ -90,6 +71,25 @@
__createFackFamily(crossPlayer, gmList)
return
+def OnExec(curPlayer, gmList):
+ ## 游戏服执行命令
+ if not gmList:
+ GameWorld.DebugAnswer(curPlayer, "-----%s-----" % GameWorld.GetCurrentDataTimeStr())
+ GameWorld.DebugAnswer(curPlayer, "创建假人公会: CreatFamily 个数 [总战力 ServerID 等级 成员数 是否审核 官职限制]")
+ GameWorld.DebugAnswer(curPlayer, "删除假人公会: CreatFamily 0")
+ GameWorld.DebugAnswer(curPlayer, "输出公会列表: CreatFamily pl [条数 从第x名]")
+ GameWorld.DebugAnswer(curPlayer, "输出公会明细: CreatFamily pf 公会ID")
+ GameWorld.DebugAnswer(curPlayer, "添加假申请人: CreatFamily sq [申请数 公会ID]")
+ GameWorld.DebugAnswer(curPlayer, "添加公会成员: CreatFamily m 人数 [公会ID]")
+ return
+
+ crossPlayer = CrossPlayer.GetCrossPlayerMgr().FindCrossPlayer(curPlayer.GetPlayerID())
+ if not crossPlayer:
+ return
+
+ OnExecCross(crossPlayer, gmList)
+ return
+
def __addFackMember(crossPlayer, gmList):
memCnt = gmList[1] if len(gmList) > 1 else 1
familyID = gmList[2] if len(gmList) > 2 else crossPlayer.GetFamilyID()
--
Gitblit v1.8.0