6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（GivePlayerItem 默认都给非拍品）

hxp

2019-03-07 06af11e5d1bb4c8462ead020ccdb7431f9647754

 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py

@@ -7283,9 +7283,10 @@
    ClassLV = 0    #(BYTE ClassLV)//过滤阶数，0为不限制

    SpecItemIDCount = 0    #(BYTE SpecItemIDCount)//指定物品ID个数

    SpecItemIDList = list()    #(vector<DWORD> SpecItemIDList)//指定物品ID

    FromNum = 0    #(WORD FromNum)//查询起始数 （从1开始）

    FromItemGUID = ""    #(char FromItemGUID[40])//从哪个物品开始查询

    QueryDir = 0    #(BYTE QueryDir)//查询方向，1-往后查，2-往前查，3-定位查询

    QueryCount = 0    #(BYTE QueryCount)//查询个数，0为全部

    QueryTotalCount = 0    #(WORD QueryTotalCount)//查询条件实际总个数

    QueryRemainlCount = 0    #(WORD QueryRemainlCount)//查询条件对应查询方向剩余个数

    AuctionItemCount = 0    #(BYTE AuctionItemCount)//返回拍品数量

    AuctionItemList = list()    #(vector<tagGCAuctionItem> AuctionItemList)//返回拍品列表

    data = None

@@ -7309,9 +7310,10 @@
        for i in range(self.SpecItemIDCount):

            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)

            self.SpecItemIDList.append(value)

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

        self.FromItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)

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

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

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

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

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

        for i in range(self.AuctionItemCount):

            temAuctionItemList = tagGCAuctionItem()

@@ -7330,9 +7332,10 @@
        self.ClassLV = 0

        self.SpecItemIDCount = 0

        self.SpecItemIDList = list()

        self.FromNum = 0

        self.FromItemGUID = ""

        self.QueryDir = 0

        self.QueryCount = 0

        self.QueryTotalCount = 0

        self.QueryRemainlCount = 0

        self.AuctionItemCount = 0

        self.AuctionItemList = list()

        return

@@ -7346,7 +7349,8 @@
        length += 1

        length += 1

        length += 4 * self.SpecItemIDCount

        length += 2

        length += 40

        length += 1

        length += 1

        length += 2

        length += 1

@@ -7366,9 +7370,10 @@
        data = CommFunc.WriteBYTE(data, self.SpecItemIDCount)

        for i in range(self.SpecItemIDCount):

            data = CommFunc.WriteDWORD(data, self.SpecItemIDList[i])

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

        data = CommFunc.WriteString(data, 40, self.FromItemGUID)

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

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

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

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

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

        for i in range(self.AuctionItemCount):

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

@@ -7383,9 +7388,10 @@
                                ClassLV:%d,

                                SpecItemIDCount:%d,

                                SpecItemIDList:%s,

                                FromNum:%d,

                                FromItemGUID:%s,

                                QueryDir:%d,

                                QueryCount:%d,

                                QueryTotalCount:%d,

                                QueryRemainlCount:%d,

                                AuctionItemCount:%d,

                                AuctionItemList:%s

                                '''\

@@ -7397,9 +7403,10 @@
                                self.ClassLV,

                                self.SpecItemIDCount,

                                "...",

                                self.FromNum,

                                self.FromItemGUID,

                                self.QueryDir,

                                self.QueryCount,

                                self.QueryTotalCount,

                                self.QueryRemainlCount,

                                self.AuctionItemCount,

                                "..."

                                )

@@ -8191,15 +8198,78 @@




#------------------------------------------------------

# B5 08 拍卖行刷新拍品 #tagGCRefreshAuctionItem

# B5 08 拍卖行刷新拍品 #tagGCRefreshAuctionItemInfo



class  tagGCRefreshAuctionItem(Structure):

    Head = tagHead()

    ItemGUID = ""    #(char ItemGUID[40])

    AuctionType = 0    #(BYTE AuctionType)//拍品类型，0-全服拍品，1-仙盟拍品

    AddTime = ""    #(char AddTime[19])//上架时间

    BidderID = 0    #(DWORD BidderID)//最高竞拍玩家ID，也就是当前最高竞价玩家ID    

    BidderPrice = 0    #(DWORD BidderPrice)//最高竞拍价格

    data = None



    def __init__(self):

        self.Clear()

        return



    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

        self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)

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

        self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)

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

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

        return _pos



    def Clear(self):

        self.ItemGUID = ""

        self.AuctionType = 0

        self.AddTime = ""

        self.BidderID = 0

        self.BidderPrice = 0

        return



    def GetLength(self):

        length = 0

        length += 40

        length += 1

        length += 19

        length += 4

        length += 4



        return length



    def GetBuffer(self):

        data = ''

        data = CommFunc.WriteString(data, 40, self.ItemGUID)

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

        data = CommFunc.WriteString(data, 19, self.AddTime)

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

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

        return data



    def OutputString(self):

        DumpString = '''

                                ItemGUID:%s,

                                AuctionType:%d,

                                AddTime:%s,

                                BidderID:%d,

                                BidderPrice:%d

                                '''\

                                %(

                                self.ItemGUID,

                                self.AuctionType,

                                self.AddTime,

                                self.BidderID,

                                self.BidderPrice

                                )

        return DumpString





class  tagGCRefreshAuctionItemInfo(Structure):

    Head = tagHead()

    RefreshCount = 0    #(BYTE RefreshCount)

    RefreshAuctionItemList = list()    #(vector<tagGCRefreshAuctionItem> RefreshAuctionItemList)

    data = None



    def __init__(self):

@@ -8211,11 +8281,11 @@
    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

        _pos = self.Head.ReadData(_lpData, _pos)

        self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40)

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

        self.AddTime,_pos = CommFunc.ReadString(_lpData, _pos,19)

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

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

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

        for i in range(self.RefreshCount):

            temRefreshAuctionItemList = tagGCRefreshAuctionItem()

            _pos = temRefreshAuctionItemList.ReadData(_lpData, _pos)

            self.RefreshAuctionItemList.append(temRefreshAuctionItemList)

        return _pos



    def Clear(self):

@@ -8223,56 +8293,43 @@
        self.Head.Clear()

        self.Head.Cmd = 0xB5

        self.Head.SubCmd = 0x08

        self.ItemGUID = ""

        self.AuctionType = 0

        self.AddTime = ""

        self.BidderID = 0

        self.BidderPrice = 0

        self.RefreshCount = 0

        self.RefreshAuctionItemList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 40

        length += 1

        length += 19

        length += 4

        length += 4

        for i in range(self.RefreshCount):

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



        return length



    def GetBuffer(self):

        data = ''

        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())

        data = CommFunc.WriteString(data, 40, self.ItemGUID)

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

        data = CommFunc.WriteString(data, 19, self.AddTime)

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

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

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

        for i in range(self.RefreshCount):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                ItemGUID:%s,

                                AuctionType:%d,

                                AddTime:%s,

                                BidderID:%d,

                                BidderPrice:%d

                                RefreshCount:%d,

                                RefreshAuctionItemList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.ItemGUID,

                                self.AuctionType,

                                self.AddTime,

                                self.BidderID,

                                self.BidderPrice

                                self.RefreshCount,

                                "..."

                                )

        return DumpString





m_NAtagGCRefreshAuctionItem=tagGCRefreshAuctionItem()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCRefreshAuctionItem.Head.Cmd,m_NAtagGCRefreshAuctionItem.Head.SubCmd))] = m_NAtagGCRefreshAuctionItem

m_NAtagGCRefreshAuctionItemInfo=tagGCRefreshAuctionItemInfo()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCRefreshAuctionItemInfo.Head.Cmd,m_NAtagGCRefreshAuctionItemInfo.Head.SubCmd))] = m_NAtagGCRefreshAuctionItemInfo





#------------------------------------------------------

@@ -13725,70 +13782,57 @@




#------------------------------------------------------

# A3 09 通知玩家部位套装等级 #tagMCEquipPartSuiteLVInfo

# A3 B1 装备部位星数信息 #tagMCEquipPartStarInfo



class  tagMCEquipPartSuiteLV(Structure):

    EquipIndex = 0    #(BYTE EquipIndex)

    Len = 0    #(WORD Len)//长度

    SuiteLVInfo = ""    #(String SuiteLVInfo)//{套装类型:等级}

    data = None

class  tagMCEquipPartStar(Structure):

    _pack_ = 1

    _fields_ = [

                  ("EquipPackIndex", c_ushort),    
                  ("Star", c_ubyte),    
                  ]



    def __init__(self):

        self.Clear()

        return



    def ReadData(self, _lpData, _pos=0, _Len=0):

    def ReadData(self, stringData, _pos=0, _len=0):

        self.Clear()

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

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

        self.SuiteLVInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.Len)

        return _pos

        memmove(addressof(self), stringData[_pos:], self.GetLength())

        return _pos + self.GetLength()



    def Clear(self):

        self.EquipIndex = 0

        self.Len = 0

        self.SuiteLVInfo = ""

        self.EquipPackIndex = 0

        self.Star = 0

        return



    def GetLength(self):

        length = 0

        length += 1

        length += 2

        length += len(self.SuiteLVInfo)



        return length

        return sizeof(tagMCEquipPartStar)



    def GetBuffer(self):

        data = ''

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

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

        data = CommFunc.WriteString(data, self.Len, self.SuiteLVInfo)

        return data

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''

                                EquipIndex:%d,

                                Len:%d,

                                SuiteLVInfo:%s

        DumpString = '''// A3 B1 装备部位星数信息 //tagMCEquipPartStarInfo:

                                EquipPackIndex:%d,

                                Star:%d

                                '''\

                                %(

                                self.EquipIndex,

                                self.Len,

                                self.SuiteLVInfo

                                self.EquipPackIndex,

                                self.Star

                                )

        return DumpString





class  tagMCEquipPartSuiteLVInfo(Structure):

class  tagMCEquipPartStarInfo(Structure):

    Head = tagHead()

    Count = 0    #(BYTE Count)// 信息个数

    InfoList = list()    #(vector<tagMCEquipPartSuiteLV> InfoList)// 信息列表

    InfoList = list()    #(vector<tagMCEquipPartStar> InfoList)// 信息列表

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xA3

        self.Head.SubCmd = 0x09

        self.Head.SubCmd = 0xB1

        return



    def ReadData(self, _lpData, _pos=0, _Len=0):

@@ -13796,7 +13840,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

        for i in range(self.Count):

            temInfoList = tagMCEquipPartSuiteLV()

            temInfoList = tagMCEquipPartStar()

            _pos = temInfoList.ReadData(_lpData, _pos)

            self.InfoList.append(temInfoList)

        return _pos

@@ -13805,7 +13849,7 @@
        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xA3

        self.Head.SubCmd = 0x09

        self.Head.SubCmd = 0xB1

        self.Count = 0

        self.InfoList = list()

        return

@@ -13841,8 +13885,8 @@
        return DumpString





m_NAtagMCEquipPartSuiteLVInfo=tagMCEquipPartSuiteLVInfo()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCEquipPartSuiteLVInfo.Head.Cmd,m_NAtagMCEquipPartSuiteLVInfo.Head.SubCmd))] = m_NAtagMCEquipPartSuiteLVInfo

m_NAtagMCEquipPartStarInfo=tagMCEquipPartStarInfo()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCEquipPartStarInfo.Head.Cmd,m_NAtagMCEquipPartStarInfo.Head.SubCmd))] = m_NAtagMCEquipPartStarInfo





#------------------------------------------------------

@@ -15322,15 +15366,16 @@




#------------------------------------------------------

# A3 B3 装备部位星级信息 #tagMCEquipPartStarLVInfo

# A3 B3 装备部位强化信息 #tagMCEquipPartPlusInfo



class  tagMCEquipPartStarLV(Structure):

class  tagMCEquipPartPlusLV(Structure):

    _pack_ = 1

    _fields_ = [

                  ("PackType", c_ubyte),    

                  ("EquipIndex", c_ubyte),    

                  ("EquipPartStarLV", c_ushort),    

                  ("Proficiency", c_int),    

                  ("EvolveLV", c_ubyte),    
                  ]



    def __init__(self):

@@ -15347,34 +15392,37 @@
        self.EquipIndex = 0

        self.EquipPartStarLV = 0

        self.Proficiency = 0

        self.EvolveLV = 0

        return



    def GetLength(self):

        return sizeof(tagMCEquipPartStarLV)

        return sizeof(tagMCEquipPartPlusLV)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''// A3 B3 装备部位星级信息 //tagMCEquipPartStarLVInfo:

        DumpString = '''// A3 B3 装备部位强化信息 //tagMCEquipPartPlusInfo:

                                PackType:%d,

                                EquipIndex:%d,

                                EquipPartStarLV:%d,

                                Proficiency:%d

                                Proficiency:%d,

                                EvolveLV:%d

                                '''\

                                %(

                                self.PackType,

                                self.EquipIndex,

                                self.EquipPartStarLV,

                                self.Proficiency

                                self.Proficiency,

                                self.EvolveLV

                                )

        return DumpString





class  tagMCEquipPartStarLVInfo(Structure):

class  tagMCEquipPartPlusInfo(Structure):

    Head = tagHead()

    Count = 0    #(BYTE Count)// 信息个数

    InfoList = list()    #(vector<tagMCEquipPartStarLV> InfoList)// 信息列表

    InfoList = list()    #(vector<tagMCEquipPartPlusLV> InfoList)// 信息列表

    data = None



    def __init__(self):

@@ -15388,7 +15436,7 @@
        _pos = self.Head.ReadData(_lpData, _pos)

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

        for i in range(self.Count):

            temInfoList = tagMCEquipPartStarLV()

            temInfoList = tagMCEquipPartPlusLV()

            _pos = temInfoList.ReadData(_lpData, _pos)

            self.InfoList.append(temInfoList)

        return _pos

@@ -15433,8 +15481,8 @@
        return DumpString





m_NAtagMCEquipPartStarLVInfo=tagMCEquipPartStarLVInfo()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCEquipPartStarLVInfo.Head.Cmd,m_NAtagMCEquipPartStarLVInfo.Head.SubCmd))] = m_NAtagMCEquipPartStarLVInfo

m_NAtagMCEquipPartPlusInfo=tagMCEquipPartPlusInfo()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCEquipPartPlusInfo.Head.Cmd,m_NAtagMCEquipPartPlusInfo.Head.SubCmd))] = m_NAtagMCEquipPartPlusInfo





#------------------------------------------------------

@@ -30548,6 +30596,70 @@




#------------------------------------------------------

#B4 14 根据类型来决定移动的方式 #tagMCMoveByType



class  tagMCMoveByType(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("ID", c_int),    #玩家ID

                  ("PosX", c_ushort),    # 目标X

                  ("PosY", c_ushort),    # 目标Y

                  ("MoveType", c_ubyte),    #移动方式

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xB4

        self.SubCmd = 0x14

        return



    def ReadData(self, stringData, _pos=0, _len=0):

        self.Clear()

        memmove(addressof(self), stringData[_pos:], self.GetLength())

        return _pos + self.GetLength()



    def Clear(self):

        self.Cmd = 0xB4

        self.SubCmd = 0x14

        self.ID = 0

        self.PosX = 0

        self.PosY = 0

        self.MoveType = 0

        return



    def GetLength(self):

        return sizeof(tagMCMoveByType)



    def GetBuffer(self):

        return string_at(addressof(self), self.GetLength())



    def OutputString(self):

        DumpString = '''//B4 14 根据类型来决定移动的方式 //tagMCMoveByType:

                                Cmd:%s,

                                SubCmd:%s,

                                ID:%d,

                                PosX:%d,

                                PosY:%d,

                                MoveType:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.ID,

                                self.PosX,

                                self.PosY,

                                self.MoveType

                                )

        return DumpString





m_NAtagMCMoveByType=tagMCMoveByType()

ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCMoveByType.Cmd,m_NAtagMCMoveByType.SubCmd))] = m_NAtagMCMoveByType





#------------------------------------------------------

#B4 07 被动技能页选择（功法） # tagMCPassivePage



class  tagMCPassivePage(Structure):