5424 【后端】【1.4】跨服竞技场开发（修复非匹配期间无法加日常活跃修行bug）

hxp

2018-12-29 b78aa5487fb989a8dd373ce4b320a15087aeedbc

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -8226,6 +8226,7 @@
    Job = 0    #(BYTE Job)

    LV = 0    #(WORD LV)

    MaxHP = 0    #(DWORD MaxHP)// 默认满血

    MaxProDef = 0    #(DWORD MaxProDef)// 最大护盾

    data = None



    def __init__(self):

@@ -8240,6 +8241,7 @@
        self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.MaxHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        self.MaxProDef,_pos = CommFunc.ReadDWORD(_lpData, _pos)

        return _pos



    def Clear(self):

@@ -8249,6 +8251,7 @@
        self.Job = 0

        self.LV = 0

        self.MaxHP = 0

        self.MaxProDef = 0

        return



    def GetLength(self):

@@ -8258,6 +8261,7 @@
        length += len(self.PlayerName)

        length += 1

        length += 2

        length += 4

        length += 4



        return length

@@ -8270,6 +8274,7 @@
        data = CommFunc.WriteBYTE(data, self.Job)

        data = CommFunc.WriteWORD(data, self.LV)

        data = CommFunc.WriteDWORD(data, self.MaxHP)

        data = CommFunc.WriteDWORD(data, self.MaxProDef)

        return data



    def OutputString(self):

@@ -8279,7 +8284,8 @@
                                PlayerName:%s,

                                Job:%d,

                                LV:%d,

                                MaxHP:%d

                                MaxHP:%d,

                                MaxProDef:%d

                                '''\

                                %(

                                self.PlayerID,

@@ -8287,7 +8293,8 @@
                                self.PlayerName,

                                self.Job,

                                self.LV,

                                self.MaxHP

                                self.MaxHP,

                                self.MaxProDef

                                )

        return DumpString



@@ -8297,6 +8304,7 @@
    RoomID = 0    #(WORD RoomID)// 房间ID

    NameLen = 0    #(BYTE NameLen)

    PlayerName = ""    #(String PlayerName)// 跨服名字

    Number = 0    #(BYTE Number)// 位置编号；1-左，2-右

    MatchPlayerCount = 0    #(BYTE MatchPlayerCount)

    MatchPlayer = list()    #(vector<tagGCCrossRealmPKMatchPlayer> MatchPlayer)// 匹配到的玩家

    data = None

@@ -8313,6 +8321,7 @@
        self.RoomID,_pos = CommFunc.ReadWORD(_lpData, _pos)

        self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        self.PlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)

        self.Number,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        self.MatchPlayerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)

        for i in range(self.MatchPlayerCount):

            temMatchPlayer = tagGCCrossRealmPKMatchPlayer()

@@ -8328,6 +8337,7 @@
        self.RoomID = 0

        self.NameLen = 0

        self.PlayerName = ""

        self.Number = 0

        self.MatchPlayerCount = 0

        self.MatchPlayer = list()

        return

@@ -8338,6 +8348,7 @@
        length += 2

        length += 1

        length += len(self.PlayerName)

        length += 1

        length += 1

        for i in range(self.MatchPlayerCount):

            length += self.MatchPlayer[i].GetLength()

@@ -8350,6 +8361,7 @@
        data = CommFunc.WriteWORD(data, self.RoomID)

        data = CommFunc.WriteBYTE(data, self.NameLen)

        data = CommFunc.WriteString(data, self.NameLen, self.PlayerName)

        data = CommFunc.WriteBYTE(data, self.Number)

        data = CommFunc.WriteBYTE(data, self.MatchPlayerCount)

        for i in range(self.MatchPlayerCount):

            data = CommFunc.WriteString(data, self.MatchPlayer[i].GetLength(), self.MatchPlayer[i].GetBuffer())

@@ -8361,6 +8373,7 @@
                                RoomID:%d,

                                NameLen:%d,

                                PlayerName:%s,

                                Number:%d,

                                MatchPlayerCount:%d,

                                MatchPlayer:%s

                                '''\

@@ -8369,6 +8382,7 @@
                                self.RoomID,

                                self.NameLen,

                                self.PlayerName,

                                self.Number,

                                self.MatchPlayerCount,

                                "..."

                                )

@@ -26834,6 +26848,7 @@
                  ("SeasonID", c_ushort),    # 赛季ID

                  ("Order", c_ushort),    # 名次

                  ("DanLV", c_ubyte),    # 段位

                  ("Score", c_int),    # 积分

                  ("AwardLV", c_ubyte),    # 赛季结算奖励等级，比如王者法宝的属性取该等级对应属性

                  ]



@@ -26850,6 +26865,7 @@
        self.SeasonID = 0

        self.Order = 0

        self.DanLV = 0

        self.Score = 0

        self.AwardLV = 0

        return



@@ -26864,12 +26880,14 @@
                                SeasonID:%d,

                                Order:%d,

                                DanLV:%d,

                                Score:%d,

                                AwardLV:%d

                                '''\

                                %(

                                self.SeasonID,

                                self.Order,

                                self.DanLV,

                                self.Score,

                                self.AwardLV

                                )

        return DumpString