From c280ced8be799a899efc78b21cc807d435ab6609 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 19:34:03 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（退出公会时间根据当前是否互通取对应的本服或跨服时间；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py
index 8d16fc5..3bb86cd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py
@@ -21,7 +21,8 @@
import ShareDefine
import NetPackCommon
import ChServerToServerPyPack
-from GM import GMShell
+import PlayerFamilyTaofa
+import PlayerViewCache
import PlayerFamily
import CrossPlayer
import TurnAttack
@@ -39,6 +40,8 @@
#if not dataMsg:
# return
logData = "" if msgType in ShareDefine.NoLogDataSSMsgTypes else dataMsg
+ if msgType == ShareDefine.S2C_FamilyPyPack:
+ logData = "%s%s" % (dataMsg["funcName"], logData)
GameWorld.Log("SendToCrossServer => %s, %s, %s" % (msgType, serverIDList, logData), playerID)
SendToServer(msgType, dataMsg, serverIDList, ShareDefine.dirType_Cross, playerID, isLog=False)
return
@@ -53,6 +56,8 @@
#if not dataMsg:
# return
logData = "" if msgType in ShareDefine.NoLogDataSSMsgTypes else dataMsg
+ if msgType == ShareDefine.C2S_SendFakePack:
+ logData = "%s%s" % (dataMsg["packHead"], logData)
GameWorld.Log("SendToClientServer => %s, %s, %s" % (msgType, serverIDList, logData), playerID)
SendToServer(msgType, dataMsg, serverIDList, ShareDefine.dirType_Main, playerID, isLog=False) # 默认发给主服即可
return
@@ -144,6 +149,10 @@
dataMsg = cPickle.loads(recvMsg)
logData = "" if msgType in ShareDefine.NoLogDataSSMsgTypes else str(dataMsg)
+ if msgType == ShareDefine.C2S_SendFakePack:
+ logData = "%s%s" % (dataMsg["packHead"], logData)
+ elif msgType == ShareDefine.S2C_FamilyPyPack:
+ logData = "%s%s" % (dataMsg["funcName"], logData)
GameWorld.Log("OnSSRecvMsg => %s, fromServerID=%s, %s,time=%s" % (msgType, fromServerID, logData, time.time()), playerID)
# 所有类型服务器均可能收到的信息
@@ -151,6 +160,10 @@
TurnAttack.S2B_BattleRequest(dataMsg, fromServerID, msgType)
elif msgType == ShareDefine.B2S_BattleResult: # 战斗结果
TurnAttack.B2S_BattleResult(dataMsg, fromServerID, msgType)
+ elif msgType == ShareDefine.S2S_ViewTagFamily: # 查看目标公会
+ PlayerFamily.S2S_ViewTagFamily(dataMsg, fromServerID, playerID)
+ elif msgType == ShareDefine.S2S_ViewTagPlayer: # 查看目标玩家
+ PlayerViewCache.S2S_ViewTagPlayer(dataMsg, fromServerID, playerID)
else:
curServerType = GameWorld.GetServerType()
@@ -168,8 +181,6 @@
DBFamily.S2C_FamilyData(dataMsg, fromServerID)
elif msgType == ShareDefine.S2C_FamilyPyPack: # 公会功能玩家请求py包转发
PlayerFamily.S2C_FamilyPyPack(dataMsg, fromServerID, playerID)
- elif msgType == ShareDefine.S2C_GMCMD:
- GMShell.S2C_GMCMD(dataMsg, fromServerID, playerID)
# 游戏服务器要处理的消息
elif curServerType == ShareDefine.serverType_Main:
@@ -183,8 +194,10 @@
PlayerFamily.C2S_FamilyMapPlayer(dataMsg, playerID)
elif msgType == ShareDefine.C2S_FamilyPyPackRet:
PlayerFamily.C2S_FamilyPyPackRet(dataMsg, playerID)
+ elif msgType == ShareDefine.C2S_TaofaMemContrib:
+ PlayerFamilyTaofa.C2S_TaofaMemContrib(dataMsg)
elif msgType == ShareDefine.C2S_NotifyCode:
- CrossPlayer.C2S_NotifyCode(dataMsg, playerID)
+ CrossPlayer.C2S_NotifyCode(dataMsg)
elif msgType == ShareDefine.C2S_SendFakePack:
CrossPlayer.C2S_SendFakePack(dataMsg)
elif msgType == ShareDefine.C2S_CostPlayerResources:
@@ -195,6 +208,8 @@
CrossPlayer.C2S_SetPlayerNomalDict(dataMsg, playerID)
elif msgType == ShareDefine.C2S_SendPlayerMail:
PlayerMail.C2S_SendPlayerMail(dataMsg, playerID)
+ elif msgType == ShareDefine.C2S_GMDebugAnswer:
+ GameWorld.C2S_GMDebugAnswer(dataMsg, playerID)
except:
GameWorld.RaiseException("服务器接收信息处理报错 \r\n%s" % str(traceback.format_exc()))
--
Gitblit v1.8.0