From a0dd1dc92bb2f6eb7067a624df20a9c326ecde87 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 06 二月 2026 22:14:54 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（修改A619，A523封包结构；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.py | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.py
index e683567..4440d86 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossPlayer.py
@@ -26,6 +26,7 @@
import IPY_GameObj
import CrossMsg
import ChConfig
+import CommFunc
class CrossPlayerObj():
## 跨服在线玩家实例，不入库，由游戏服玩家登录同步，当做以前GameServer的Player处理，跨服及游戏服本服通用，方便统一逻辑
@@ -54,7 +55,7 @@
self.SetServerID(curCache.GetServerID())
self.SetMainServerID(fromServerID)
self.SetRealmLV(curCache.GetRealmLV())
- # familyID 由公会模块管理
+ self.SetFamilyID(curCache.GetFamilyID())
return
def GetPlayer(self): return self.__curPlayer
@@ -177,9 +178,9 @@
if not crossServerPlayerDict:
return
- packBuff, packLen = clientPack.GetBuffer(), clientPack.GetLength()
+ packBuff, packLen, packHead = clientPack.GetBuffer(), clientPack.GetLength(), CommFunc.GetPackHead(clientPack)
for mainServerID, playerIDList in crossServerPlayerDict.items():
- dataMsg = {"playerIDList":playerIDList, "packBuff":packBuff, "packLen":packLen}
+ dataMsg = {"playerIDList":playerIDList, "packBuff":packBuff, "packLen":packLen, "packHead":packHead}
playerID = playerIDList[0]
CrossMsg.SendToClientServer(ShareDefine.C2S_SendFakePack, dataMsg, [mainServerID], playerID)
@@ -202,8 +203,17 @@
playerID = crossPlayer.GetPlayerID()
packBuff, packLen = clientPack.GetBuffer(), clientPack.GetLength()
- dataMsg = {"playerIDList":[playerID], "packBuff":packBuff, "packLen":packLen}
+ dataMsg = {"playerIDList":[playerID], "packBuff":packBuff, "packLen":packLen, "packHead":CommFunc.GetPackHead(clientPack)}
CrossMsg.SendToClientServer(ShareDefine.C2S_SendFakePack, dataMsg, [mainServerID], playerID)
+ return
+
+def SendFakePackByID(playerID, clientPack, fromServerID=0):
+ if not clientPack:
+ return
+ packBuff, packLen = clientPack.GetBuffer(), clientPack.GetLength()
+ dataMsg = {"playerIDList":[playerID], "packBuff":packBuff, "packLen":packLen, "packHead":CommFunc.GetPackHead(clientPack)}
+ CrossMsg.SendToClientServer(ShareDefine.C2S_SendFakePack, dataMsg, [fromServerID], playerID)
+ CrossMsg.SendToServer(ShareDefine.C2S_SendFakePack, dataMsg, [fromServerID], ShareDefine.dirType_All, playerID)
return
def C2S_SendFakePack(dataMsg):
@@ -232,16 +242,58 @@
#本游戏服又没有玩家的不处理
return
playerID = crossPlayer.GetPlayerID()
- dataMsg = {"msgMark":msgMark, "msgParamList":msgParamList}
+ dataMsg = {"playerIDList":[playerID], "msgMark":msgMark, "msgParamList":msgParamList}
CrossMsg.SendToClientServer(ShareDefine.C2S_NotifyCode, dataMsg, [mainServerID], playerID)
return
-def C2S_NotifyCode(dataMsg, playerID):
+def FamilyNotify(familyID, msgMark, msgParamList=[], excludeIDList=[]):
+ family = DBDataMgr.GetFamilyMgr().FindFamily(familyID)
+ if not family:
+ return
+
+ curServerID = GameWorld.GetGameWorld().GetServerID()
+ crossServerPlayerDict = {}
+ crossPlayerMgr = GetCrossPlayerMgr()
+ for index in range(family.GetCount()):
+ member = family.GetAt(index)
+ playerID = member.GetPlayerID()
+ if excludeIDList and playerID in excludeIDList:
+ continue
+ crossPlayer = crossPlayerMgr.FindCrossPlayer(playerID)
+ if not crossPlayer:
+ # 不在线
+ continue
+ curPlayer = crossPlayer.GetPlayer()
+ if curPlayer: # 有玩家，一般只有游戏服有，可视为游戏服在线，直接发送
+ PlayerControl.NotifyCode(curPlayer, msgMark, msgParamList)
+ continue
+ mainServerID = crossPlayer.GetMainServerID()
+ if mainServerID == curServerID:
+ #本游戏服又没有玩家的不处理
+ continue
+ if mainServerID not in crossServerPlayerDict:
+ crossServerPlayerDict[mainServerID] = []
+ playerIDList = crossServerPlayerDict[mainServerID]
+ if playerID not in playerIDList:
+ playerIDList.append(playerID)
+
+ for mainServerID, playerIDList in crossServerPlayerDict.items():
+ dataMsg = {"playerIDList":playerIDList, "msgMark":msgMark, "msgParamList":msgParamList}
+ CrossMsg.SendToClientServer(ShareDefine.C2S_NotifyCode, dataMsg, [mainServerID])
+ return
+
+def C2S_NotifyCode(dataMsg):
msgMark = dataMsg["msgMark"]
msgParamList = dataMsg["msgParamList"]
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
- if curPlayer:
+ playerIDList = dataMsg["playerIDList"]
+
+ playerManager = GameWorld.GetPlayerManager()
+ for playerID in playerIDList:
+ curPlayer = playerManager.FindPlayerByID(playerID)
+ if curPlayer == None:
+ continue
PlayerControl.NotifyCode(curPlayer, msgMark, msgParamList)
+
return
def OnPlayerLogin(curPlayer):
@@ -414,8 +466,8 @@
if resetType != "":
centerEventValue = eventData.get("centerEventValue", 0)
playerEventValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_OnCrossEvent)
- centerEventTime = GameWorld.ChangeStrToDatetime("%s:%02d:%02d" % centerEventValue, ChConfig.TYPE_Time_Format_YmdHMS)
- playerEventTime = GameWorld.ChangeStrToDatetime("%s:%02d:%02d" % playerEventValue, ChConfig.TYPE_Time_Format_YmdHMS)
+ centerEventTime = GameWorld.ChangeStrToDatetime("%s" % centerEventValue, ChConfig.TYPE_Time_Format_YmdH)
+ playerEventTime = GameWorld.ChangeStrToDatetime("%s" % playerEventValue, ChConfig.TYPE_Time_Format_YmdH)
center_Day = centerEventTime.day
center_Month = centerEventTime.month
--
Gitblit v1.8.0