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/GameWorldLogic/FBLogic.py | 46 ----------------------------------------------
1 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
index 1e4d80c..d62bc5b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.py
@@ -18,11 +18,8 @@
import IPY_GameWorld
import PlayerControl
import GameWorldProcess
-import CrossRealmPlayer
import DataRecordPack
import ReadChConfig
-import ShareDefine
-import PyGameData
import FBCommon
import GameObj
@@ -482,36 +479,6 @@
def DoEnterFBLogic(curPlayer, tick):
curPlayerID = curPlayer.GetID()
- if GameWorld.IsCrossServer():
- mapID = GameWorld.GetMap().GetMapID()
- mapID = FBCommon.GetRecordMapID(mapID)
- gameWorld = GameWorld.GetGameWorld()
- copyMapID = gameWorld.GetCopyMapID()
- dataDict = {"PlayerID":curPlayer.GetPlayerID(), "PlayerName":curPlayer.GetPlayerName(), "AccID":curPlayer.GetAccID(),
- "recordMapID":mapID, "mapID":GameWorld.GetMap().GetMapID(), "realMapID":gameWorld.GetRealMapID(), "copyMapID":copyMapID}
- if mapID in ChConfig.Def_CrossDynamicLineMap:
- fbZoneID = FBCommon.GetCrossDynamicLineMapZoneID()
- fbFuncLineID = FBCommon.GetCrossDynamicLineMapFuncLineID()
- playerZoneID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqCrossFBZoneID)
- playerFuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqCrossFBFuncLine)
- # 跨服排位分区与玩家分区可能不一样
- if (fbZoneID != playerZoneID or fbFuncLineID != playerFuncLineID) and mapID not in []:
- GameWorld.ErrLog("DoEnterFB 玩家与当前副本线路所属分区或功能分线不同，踢出玩家！fbZoneID=%s,playerZoneID=%s,fbFuncLineID=%s,playerFuncLineID=%s"
- % (fbZoneID, playerZoneID, fbFuncLineID, playerFuncLineID), curPlayerID)
- CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
- dataDict.update({"Error":"zoneLineIDError"})
- DataRecordPack.SendEventPack("CrossFBEnter", dataDict, curPlayer)
- return
- GameWorld.Log("玩家进入跨服副本动态分配的线路: fbZoneID=%s,playerZoneID=%s,fbFuncLineID=%s,playerFuncLineID=%s"
- % (fbZoneID, playerZoneID, fbFuncLineID, playerFuncLineID), curPlayerID)
- dataDict.update({"fbZoneID":fbZoneID, "fbFuncLineID":fbFuncLineID, "playerZoneID":playerZoneID, "playerFuncLineID":playerFuncLineID})
-
- if copyMapID not in PyGameData.g_crossPlayerServerGroupIDInfo:
- PyGameData.g_crossPlayerServerGroupIDInfo[copyMapID] = {}
- playerServerGroupIDDict = PyGameData.g_crossPlayerServerGroupIDInfo[copyMapID]
- playerServerGroupIDDict[curPlayerID] = PlayerControl.GetPlayerServerGroupID(curPlayer)
- DataRecordPack.SendEventPack("CrossFBEnter", dataDict, curPlayer)
-
# 自伸缩副本根据玩家进入开启，主动调用一次，避免间隔调用时机未触发导致逻辑错乱
GameWorldProcess.EnterOpenFB(tick)
@@ -2235,19 +2202,6 @@
return True, funcLineID
return callFunc(curPlayer, mapID, funcLineID, tagType, tagID, valueList)
-
-def GetFBPlayerLineupID(curPlayer, mapID, funcLineID):
- ## 获取玩家使用的攻防阵容ID
- # @return: 攻击方阵容ID, 防守方阵容ID
- do_FBLogic_ID = __GetFBLogic_MapID(mapID)
-
- callFunc = GameWorld.GetExecFunc(FBProcess, "GameLogic_%s.%s" % (do_FBLogic_ID, "GetFBPlayerLineupID"))
-
- if callFunc == None:
- # 默认不限制
- return ShareDefine.Lineup_Main, ShareDefine.Lineup_Main
-
- return callFunc(curPlayer, mapID, funcLineID)
def GetFBNPCLineupInfo(curPlayer, mapID, funcLineID):
## 获取NPC阵容相关
--
Gitblit v1.8.0