438 【方案】方案预设-服务端（B412 B124 删除 ShapeType）

hxp

2026-01-19 382970c301ea90a70a0cb585e3648b6fa6e063d6

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py

@@ -5412,7 +5412,7 @@
                  ("GubaoID", c_ushort),    

                  ("GubaoStar", c_ubyte),    

                  ("GubaoLV", c_ubyte),    

                  ("EffLayer", c_ubyte),    # 该特殊效果累加层值

                  ("EffLayer", c_ushort),    # 该特殊效果累加层值

                  ]



    def __init__(self):

@@ -8681,7 +8681,7 @@
    _pack_ = 1

    _fields_ = [

                  ("WishID", c_ushort),    # 寻宝物品库中的数据ID，注意不是库ID

                  ("OutCnt", c_ubyte),    # 做为心愿物品时已产出次数，有产出过的无法重新选择，未产出的可任意修改选择

                  ("OutCnt", c_ubyte),    # 该心愿物品已产出次数

                  ]



    def __init__(self):

@@ -8712,6 +8712,77 @@
                                %(

                                self.WishID,

                                self.OutCnt

                                )

        return DumpString





class  tagMCTreasureWishLib(Structure):

    LibID = 0    #(WORD LibID)// 寻宝物品库ID

    OutCntTotal = 0    #(WORD OutCntTotal)// 本库累计产出心愿总次数

    IsUseWishCard = 0    #(BYTE IsUseWishCard)// 是否勾选了自动使用心愿卡

    WishCnt = 0    #(BYTE WishCnt)

    WishList = list()    #(vector<tagMCTreasureWish> WishList)//已选心愿物品信息，只同步已选的

    data = None



    def __init__(self):

        self.Clear()

        return



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

        self.Clear()

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

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

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

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

        for i in range(self.WishCnt):

            temWishList = tagMCTreasureWish()

            _pos = temWishList.ReadData(_lpData, _pos)

            self.WishList.append(temWishList)

        return _pos



    def Clear(self):

        self.LibID = 0

        self.OutCntTotal = 0

        self.IsUseWishCard = 0

        self.WishCnt = 0

        self.WishList = list()

        return



    def GetLength(self):

        length = 0

        length += 2

        length += 2

        length += 1

        length += 1

        for i in range(self.WishCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

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

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

        for i in range(self.WishCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                LibID:%d,

                                OutCntTotal:%d,

                                IsUseWishCard:%d,

                                WishCnt:%d,

                                WishList:%s

                                '''\

                                %(

                                self.LibID,

                                self.OutCntTotal,

                                self.IsUseWishCard,

                                self.WishCnt,

                                "..."

                                )

        return DumpString



@@ -8764,8 +8835,8 @@
    TreasureCntAward = 0    #(DWORD TreasureCntAward)//累计寻宝次数对应奖励领奖状态，按奖励记录索引二进制记录是否已领取

    GridLimitCnt = 0    #(BYTE GridLimitCnt)

    GridLimitCntList = list()    #(vector<tagMCTreasureGridLimit> GridLimitCntList)//有限制抽取次数的格子次数信息

    WishCnt = 0    #(BYTE WishCnt)

    WishList = list()    #(vector<tagMCTreasureWish> WishList)//心愿物品信息

    WishLibCnt = 0    #(BYTE WishLibCnt)

    WishLibList = list()    #(vector<tagMCTreasureWishLib> WishLibList)//心愿库信息

    data = None



    def __init__(self):

@@ -8785,11 +8856,11 @@
            temGridLimitCntList = tagMCTreasureGridLimit()

            _pos = temGridLimitCntList.ReadData(_lpData, _pos)

            self.GridLimitCntList.append(temGridLimitCntList)

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

        for i in range(self.WishCnt):

            temWishList = tagMCTreasureWish()

            _pos = temWishList.ReadData(_lpData, _pos)

            self.WishList.append(temWishList)

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

        for i in range(self.WishLibCnt):

            temWishLibList = tagMCTreasureWishLib()

            _pos = temWishLibList.ReadData(_lpData, _pos)

            self.WishLibList.append(temWishLibList)

        return _pos



    def Clear(self):

@@ -8801,8 +8872,8 @@
        self.TreasureCntAward = 0

        self.GridLimitCnt = 0

        self.GridLimitCntList = list()

        self.WishCnt = 0

        self.WishList = list()

        self.WishLibCnt = 0

        self.WishLibList = list()

        return



    def GetLength(self):

@@ -8817,8 +8888,8 @@
        for i in range(self.GridLimitCnt):

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

        length += 1

        for i in range(self.WishCnt):

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

        for i in range(self.WishLibCnt):

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



        return length



@@ -8833,9 +8904,9 @@
        data = CommFunc.WriteBYTE(data, self.GridLimitCnt)

        for i in range(self.GridLimitCnt):

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

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

        for i in range(self.WishCnt):

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

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

        for i in range(self.WishLibCnt):

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

        return data



    def OutputString(self):

@@ -8848,8 +8919,8 @@
                                TreasureCntAward:%d,

                                GridLimitCnt:%d,

                                GridLimitCntList:%s,

                                WishCnt:%d,

                                WishList:%s

                                WishLibCnt:%d,

                                WishLibList:%s

                                '''\

                                %(

                                self.TreasureType,

@@ -8860,7 +8931,7 @@
                                self.TreasureCntAward,

                                self.GridLimitCnt,

                                "...",

                                self.WishCnt,

                                self.WishLibCnt,

                                "..."

                                )

        return DumpString

@@ -8937,6 +9008,9 @@


class  tagMCTreasureResult(Structure):

    Head = tagHead()

    TreasureType = 0    #(BYTE TreasureType)//寻宝类型

    TreasureIndex = 0    #(BYTE TreasureIndex)//寻宝索引

    CostType = 0    #(BYTE CostType)//消耗类型：0-默认仙玉；1-免费次数；2-寻宝道具

    AddMoneyType = 0    #(BYTE AddMoneyType)// 本次寻宝增加的积分货币类型，可能为0

    AddMoneyValue = 0    #(WORD AddMoneyValue)// 本次寻宝增加的积分货币值，可能为0

    AddTreasureLuck = 0    #(WORD AddTreasureLuck)// 本次寻宝增加的幸运值

@@ -8953,6 +9027,9 @@
    def ReadData(self, _lpData, _pos=0, _Len=0):

        self.Clear()

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

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

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

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

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

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

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

@@ -8965,6 +9042,9 @@
        self.Head.Clear()

        self.Head.Cmd = 0xA3

        self.Head.SubCmd = 0x50

        self.TreasureType = 0

        self.TreasureIndex = 0

        self.CostType = 0

        self.AddMoneyType = 0

        self.AddMoneyValue = 0

        self.AddTreasureLuck = 0

@@ -8976,6 +9056,9 @@
        length = 0

        length += self.Head.GetLength()

        length += 1

        length += 1

        length += 1

        length += 1

        length += 2

        length += 2

        length += 2

@@ -8986,6 +9069,9 @@
    def GetBuffer(self):

        data = ''

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

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

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

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

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

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

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

@@ -8996,6 +9082,9 @@
    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                TreasureType:%d,

                                TreasureIndex:%d,

                                CostType:%d,

                                AddMoneyType:%d,

                                AddMoneyValue:%d,

                                AddTreasureLuck:%d,

@@ -9004,6 +9093,9 @@
                                '''\

                                %(

                                self.Head.OutputString(),

                                self.TreasureType,

                                self.TreasureIndex,

                                self.CostType,

                                self.AddMoneyType,

                                self.AddMoneyValue,

                                self.AddTreasureLuck,

@@ -30094,6 +30186,114 @@




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

# B1 63 战斗预设切换信息 #tagSCBatPresetSwitchInfo



class  tagSCBatPresetSwitch(Structure):

    _pack_ = 1

    _fields_ = [

                  ("BatPresetType", c_ubyte),    #战斗预设类型：1-主线战斗；2-演武场防守；

                  ("BatPresetID", c_ubyte),    #该战斗功能所使用的战斗预设ID

                  ]



    def __init__(self):

        self.Clear()

        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.BatPresetType = 0

        self.BatPresetID = 0

        return



    def GetLength(self):

        return sizeof(tagSCBatPresetSwitch)



    def GetBuffer(self):

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



    def OutputString(self):

        DumpString = '''// B1 63 战斗预设切换信息 //tagSCBatPresetSwitchInfo:

                                BatPresetType:%d,

                                BatPresetID:%d

                                '''\

                                %(

                                self.BatPresetType,

                                self.BatPresetID

                                )

        return DumpString





class  tagSCBatPresetSwitchInfo(Structure):

    Head = tagHead()

    BatFuncCnt = 0    #(BYTE BatFuncCnt)

    BatPresetList = list()    #(vector<tagSCBatPresetSwitch> BatPresetList)

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x63

        return



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

        self.Clear()

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

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

        for i in range(self.BatFuncCnt):

            temBatPresetList = tagSCBatPresetSwitch()

            _pos = temBatPresetList.ReadData(_lpData, _pos)

            self.BatPresetList.append(temBatPresetList)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x63

        self.BatFuncCnt = 0

        self.BatPresetList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 1

        for i in range(self.BatFuncCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

        for i in range(self.BatFuncCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                BatFuncCnt:%d,

                                BatPresetList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.BatFuncCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCBatPresetSwitchInfo=tagSCBatPresetSwitchInfo()

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





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

# B1 30 红颜信息 #tagSCBeautyInfo



class  tagSCBeautySkin(Structure):

@@ -31025,6 +31225,356 @@




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

# B1 61 功能预设信息 #tagSCFuncPresetInfoList



class  tagSCFuncPreset(Structure):

    PresetID = 0    #(BYTE PresetID)//预设方案ID

    NameLen = 0    #(BYTE NameLen)

    PresetName = ""    #(String PresetName)//预设名称

    data = None



    def __init__(self):

        self.Clear()

        return



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

        self.Clear()

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

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

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

        return _pos



    def Clear(self):

        self.PresetID = 0

        self.NameLen = 0

        self.PresetName = ""

        return



    def GetLength(self):

        length = 0

        length += 1

        length += 1

        length += len(self.PresetName)



        return length



    def GetBuffer(self):

        data = ''

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

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

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

        return data



    def OutputString(self):

        DumpString = '''

                                PresetID:%d,

                                NameLen:%d,

                                PresetName:%s

                                '''\

                                %(

                                self.PresetID,

                                self.NameLen,

                                self.PresetName

                                )

        return DumpString





class  tagSCFuncPresetInfo(Structure):

    FuncPresetType = 0    #(BYTE FuncPresetType)//预设类型，1-全局战斗；2-阵容；3-命格；

    UnlockState = 0    #(DWORD UnlockState)//该功能预设解锁状态，按预设ID二进制位运算记录是否已解锁

    PresetCnt = 0    #(BYTE PresetCnt)

    PresetList = list()    #(vector<tagSCFuncPreset> PresetList)//本功能下预设列表

    data = None



    def __init__(self):

        self.Clear()

        return



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

        self.Clear()

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

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

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

        for i in range(self.PresetCnt):

            temPresetList = tagSCFuncPreset()

            _pos = temPresetList.ReadData(_lpData, _pos)

            self.PresetList.append(temPresetList)

        return _pos



    def Clear(self):

        self.FuncPresetType = 0

        self.UnlockState = 0

        self.PresetCnt = 0

        self.PresetList = list()

        return



    def GetLength(self):

        length = 0

        length += 1

        length += 4

        length += 1

        for i in range(self.PresetCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

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

        for i in range(self.PresetCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                FuncPresetType:%d,

                                UnlockState:%d,

                                PresetCnt:%d,

                                PresetList:%s

                                '''\

                                %(

                                self.FuncPresetType,

                                self.UnlockState,

                                self.PresetCnt,

                                "..."

                                )

        return DumpString





class  tagSCFuncPresetInfoList(Structure):

    Head = tagHead()

    FuncCnt = 0    #(BYTE FuncCnt)

    FuncPresetList = list()    #(vector<tagSCFuncPresetInfo> FuncPresetList)

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x61

        return



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

        self.Clear()

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

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

        for i in range(self.FuncCnt):

            temFuncPresetList = tagSCFuncPresetInfo()

            _pos = temFuncPresetList.ReadData(_lpData, _pos)

            self.FuncPresetList.append(temFuncPresetList)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x61

        self.FuncCnt = 0

        self.FuncPresetList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 1

        for i in range(self.FuncCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

        for i in range(self.FuncCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                FuncCnt:%d,

                                FuncPresetList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.FuncCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCFuncPresetInfoList=tagSCFuncPresetInfoList()

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





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

# B1 62 功能预设切换信息 #tagSCFuncPresetSwitchInfo



class  tagSCFuncPresetFunc(Structure):

    _pack_ = 1

    _fields_ = [

                  ("FuncPresetType", c_ubyte),    #预设类型，2-阵容；3-命格；

                  ("FuncPresetID", c_ubyte),    #该全局战斗预设下本功能使用的预设ID

                  ]



    def __init__(self):

        self.Clear()

        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.FuncPresetType = 0

        self.FuncPresetID = 0

        return



    def GetLength(self):

        return sizeof(tagSCFuncPresetFunc)



    def GetBuffer(self):

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



    def OutputString(self):

        DumpString = '''// B1 62 功能预设切换信息 //tagSCFuncPresetSwitchInfo:

                                FuncPresetType:%d,

                                FuncPresetID:%d

                                '''\

                                %(

                                self.FuncPresetType,

                                self.FuncPresetID

                                )

        return DumpString





class  tagSCFuncPresetBat(Structure):

    BatPresetID = 0    #(BYTE BatPresetID)//所属全局战斗预设ID

    FuncCnt = 0    #(BYTE FuncCnt)

    FuncPresetList = list()    #(vector<tagSCFuncPresetFunc> FuncPresetList)

    data = None



    def __init__(self):

        self.Clear()

        return



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

        self.Clear()

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

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

        for i in range(self.FuncCnt):

            temFuncPresetList = tagSCFuncPresetFunc()

            _pos = temFuncPresetList.ReadData(_lpData, _pos)

            self.FuncPresetList.append(temFuncPresetList)

        return _pos



    def Clear(self):

        self.BatPresetID = 0

        self.FuncCnt = 0

        self.FuncPresetList = list()

        return



    def GetLength(self):

        length = 0

        length += 1

        length += 1

        for i in range(self.FuncCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

        for i in range(self.FuncCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                BatPresetID:%d,

                                FuncCnt:%d,

                                FuncPresetList:%s

                                '''\

                                %(

                                self.BatPresetID,

                                self.FuncCnt,

                                "..."

                                )

        return DumpString





class  tagSCFuncPresetSwitchInfo(Structure):

    Head = tagHead()

    BatPresetCnt = 0    #(BYTE BatPresetCnt)

    BatPresetList = list()    #(vector<tagSCFuncPresetBat> BatPresetList)

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x62

        return



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

        self.Clear()

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

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

        for i in range(self.BatPresetCnt):

            temBatPresetList = tagSCFuncPresetBat()

            _pos = temBatPresetList.ReadData(_lpData, _pos)

            self.BatPresetList.append(temBatPresetList)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x62

        self.BatPresetCnt = 0

        self.BatPresetList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 1

        for i in range(self.BatPresetCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

        for i in range(self.BatPresetCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                BatPresetCnt:%d,

                                BatPresetList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.BatPresetCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCFuncPresetSwitchInfo=tagSCFuncPresetSwitchInfo()

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





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

# B1 11 功能系统特权信息 #tagMCFuncSysPrivilegeInfoList



class  tagMCFuncSysPrivilegeInfo(Structure):

@@ -31377,11 +31927,10 @@




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

# B1 24 阵容信息 #tagSCLineupInfo

# B1 24 武将预设信息 #tagSCHeroPresetInfo



class  tagSCLineup(Structure):

    LineupID = 0    #(BYTE LineupID)// 阵容ID

    ShapeType = 0    #(BYTE ShapeType)// 阵型

class  tagSCHeroPreset(Structure):

    PresetID = 0    #(BYTE PresetID)//阵容方案预设ID

    HeroCnt = 0    #(BYTE HeroCnt)

    HeroItemIndexList = list()    #(vector<WORD> HeroItemIndexList)// 所在武将背包索引+1列表 [站位1物品索引+1, 站位2, ...]，站位无武将时为0

    data = None

@@ -31392,8 +31941,7 @@


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

        self.Clear()

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

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

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

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

        for i in range(self.HeroCnt):

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

@@ -31401,8 +31949,7 @@
        return _pos



    def Clear(self):

        self.LineupID = 0

        self.ShapeType = 0

        self.PresetID = 0

        self.HeroCnt = 0

        self.HeroItemIndexList = list()

        return

@@ -31411,15 +31958,13 @@
        length = 0

        length += 1

        length += 1

        length += 1

        length += 2 * self.HeroCnt



        return length



    def GetBuffer(self):

        data = ''

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

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

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

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

        for i in range(self.HeroCnt):

            data = CommFunc.WriteWORD(data, self.HeroItemIndexList[i])

@@ -31427,24 +31972,22 @@


    def OutputString(self):

        DumpString = '''

                                LineupID:%d,

                                ShapeType:%d,

                                PresetID:%d,

                                HeroCnt:%d,

                                HeroItemIndexList:%s

                                '''\

                                %(

                                self.LineupID,

                                self.ShapeType,

                                self.PresetID,

                                self.HeroCnt,

                                "..."

                                )

        return DumpString





class  tagSCLineupInfo(Structure):

class  tagSCHeroPresetInfo(Structure):

    Head = tagHead()

    LineupCnt = 0    #(BYTE LineupCnt)

    LineupList = list()    #(vector<tagSCLineup> LineupList)

    PresetCnt = 0    #(BYTE PresetCnt)

    PresetList = list()    #(vector<tagSCHeroPreset> PresetList)

    data = None



    def __init__(self):

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

        self.Clear()

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

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

        for i in range(self.LineupCnt):

            temLineupList = tagSCLineup()

            _pos = temLineupList.ReadData(_lpData, _pos)

            self.LineupList.append(temLineupList)

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

        for i in range(self.PresetCnt):

            temPresetList = tagSCHeroPreset()

            _pos = temPresetList.ReadData(_lpData, _pos)

            self.PresetList.append(temPresetList)

        return _pos



    def Clear(self):

@@ -31468,43 +32011,43 @@
        self.Head.Clear()

        self.Head.Cmd = 0xB1

        self.Head.SubCmd = 0x24

        self.LineupCnt = 0

        self.LineupList = list()

        self.PresetCnt = 0

        self.PresetList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 1

        for i in range(self.LineupCnt):

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

        for i in range(self.PresetCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

        for i in range(self.LineupCnt):

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

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

        for i in range(self.PresetCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                LineupCnt:%d,

                                LineupList:%s

                                PresetCnt:%d,

                                PresetList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.LineupCnt,

                                self.PresetCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCLineupInfo=tagSCLineupInfo()

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

m_NAtagSCHeroPresetInfo=tagSCHeroPresetInfo()

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





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

@@ -31677,6 +32220,66 @@


m_NAtagSCLLMJInfo=tagSCLLMJInfo()

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





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

# B1 32 命格信息 #tagSCMinggeInfo



class  tagSCMinggeInfo(Structure):

    _pack_ = 1

    _fields_ = [

                  ("Cmd", c_ubyte),

                  ("SubCmd", c_ubyte),

                  ("GanwuLV", c_ushort),    #感悟等级，从1开始

                  ("GanwuExp", c_int),    #当前感悟等级经验，每级从0开始

                  ("Lingying", c_int),    #当前灵应值

                  ]



    def __init__(self):

        self.Clear()

        self.Cmd = 0xB1

        self.SubCmd = 0x32

        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 = 0xB1

        self.SubCmd = 0x32

        self.GanwuLV = 0

        self.GanwuExp = 0

        self.Lingying = 0

        return



    def GetLength(self):

        return sizeof(tagSCMinggeInfo)



    def GetBuffer(self):

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



    def OutputString(self):

        DumpString = '''// B1 32 命格信息 //tagSCMinggeInfo:

                                Cmd:%s,

                                SubCmd:%s,

                                GanwuLV:%d,

                                GanwuExp:%d,

                                Lingying:%d

                                '''\

                                %(

                                self.Cmd,

                                self.SubCmd,

                                self.GanwuLV,

                                self.GanwuExp,

                                self.Lingying

                                )

        return DumpString





m_NAtagSCMinggeInfo=tagSCMinggeInfo()

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





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

@@ -33158,6 +33761,173 @@


m_NAtagMCZhanlingInfo=tagMCZhanlingInfo()

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





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

# B2 02 定军阁信息 #tagSCDingjungeInfo



class  tagSCDingjungeEff(Structure):

    _pack_ = 1

    _fields_ = [

                  ("EffIndex", c_ubyte),    #槽索引，0~n

                  ("EffID", c_ushort),    
                  ("EffLV", c_ubyte),    
                  ]



    def __init__(self):

        self.Clear()

        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.EffIndex = 0

        self.EffID = 0

        self.EffLV = 0

        return



    def GetLength(self):

        return sizeof(tagSCDingjungeEff)



    def GetBuffer(self):

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



    def OutputString(self):

        DumpString = '''// B2 02 定军阁信息 //tagSCDingjungeInfo:

                                EffIndex:%d,

                                EffID:%d,

                                EffLV:%d

                                '''\

                                %(

                                self.EffIndex,

                                self.EffID,

                                self.EffLV

                                )

        return DumpString





class  tagSCDingjungeInfo(Structure):

    Head = tagHead()

    TodayPass = 0    #(DWORD TodayPass)//今日过关进度 层*100+关卡编号，历史最高过关记录取A320中的PassLineID

    EffCnt = 0    #(BYTE EffCnt)

    EffList = list()    #(vector<tagSCDingjungeEff> EffList)//已生效的效果列表

    SelectEffCnt = 0    #(BYTE SelectEffCnt)

    SelectEffList = list()    #(vector<DWORD> SelectEffList)//待手动选择的效果ID列表

    UnSelectCnt = 0    #(WORD UnSelectCnt)//还有几个未选择的效果

    SelectAuto = 0    #(BYTE SelectAuto)//是否启用自动选择

    SelectSetCnt = 0    #(BYTE SelectSetCnt)

    SelectSetAttrIDList = list()    #(vector<WORD> SelectSetAttrIDList)//预设优先选择属性ID列表 [优先级1属性ID, ...]

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xB2

        self.Head.SubCmd = 0x02

        return



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

        self.Clear()

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

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

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

        for i in range(self.EffCnt):

            temEffList = tagSCDingjungeEff()

            _pos = temEffList.ReadData(_lpData, _pos)

            self.EffList.append(temEffList)

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

        for i in range(self.SelectEffCnt):

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

            self.SelectEffList.append(value)

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

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

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

        for i in range(self.SelectSetCnt):

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

            self.SelectSetAttrIDList.append(value)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xB2

        self.Head.SubCmd = 0x02

        self.TodayPass = 0

        self.EffCnt = 0

        self.EffList = list()

        self.SelectEffCnt = 0

        self.SelectEffList = list()

        self.UnSelectCnt = 0

        self.SelectAuto = 0

        self.SelectSetCnt = 0

        self.SelectSetAttrIDList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 4

        length += 1

        for i in range(self.EffCnt):

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

        length += 1

        length += 4 * self.SelectEffCnt

        length += 2

        length += 1

        length += 1

        length += 2 * self.SelectSetCnt



        return length



    def GetBuffer(self):

        data = ''

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

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

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

        for i in range(self.EffCnt):

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

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

        for i in range(self.SelectEffCnt):

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

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

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

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

        for i in range(self.SelectSetCnt):

            data = CommFunc.WriteWORD(data, self.SelectSetAttrIDList[i])

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                TodayPass:%d,

                                EffCnt:%d,

                                EffList:%s,

                                SelectEffCnt:%d,

                                SelectEffList:%s,

                                UnSelectCnt:%d,

                                SelectAuto:%d,

                                SelectSetCnt:%d,

                                SelectSetAttrIDList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.TodayPass,

                                self.EffCnt,

                                "...",

                                self.SelectEffCnt,

                                "...",

                                self.UnSelectCnt,

                                self.SelectAuto,

                                self.SelectSetCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCDingjungeInfo=tagSCDingjungeInfo()

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





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

@@ -37195,6 +37965,8 @@
                  ("LV", c_ushort),    # 等级，玩家的武将等级或NPC成长等级，等级显示以该值为准

                  ("PosNum", c_ubyte),    # 在本阵容中的站位，从1开始，非主战斗武将为0，如红颜

                  ("AngreXP", c_ushort),    # 当前怒气值

                  ("FightPower", c_int),    # 战力，求余亿部分

                  ("FightPowerEx", c_int),    # 战力，整除亿部分

                  ]



    def __init__(self):

@@ -37218,6 +37990,8 @@
        self.LV = 0

        self.PosNum = 0

        self.AngreXP = 0

        self.FightPower = 0

        self.FightPowerEx = 0

        return



    def GetLength(self):

@@ -37238,7 +38012,9 @@
                                MaxHPEx:%d,

                                LV:%d,

                                PosNum:%d,

                                AngreXP:%d

                                AngreXP:%d,

                                FightPower:%d,

                                FightPowerEx:%d

                                '''\

                                %(

                                self.ObjID,

@@ -37251,7 +38027,9 @@
                                self.MaxHPEx,

                                self.LV,

                                self.PosNum,

                                self.AngreXP

                                self.AngreXP,

                                self.FightPower,

                                self.FightPowerEx

                                )

        return DumpString



@@ -38403,6 +39181,190 @@




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

# B4 32 查看NPC属性结果 #tagSCViewNPCAttrRet



class  tagSCViewNPCAttr(Structure):

    PosNum = 0    #(BYTE PosNum)// 在本阵容中的站位，从1开始

    NPCID = 0    #(DWORD NPCID)// 战斗NPCID，不同的实例ID对应的NPCID可能一样

    HeroID = 0    #(DWORD HeroID)// 武将ID，玩家或NPC均可能有，如果有值则外观相关以该武将为准，否则以NPCID为准

    LV = 0    #(WORD LV)// 等级，玩家的武将等级或NPC成长等级，等级显示以该值为准

    Star = 0    #(BYTE Star)// 星级

    BreakLV = 0    #(BYTE BreakLV)// 突破

    AwakeLV = 0    #(BYTE AwakeLV)// 觉醒

    AttrLen = 0    #(WORD AttrLen)

    AttrMsg = ""    #(String AttrMsg)// 属性信息 {"属性ID":value, ...}

    data = None



    def __init__(self):

        self.Clear()

        return



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

        self.Clear()

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

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

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

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

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

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

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

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

        self.AttrMsg,_pos = CommFunc.ReadString(_lpData, _pos,self.AttrLen)

        return _pos



    def Clear(self):

        self.PosNum = 0

        self.NPCID = 0

        self.HeroID = 0

        self.LV = 0

        self.Star = 0

        self.BreakLV = 0

        self.AwakeLV = 0

        self.AttrLen = 0

        self.AttrMsg = ""

        return



    def GetLength(self):

        length = 0

        length += 1

        length += 4

        length += 4

        length += 2

        length += 1

        length += 1

        length += 1

        length += 2

        length += len(self.AttrMsg)



        return length



    def GetBuffer(self):

        data = ''

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

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

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

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

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

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

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

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

        data = CommFunc.WriteString(data, self.AttrLen, self.AttrMsg)

        return data



    def OutputString(self):

        DumpString = '''

                                PosNum:%d,

                                NPCID:%d,

                                HeroID:%d,

                                LV:%d,

                                Star:%d,

                                BreakLV:%d,

                                AwakeLV:%d,

                                AttrLen:%d,

                                AttrMsg:%s

                                '''\

                                %(

                                self.PosNum,

                                self.NPCID,

                                self.HeroID,

                                self.LV,

                                self.Star,

                                self.BreakLV,

                                self.AwakeLV,

                                self.AttrLen,

                                self.AttrMsg

                                )

        return DumpString





class  tagSCViewNPCAttrRet(Structure):

    Head = tagHead()

    MapID = 0    #(DWORD MapID)// 自定义地图ID，可用于绑定战斗地图场景功能（如主线关卡、主线boss、爬塔、竞技场等）

    FuncLineID = 0    #(DWORD FuncLineID)// MapID对应的扩展值，如具体某个关卡等

    ViewNPCID = 0    #(DWORD ViewNPCID)// 指定查看某个NPCID，发0则查看该关卡阵容所有NPC

    NPCCnt = 0    #(BYTE NPCCnt)

    NPCAttrList = list()    #(vector<tagSCViewNPCAttr> NPCAttrList)

    data = None



    def __init__(self):

        self.Clear()

        self.Head.Cmd = 0xB4

        self.Head.SubCmd = 0x32

        return



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

        self.Clear()

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

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

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

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

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

        for i in range(self.NPCCnt):

            temNPCAttrList = tagSCViewNPCAttr()

            _pos = temNPCAttrList.ReadData(_lpData, _pos)

            self.NPCAttrList.append(temNPCAttrList)

        return _pos



    def Clear(self):

        self.Head = tagHead()

        self.Head.Clear()

        self.Head.Cmd = 0xB4

        self.Head.SubCmd = 0x32

        self.MapID = 0

        self.FuncLineID = 0

        self.ViewNPCID = 0

        self.NPCCnt = 0

        self.NPCAttrList = list()

        return



    def GetLength(self):

        length = 0

        length += self.Head.GetLength()

        length += 4

        length += 4

        length += 4

        length += 1

        for i in range(self.NPCCnt):

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



        return length



    def GetBuffer(self):

        data = ''

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

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

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

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

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

        for i in range(self.NPCCnt):

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

        return data



    def OutputString(self):

        DumpString = '''

                                Head:%s,

                                MapID:%d,

                                FuncLineID:%d,

                                ViewNPCID:%d,

                                NPCCnt:%d,

                                NPCAttrList:%s

                                '''\

                                %(

                                self.Head.OutputString(),

                                self.MapID,

                                self.FuncLineID,

                                self.ViewNPCID,

                                self.NPCCnt,

                                "..."

                                )

        return DumpString





m_NAtagSCViewNPCAttrRet=tagSCViewNPCAttrRet()

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





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

# B5 04 拍卖行新上架拍品 #tagGCAddAuctionItemInfo



class  tagGCAddAuctionItem(Structure):