From 9d5ec7599f3abe0cebb76ce1df3c3b8c4e0aa51e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 11:40:15 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(跨服聊天;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Zhenbaoge.py |   96 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Zhenbaoge.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Zhenbaoge.py
index 6bb58c2..aaee7ab 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Zhenbaoge.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Zhenbaoge.py
@@ -17,6 +17,7 @@
 
 import ChConfig
 import GameWorld
+import CrossPlayer
 import PlayerControl
 import PlayerFamilyZhenbaoge
 import PlayerFamily
@@ -24,53 +25,43 @@
 import random
 import time
 
-## GM命令执行入口
-#  @param curPlayer 当前玩家
-#  @param msgList 参数列表 [addSkillID]
-#  @return None
-#  @remarks 函数详细说明.
-def OnExec(curPlayer, msgList):
-    
+def GetGMServerIDList(curPlayer):
+    ## 获取命令额外发送到其他服务器,如跨服
+    crossServerID = DBDataMgr.GetFamilyMgr().GetCurCrossServerID()
+    if crossServerID:
+        GameWorld.DebugAnswer(curPlayer, "本服公会已互通跨服ID:%s" % crossServerID)
+        return [crossServerID]
+    GameWorld.DebugAnswer(curPlayer, "本服公会未互通")
+    return []
+
+def OnExecCross(crossPlayer, msgList):
     if not msgList:
-        GameWorld.DebugAnswer(curPlayer, "重置仙盟珍宝阁: Zhenbaoge 0")
-        GameWorld.DebugAnswer(curPlayer, "重置今日状态值: Zhenbaoge d")
-        GameWorld.DebugAnswer(curPlayer, "设置退仙盟时间: Zhenbaoge ft x分钟前")
-        GameWorld.DebugAnswer(curPlayer, "新增假砍价数据: Zhenbaoge 次数 [随机A值 至B值]")
-        GameWorld.DebugAnswer(curPlayer, "AB值没有填则按常规砍价价格计算")
+        return
+    if GameWorld.IsMainServer() and DBDataMgr.GetFamilyMgr().GetCurCrossServerID():
+        # 本服公会已互通不再执行本服命令
         return
     
-    familyID = curPlayer.GetFamilyID()
-    if not familyID:
-        GameWorld.DebugAnswer(curPlayer, "没有仙盟")
-        return
-    curFamily = DBDataMgr.GetFamilyMgr().FindFamily(familyID)
+    familyID = crossPlayer.GetFamilyID()
+    familyMgr = DBDataMgr.GetFamilyMgr()
+    curFamily = familyMgr.FindFamily(familyID)
     if not curFamily:
+        GameWorld.DebugAnswer(crossPlayer, "玩家未加入公会!")
         return
     
+    if GameWorld.IsCrossServer():
+        zoneID = familyMgr.GetFamilyZoneID(familyID)
+        GameWorld.DebugAnswer(crossPlayer, "跨服公会ID:%s,zoneID=%s" % (familyID, zoneID))
+        
     value1 = msgList[0]
     if value1 == 0:
         PlayerFamilyZhenbaoge.OnZhenbaogeReset(curFamily)
-        GameWorld.DebugAnswer(curPlayer, "重置仙盟珍宝阁OK")
-        return
-        
-    elif value1 == "d":
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyZhenbaogeCut, 0)
-        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyZhenbaogeBuy, 0)
-        PlayerFamilyZhenbaoge.Sync_ZhenbaogeInfo(curPlayer)
-        GameWorld.DebugAnswer(curPlayer, "重置珍宝阁玩家今日状态OK")
-        return
-    
-    elif value1 == "ft":
-        minutes = msgList[1] if len(msgList) > 1 else 0
-        leaveFamilyTimeEx = int(time.time()) - minutes * 60
-        PlayerControl.SetLeaveFamilyTimeEx(curPlayer, leaveFamilyTimeEx)
-        GameWorld.DebugAnswer(curPlayer, "设置退仙盟时间:%s" % GameWorld.ChangeTimeNumToStr(leaveFamilyTimeEx))
+        GameWorld.DebugAnswer(crossPlayer, "重置公会珍宝阁OK")
         return
     
     #添加假砍价
     gActionData = PlayerFamilyZhenbaoge.GetZhenbaogeActionData(familyID, PlayerFamilyZhenbaoge.ActionGlobalID)
     if not gActionData:
-        GameWorld.DebugAnswer(curPlayer, "请先重置珍宝阁")
+        GameWorld.DebugAnswer(crossPlayer, "请先重置珍宝阁")
         return
     
     familyAction = DBDataMgr.GetFamilyActionMgr().GetFamilyAction(familyID, PlayerFamilyZhenbaoge.ActionType)
@@ -98,9 +89,44 @@
         actionData = PlayerFamilyZhenbaoge.AddCutPrice(familyID, playerID, playerName, cutPrice, gActionData, False)
         syncActionDataList.append(actionData)
         nowPrice = PlayerFamilyZhenbaoge.GetFAPriceFinal(gActionData)
-        GameWorld.DebugAnswer(curPlayer, "砍价人次:%s,砍价:%s,现价:%s" % (fackID % 1000, cutPrice, nowPrice))
+        GameWorld.DebugAnswer(crossPlayer, "砍价人次:%s,砍价:%s,现价:%s" % (fackID % 1000, cutPrice, nowPrice))
         
     PlayerFamily.SendFamilyAction(syncActionDataList)
     nowPrice = PlayerFamilyZhenbaoge.GetFAPriceFinal(gActionData)
-    GameWorld.DebugAnswer(curPlayer, "添加假砍价数:%s,总砍价数:%s,当前价格:%s" % (fackCount, familyAction.Count() - 1, nowPrice))
+    GameWorld.DebugAnswer(crossPlayer, "添加假砍价数:%s,总砍价数:%s,当前价格:%s" % (fackCount, familyAction.Count() - 1, nowPrice))
+    return
+
+def OnExec(curPlayer, msgList):
+    
+    if not msgList:
+        GameWorld.DebugAnswer(curPlayer, "-----%s-----" % GameWorld.GetCurrentDataTimeStr())
+        GameWorld.DebugAnswer(curPlayer, "重置公会珍宝阁: Zhenbaoge 0")
+        GameWorld.DebugAnswer(curPlayer, "重置今日状态值: Zhenbaoge d")
+        GameWorld.DebugAnswer(curPlayer, "设置退公会时间: Zhenbaoge ft x分钟前")
+        GameWorld.DebugAnswer(curPlayer, "新增假砍价数据: Zhenbaoge 次数 [随机A值 至B值]")
+        GameWorld.DebugAnswer(curPlayer, "AB值没有填则按常规砍价价格计算")
+        return
+    
+    crossPlayer = CrossPlayer.GetCrossPlayerMgr().FindCrossPlayer(curPlayer.GetPlayerID())
+    if not crossPlayer:
+        return
+    
+    value1 = msgList[0]
+    
+    # 默认本服执行的
+    if value1 == "d":
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyZhenbaogeCut, 0)
+        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyZhenbaogeBuy, 0)
+        PlayerFamilyZhenbaoge.Sync_ZhenbaogeInfo(curPlayer)
+        GameWorld.DebugAnswer(curPlayer, "重置珍宝阁玩家今日状态OK")
+        return
+    
+    elif value1 == "ft":
+        minutes = msgList[1] if len(msgList) > 1 else 0
+        leaveFamilyTimeEx = int(time.time()) - minutes * 60
+        PlayerControl.SetLeaveFamilyTimeEx(curPlayer, leaveFamilyTimeEx)
+        GameWorld.DebugAnswer(curPlayer, "设置退公会时间:%s" % GameWorld.ChangeTimeNumToStr(leaveFamilyTimeEx))
+        return
+    
+    OnExecCross(crossPlayer, msgList)
     return

--
Gitblit v1.8.0