66 【公会】基础主体-服务端（跨服公会所有基本功能支持、跨服砍价支持；修改查看目标公会、查看目标玩家方式；）

hxp

5 天以前 bc5f3f1c88d225109fa39a85b209ef13f5fb52a9

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/CrossMsg.py

@@ -22,6 +22,7 @@
import NetPackCommon

import ChServerToServerPyPack

from GM import GMShell

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()

@@ -184,7 +197,7 @@
                elif msgType == ShareDefine.C2S_FamilyPyPackRet:

                    PlayerFamily.C2S_FamilyPyPackRet(dataMsg, playerID)

                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()))