hxp
2023-12-22 5896b6c781258dc372a525ec307589af1ab23749
10050 【后端】角色(Face相关处理)
11个文件已修改
115 ■■■■ 已修改文件
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -9037,6 +9037,7 @@
    OnlineType = 0    #(BYTE OnlineType)//在线状态, 0 不在线 1在线
    IsInTeam = 0    #(BYTE IsInTeam)//是否有队伍
    ServerGroupID = 0    #(DWORD ServerGroupID)//服务器组ID
    Face = 0    #(DWORD Face)//基本脸型
    data = None
    def __init__(self):
@@ -9056,6 +9057,7 @@
        self.OnlineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.IsInTeam,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.ServerGroupID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        return _pos
    def Clear(self):
@@ -9071,6 +9073,7 @@
        self.OnlineType = 0
        self.IsInTeam = 0
        self.ServerGroupID = 0
        self.Face = 0
        return
    def GetLength(self):
@@ -9083,6 +9086,7 @@
        length += 2
        length += 1
        length += 1
        length += 4
        length += 4
        return length
@@ -9098,6 +9102,7 @@
        data = CommFunc.WriteBYTE(data, self.OnlineType)
        data = CommFunc.WriteBYTE(data, self.IsInTeam)
        data = CommFunc.WriteDWORD(data, self.ServerGroupID)
        data = CommFunc.WriteDWORD(data, self.Face)
        return data
    def OutputString(self):
@@ -9110,7 +9115,8 @@
                                RealmLV:%d,
                                OnlineType:%d,
                                IsInTeam:%d,
                                ServerGroupID:%d
                                ServerGroupID:%d,
                                Face:%d
                                '''\
                                %(
                                self.Head.OutputString(),
@@ -9121,7 +9127,8 @@
                                self.RealmLV,
                                self.OnlineType,
                                self.IsInTeam,
                                self.ServerGroupID
                                self.ServerGroupID,
                                self.Face
                                )
        return DumpString
@@ -9196,6 +9203,7 @@
    LV = 0    #(WORD LV)//等级
    RealmLV = 0    #(WORD RealmLV)//境界
    OnlineType = 0    #(BYTE OnlineType)//0不在线 1在线 2脱机在线
    Face = 0    #(DWORD Face)//基本脸型
    data = None
    def __init__(self):
@@ -9210,6 +9218,7 @@
        self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
        self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
        self.OnlineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        return _pos
    def Clear(self):
@@ -9219,6 +9228,7 @@
        self.LV = 0
        self.RealmLV = 0
        self.OnlineType = 0
        self.Face = 0
        return
    def GetLength(self):
@@ -9229,6 +9239,7 @@
        length += 2
        length += 2
        length += 1
        length += 4
        return length
@@ -9240,6 +9251,7 @@
        data = CommFunc.WriteWORD(data, self.LV)
        data = CommFunc.WriteWORD(data, self.RealmLV)
        data = CommFunc.WriteBYTE(data, self.OnlineType)
        data = CommFunc.WriteDWORD(data, self.Face)
        return data
    def OutputString(self):
@@ -9249,7 +9261,8 @@
                                Job:%d,
                                LV:%d,
                                RealmLV:%d,
                                OnlineType:%d
                                OnlineType:%d,
                                Face:%d
                                '''\
                                %(
                                self.PlayerID,
@@ -9257,7 +9270,8 @@
                                self.Job,
                                self.LV,
                                self.RealmLV,
                                self.OnlineType
                                self.OnlineType,
                                self.Face
                                )
        return DumpString
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -715,7 +715,6 @@
        
    elif packType == IPY_GameServer.CDBPlayerRefresh_LV:
        curPlayer.SetLV(packValue)
        PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
        #玩家等级记录
        playerID = curPlayer.GetID()
        if playerID in PyGameData.g_todayPlayerLVDict:
@@ -765,10 +764,14 @@
    
    elif packType == IPY_GameServer.CDBPlayerRefresh_OfficialRank:
        curPlayer.SetOfficialRank(packValue)
        PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
        #更新排行榜的境界
        PlayerBillboard.UpdateBillboardRealm(curPlayer)
    elif packType == IPY_GameServer.CDBPlayerRefresh_Face:
        curPlayer.SetFace(packValue)
        PlayerBillboard.UpdateBillboardFace(curPlayer)
        
    #社交信息
    PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
    #组队成员刷新
    PlayerTeam.PlayerTeamMemberRefresh(curPlayer, packType, packValue, tick)
    #家族刷新
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
@@ -524,10 +524,11 @@
def GetBillboardOperateInfo(curPlayer):
    # 排行榜中所保存的运营商相关信息
    platform = curPlayer.GetAccID()
    if platform in ["tencent"]:
        return curPlayer.GetOperateInfo()
    return platform
    return curPlayer.GetFace()
#    platform = curPlayer.GetAccID()
#    if platform in ["tencent"]:
#        return curPlayer.GetOperateInfo()
#    return platform
def UpdatePlayerBillboardEx(curPlayer, playerID, bType, cmpValue, cmpValue2=0, cmpValue3=0, value1=0, value2=0, autoSort=False):
    ## 更新玩家排行榜
@@ -826,3 +827,24 @@
        
    return
def UpdateBillboardFace(curPlayer):
    ## 更新排行榜中的玩家头像
    curPlayerID = curPlayer.GetID()
    curFace = curPlayer.GetFace()
    billboardMgr = GameWorld.GetBillboard()
    for billboardIndex in ShareDefine.BillboardTypeList:
        billBoard = billboardMgr.FindBillboard(billboardIndex)
        if not billBoard:
            #找不到这类型排行榜
            continue
        playerBillBoardData = billBoard.FindByID(curPlayerID)
        if not playerBillBoardData:
            #该玩家没有在排行榜上
            continue
        playerBillBoardData.SetName2(str(curFace))
    return
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py
@@ -2077,7 +2077,7 @@
    curMember.SetLV(curPlayer.GetLV())
    curMember.SetReincarnationLv(curPlayer.GetReincarnationLv())
    curMember.SetJob(curPlayer.GetJob())
    curMember.SetOperateInfo(curPlayer.GetOperateInfo())
    curMember.SetOperateInfo(curPlayer.GetFace()) #curPlayer.GetOperateInfo()
    curMember.SetOfficialRank(curPlayer.GetOfficialRank())
    return
#---------------------------------------------------------------------
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py
@@ -841,6 +841,7 @@
        self.playerInfo.LV = curPlayer.GetLV()
        self.playerInfo.RealmLV = curPlayer.GetOfficialRank()
        self.playerInfo.OnlineType = 1      # 0 不在线  1 在线 2 脱机在线  
        self.playerInfo.Face = curPlayer.GetFace()
        if not self.playerInfo.RefCount:
            self.playerInfo.RefCount = 1
        return
@@ -853,6 +854,7 @@
        packStruct.LV = self.playerInfo.LV
        packStruct.RealmLV = self.playerInfo.RealmLV
        packStruct.OnlineType = self.playerInfo.OnlineType
        packStruct.Face = self.playerInfo.Face
        return packStruct
    
    # 更新玩家数据引用, 根据需求是否更新玩家数据
@@ -900,6 +902,7 @@
            playerSocial.LV = 1
            playerSocial.RealmLV = 1
            playerSocial.OnlineType = ChConfig.Def_Offline
            playerSocial.Face = 0
        else:
            cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)
    
@@ -910,6 +913,7 @@
            playerSocial.LV = cacheDict["LV"]
            playerSocial.RealmLV = cacheDict["RealmLV"]
            playerSocial.OnlineType = ChConfig.Def_Offline
            playerSocial.Face = cacheDict.get("Face", 0)
            
        self.SocialInfo[playerID] = SocialPlayerData(playerSocial)
        socialPlayer = self.SocialInfo[playerID]
@@ -1081,7 +1085,11 @@
        socialPlayer.playerInfo.RealmLV = value
    elif notifyType == IPY_PlayerDefine.CDBPlayerRefresh_PlayerName:
        socialPlayer.playerInfo.PlayerName = value
    elif notifyType == IPY_PlayerDefine.CDBPlayerRefresh_Face:
        socialPlayer.playerInfo.Face = value
    else:
        return
    Notify_All(playerID, notifyType, value)
    return
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
@@ -467,7 +467,8 @@
        coupleName = couple.GetCoupleName(playerID)
        coupleJob = couple.GetCoupleJob(playerID)
        bridePriceMaxID = couple.BridePriceMaxID
    extraValueStr = "%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID)
    face = player.GetFace()
    extraValueStr = "%s|%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID, face)
    return extraValueStr
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.py
@@ -319,6 +319,7 @@
            answerPack.RealmLV = 1
            answerPack.OnlineType = ChConfig.Def_Offline
            answerPack.ServerGroupID = 0
            answerPack.Face = 0
        else:
            cacheDict = GetCachePropDataDict(curCache)
            answerPack.PlayerID = clientPack.PlayerID
@@ -327,6 +328,7 @@
            answerPack.LV = cacheDict["LV"]
            answerPack.RealmLV = cacheDict["RealmLV"]
            answerPack.OnlineType = ChConfig.Def_Offline
            answerPack.Face = cacheDict.get("Face", 0)
            
            if GameWorld.IsCrossServer():
                answerPack.ServerGroupID = cacheDict.get("ServerGroupID", 0)
@@ -341,6 +343,7 @@
        answerPack.OnlineType = ChConfig.Def_Online
        answerPack.IsInTeam = tagPlayer.GetTeamID() > 0
        answerPack.ServerGroupID = PlayerControl.GetPlayerServerGroupID(tagPlayer)
        answerPack.Face = tagPlayer.GetFace()
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    NetPackCommon.SendFakePack(curPlayer, answerPack)
ServerPython/CoreServerGroup/GameServer/Script/PyGameDataStruct.py
@@ -2303,6 +2303,7 @@
        ('RealmLV', ctypes.c_ushort),
        ('OnlineType', ctypes.c_ubyte),
        ('RefCount', ctypes.c_ulong),
        ('Face', ctypes.c_ulong),
        ('ADOResult', ctypes.c_ulong),
    ]
@@ -2327,6 +2328,7 @@
        self.RealmLV, pos = CommFunc.ReadWORD(buf, pos)
        self.OnlineType, pos = CommFunc.ReadBYTE(buf, pos)
        self.RefCount, pos = CommFunc.ReadDWORD(buf, pos)
        self.Face, pos = CommFunc.ReadDWORD(buf, pos)
        return self.getLength()
@@ -2347,6 +2349,7 @@
            RealmLV = %s,
            OnlineType = %s,
            RefCount = %s,
            Face = %s,
            ADOResult = %s,
            '''%(
                self.PlayerID,
@@ -2356,6 +2359,7 @@
                self.RealmLV,
                self.OnlineType,
                self.RefCount,
                self.Face,
                self.ADOResult,
            )
        return output
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -9037,6 +9037,7 @@
    OnlineType = 0    #(BYTE OnlineType)//在线状态, 0 不在线 1在线
    IsInTeam = 0    #(BYTE IsInTeam)//是否有队伍
    ServerGroupID = 0    #(DWORD ServerGroupID)//服务器组ID
    Face = 0    #(DWORD Face)//基本脸型
    data = None
    def __init__(self):
@@ -9056,6 +9057,7 @@
        self.OnlineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.IsInTeam,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.ServerGroupID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        return _pos
    def Clear(self):
@@ -9071,6 +9073,7 @@
        self.OnlineType = 0
        self.IsInTeam = 0
        self.ServerGroupID = 0
        self.Face = 0
        return
    def GetLength(self):
@@ -9083,6 +9086,7 @@
        length += 2
        length += 1
        length += 1
        length += 4
        length += 4
        return length
@@ -9098,6 +9102,7 @@
        data = CommFunc.WriteBYTE(data, self.OnlineType)
        data = CommFunc.WriteBYTE(data, self.IsInTeam)
        data = CommFunc.WriteDWORD(data, self.ServerGroupID)
        data = CommFunc.WriteDWORD(data, self.Face)
        return data
    def OutputString(self):
@@ -9110,7 +9115,8 @@
                                RealmLV:%d,
                                OnlineType:%d,
                                IsInTeam:%d,
                                ServerGroupID:%d
                                ServerGroupID:%d,
                                Face:%d
                                '''\
                                %(
                                self.Head.OutputString(),
@@ -9121,7 +9127,8 @@
                                self.RealmLV,
                                self.OnlineType,
                                self.IsInTeam,
                                self.ServerGroupID
                                self.ServerGroupID,
                                self.Face
                                )
        return DumpString
@@ -9196,6 +9203,7 @@
    LV = 0    #(WORD LV)//等级
    RealmLV = 0    #(WORD RealmLV)//境界
    OnlineType = 0    #(BYTE OnlineType)//0不在线 1在线 2脱机在线
    Face = 0    #(DWORD Face)//基本脸型
    data = None
    def __init__(self):
@@ -9210,6 +9218,7 @@
        self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
        self.RealmLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
        self.OnlineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        return _pos
    def Clear(self):
@@ -9219,6 +9228,7 @@
        self.LV = 0
        self.RealmLV = 0
        self.OnlineType = 0
        self.Face = 0
        return
    def GetLength(self):
@@ -9229,6 +9239,7 @@
        length += 2
        length += 2
        length += 1
        length += 4
        return length
@@ -9240,6 +9251,7 @@
        data = CommFunc.WriteWORD(data, self.LV)
        data = CommFunc.WriteWORD(data, self.RealmLV)
        data = CommFunc.WriteBYTE(data, self.OnlineType)
        data = CommFunc.WriteDWORD(data, self.Face)
        return data
    def OutputString(self):
@@ -9249,7 +9261,8 @@
                                Job:%d,
                                LV:%d,
                                RealmLV:%d,
                                OnlineType:%d
                                OnlineType:%d,
                                Face:%d
                                '''\
                                %(
                                self.PlayerID,
@@ -9257,7 +9270,8 @@
                                self.Job,
                                self.LV,
                                self.RealmLV,
                                self.OnlineType
                                self.OnlineType,
                                self.Face
                                )
        return DumpString
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py
@@ -32,10 +32,11 @@
def GetBillboardOperateInfo(curPlayer):
    # 排行榜中所保存的运营商相关信息
    platform = curPlayer.GetAccID()
    if platform in ["tencent"]:
        return curPlayer.GetOperateInfo()
    return platform
    return curPlayer.GetFace()
#    platform = curPlayer.GetAccID()
#    if platform in ["tencent"]:
#        return curPlayer.GetOperateInfo()
#    return platform
def GetBillboardJob(curPlayer): return curPlayer.GetJob()
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
@@ -399,7 +399,8 @@
    coupleName = PlayerControl.GetCoupleName(objTalk)
    coupleJob = PlayerControl.GetCoupleJob(objTalk)
    bridePriceMaxID = PlayerControl.GetBridePriceMaxID(objTalk)
    extraValueStr = "%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID)
    face = objTalk.GetFace()
    extraValueStr = "%s|%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID, face)
    return extraValueStr