ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -1234,6 +1234,73 @@
#------------------------------------------------------
# A9 04 查询boss信息 #tagCGQueryBossInfo
class  tagCGQueryBossInfo(Structure):
    Head = tagHead()
    Count = 0    #(BYTE Count)//数量
    BossIDList = list()    #(vector<DWORD> BossIDList)//boosid
    data = None
    def __init__(self):
        self.Clear()
        self.Head.Cmd = 0xA9
        self.Head.SubCmd = 0x04
        return
    def ReadData(self, _lpData, _pos=0, _Len=0):
        self.Clear()
        _pos = self.Head.ReadData(_lpData, _pos)
        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        for i in range(self.Count):
            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
            self.BossIDList.append(value)
        return _pos
    def Clear(self):
        self.Head = tagHead()
        self.Head.Clear()
        self.Head.Cmd = 0xA9
        self.Head.SubCmd = 0x04
        self.Count = 0
        self.BossIDList = list()
        return
    def GetLength(self):
        length = 0
        length += self.Head.GetLength()
        length += 1
        length += 4 * self.Count
        return length
    def GetBuffer(self):
        data = ''
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
        data = CommFunc.WriteBYTE(data, self.Count)
        for i in range(self.Count):
            data = CommFunc.WriteDWORD(data, self.BossIDList[i])
        return data
    def OutputString(self):
        DumpString = '''
                                Head:%s,
                                Count:%d,
                                BossIDList:%s
                                '''\
                                %(
                                self.Head.OutputString(),
                                self.Count,
                                "..."
                                )
        return DumpString
m_NAtagCGQueryBossInfo=tagCGQueryBossInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryBossInfo.Head.Cmd,m_NAtagCGQueryBossInfo.Head.SubCmd))] = m_NAtagCGQueryBossInfo
#------------------------------------------------------
#A9 A1 查询玩家补偿#tagCGQueryCompensation
class  tagCGQueryCompensation(Structure):
@@ -2916,113 +2983,9 @@
#------------------------------------------------------
#C0 11 上传数据的活动类型 #tagActionMergeRegister
# C0 03 强制退出跨服状态 #tagCGForceQuitCrossState
class  tagActionMergeRegister(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("ActionType", c_ubyte),    #活动类型
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC0
        self.SubCmd = 0x11
        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 = 0xC0
        self.SubCmd = 0x11
        self.ActionType = 0
        return
    def GetLength(self):
        return sizeof(tagActionMergeRegister)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''//C0 11 上传数据的活动类型 //tagActionMergeRegister:
                                Cmd:%s,
                                SubCmd:%s,
                                ActionType:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.ActionType
                                )
        return DumpString
m_NAtagActionMergeRegister=tagActionMergeRegister()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagActionMergeRegister.Cmd,m_NAtagActionMergeRegister.SubCmd))] = m_NAtagActionMergeRegister
#------------------------------------------------------
#C0 12 跨服上传数据账号查询 #tagMergeRegisterAccQuery
class  tagMergeRegisterAccQuery(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("ActionType", c_ubyte),    #活动类型
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC0
        self.SubCmd = 0x12
        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 = 0xC0
        self.SubCmd = 0x12
        self.ActionType = 0
        return
    def GetLength(self):
        return sizeof(tagMergeRegisterAccQuery)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''//C0 12 跨服上传数据账号查询 //tagMergeRegisterAccQuery:
                                Cmd:%s,
                                SubCmd:%s,
                                ActionType:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.ActionType
                                )
        return DumpString
m_NAtagMergeRegisterAccQuery=tagMergeRegisterAccQuery()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMergeRegisterAccQuery.Cmd,m_NAtagMergeRegisterAccQuery.SubCmd))] = m_NAtagMergeRegisterAccQuery
#------------------------------------------------------
# C0 15 通知即将登录跳转到跨服服务器 #tagCGGotoMergeServer
class  tagCGGotoMergeServer(Structure):
class  tagCGForceQuitCrossState(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
@@ -3032,7 +2995,7 @@
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC0
        self.SubCmd = 0x15
        self.SubCmd = 0x03
        return
    def ReadData(self, stringData, _pos=0, _len=0):
@@ -3042,17 +3005,17 @@
    def Clear(self):
        self.Cmd = 0xC0
        self.SubCmd = 0x15
        self.SubCmd = 0x03
        return
    def GetLength(self):
        return sizeof(tagCGGotoMergeServer)
        return sizeof(tagCGForceQuitCrossState)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// C0 15 通知即将登录跳转到跨服服务器 //tagCGGotoMergeServer:
        DumpString = '''// C0 03 强制退出跨服状态 //tagCGForceQuitCrossState:
                                Cmd:%s,
                                SubCmd:%s
                                '''\
@@ -3063,8 +3026,116 @@
        return DumpString
m_NAtagCGGotoMergeServer=tagCGGotoMergeServer()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGGotoMergeServer.Cmd,m_NAtagCGGotoMergeServer.SubCmd))] = m_NAtagCGGotoMergeServer
m_NAtagCGForceQuitCrossState=tagCGForceQuitCrossState()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGForceQuitCrossState.Cmd,m_NAtagCGForceQuitCrossState.SubCmd))] = m_NAtagCGForceQuitCrossState
#------------------------------------------------------
# C0 01 查看跨服竞技场赛季排行榜 #tagCGViewCrossPKBillboard
class  tagCGViewCrossPKBillboard(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("ZoneID", c_ubyte),    # 赛区ID
                  ("SeasonID", c_ubyte),    # 赛季ID
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC0
        self.SubCmd = 0x01
        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 = 0xC0
        self.SubCmd = 0x01
        self.ZoneID = 0
        self.SeasonID = 0
        return
    def GetLength(self):
        return sizeof(tagCGViewCrossPKBillboard)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// C0 01 查看跨服竞技场赛季排行榜 //tagCGViewCrossPKBillboard:
                                Cmd:%s,
                                SubCmd:%s,
                                ZoneID:%d,
                                SeasonID:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.ZoneID,
                                self.SeasonID
                                )
        return DumpString
m_NAtagCGViewCrossPKBillboard=tagCGViewCrossPKBillboard()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGViewCrossPKBillboard.Cmd,m_NAtagCGViewCrossPKBillboard.SubCmd))] = m_NAtagCGViewCrossPKBillboard
#------------------------------------------------------
# C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo
class  tagCGViewCrossPlayerInfo(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("PlayerID", c_int),    # 跨服玩家ID
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC0
        self.SubCmd = 0x02
        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 = 0xC0
        self.SubCmd = 0x02
        self.PlayerID = 0
        return
    def GetLength(self):
        return sizeof(tagCGViewCrossPlayerInfo)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// C0 02 查看跨服玩家信息 //tagCGViewCrossPlayerInfo:
                                Cmd:%s,
                                SubCmd:%s,
                                PlayerID:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.PlayerID
                                )
        return DumpString
m_NAtagCGViewCrossPlayerInfo=tagCGViewCrossPlayerInfo()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGViewCrossPlayerInfo.Cmd,m_NAtagCGViewCrossPlayerInfo.SubCmd))] = m_NAtagCGViewCrossPlayerInfo
#------------------------------------------------------
@@ -5494,8 +5565,10 @@
class  tagCMEquipDecompose(Structure):
    Head = tagHead()
    IndexCount = 0    #(BYTE IndexCount)//材料所在背包索引的数量
    IndexList = list()    #(vector<BYTE> IndexList)//材料所在背包索引列表
    Count = 0    #(BYTE Count)//材料所在背包索引的数量
    IndexList = list()    #(vector<WORD> IndexList)//材料所在背包索引列表
    ItemIDList = list()    #(vector<DWORD> ItemIDList)//材料所在背包物品ID列表
    IsAuto = 0    #(BYTE IsAuto)//是否自动分解
    data = None
    def __init__(self):
@@ -5507,10 +5580,14 @@
    def ReadData(self, _lpData, _pos=0, _Len=0):
        self.Clear()
        _pos = self.Head.ReadData(_lpData, _pos)
        self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        for i in range(self.IndexCount):
            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        for i in range(self.Count):
            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
            self.IndexList.append(value)
        for i in range(self.Count):
            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
            self.ItemIDList.append(value)
        self.IsAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        return _pos
    def Clear(self):
@@ -5518,36 +5595,47 @@
        self.Head.Clear()
        self.Head.Cmd = 0xA3
        self.Head.SubCmd = 0x2C
        self.IndexCount = 0
        self.Count = 0
        self.IndexList = list()
        self.ItemIDList = list()
        self.IsAuto = 0
        return
    def GetLength(self):
        length = 0
        length += self.Head.GetLength()
        length += 1
        length += 1 * self.IndexCount
        length += 2 * self.Count
        length += 4 * self.Count
        length += 1
        return length
    def GetBuffer(self):
        data = ''
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
        data = CommFunc.WriteBYTE(data, self.IndexCount)
        for i in range(self.IndexCount):
            data = CommFunc.WriteBYTE(data, self.IndexList[i])
        data = CommFunc.WriteBYTE(data, self.Count)
        for i in range(self.Count):
            data = CommFunc.WriteWORD(data, self.IndexList[i])
        for i in range(self.Count):
            data = CommFunc.WriteDWORD(data, self.ItemIDList[i])
        data = CommFunc.WriteBYTE(data, self.IsAuto)
        return data
    def OutputString(self):
        DumpString = '''
                                Head:%s,
                                IndexCount:%d,
                                IndexList:%s
                                Count:%d,
                                IndexList:%s,
                                ItemIDList:%s,
                                IsAuto:%d
                                '''\
                                %(
                                self.Head.OutputString(),
                                self.IndexCount,
                                "..."
                                self.Count,
                                "...",
                                "...",
                                self.IsAuto
                                )
        return DumpString
@@ -8741,6 +8829,220 @@
#------------------------------------------------------
# A5 1C 聚魂合成 #tagCMGatherSoulCompound
class  tagCMGatherSoulCompound(Structure):
    Head = tagHead()
    Cnt = 0    #(BYTE Cnt)
    PackList = list()    #(vector<BYTE> PackList)//所在位置 0-背包 1-孔
    IndexList = list()    #(vector<WORD> IndexList)//物品索引
    TagItemID = 0    #(DWORD TagItemID)//合成目标物品ID
    data = None
    def __init__(self):
        self.Clear()
        self.Head.Cmd = 0xA5
        self.Head.SubCmd = 0x1C
        return
    def ReadData(self, _lpData, _pos=0, _Len=0):
        self.Clear()
        _pos = self.Head.ReadData(_lpData, _pos)
        self.Cnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        for i in range(self.Cnt):
            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
            self.PackList.append(value)
        for i in range(self.Cnt):
            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
            self.IndexList.append(value)
        self.TagItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
        return _pos
    def Clear(self):
        self.Head = tagHead()
        self.Head.Clear()
        self.Head.Cmd = 0xA5
        self.Head.SubCmd = 0x1C
        self.Cnt = 0
        self.PackList = list()
        self.IndexList = list()
        self.TagItemID = 0
        return
    def GetLength(self):
        length = 0
        length += self.Head.GetLength()
        length += 1
        length += 1 * self.Cnt
        length += 2 * self.Cnt
        length += 4
        return length
    def GetBuffer(self):
        data = ''
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
        data = CommFunc.WriteBYTE(data, self.Cnt)
        for i in range(self.Cnt):
            data = CommFunc.WriteBYTE(data, self.PackList[i])
        for i in range(self.Cnt):
            data = CommFunc.WriteWORD(data, self.IndexList[i])
        data = CommFunc.WriteDWORD(data, self.TagItemID)
        return data
    def OutputString(self):
        DumpString = '''
                                Head:%s,
                                Cnt:%d,
                                PackList:%s,
                                IndexList:%s,
                                TagItemID:%d
                                '''\
                                %(
                                self.Head.OutputString(),
                                self.Cnt,
                                "...",
                                "...",
                                self.TagItemID
                                )
        return DumpString
m_NAtagCMGatherSoulCompound=tagCMGatherSoulCompound()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulCompound.Head.Cmd,m_NAtagCMGatherSoulCompound.Head.SubCmd))] = m_NAtagCMGatherSoulCompound
#------------------------------------------------------
# A5 19 聚魂分解 #tagCMGatherSoulDecompose
class  tagCMGatherSoulDecompose(Structure):
    Head = tagHead()
    IsAuto = 0    #(BYTE IsAuto)// 是否自动分解
    Count = 0    #(BYTE Count)// 指定批量分解数,最大不超过50个
    PlaceIndexList = list()    #(vector<WORD> PlaceIndexList)// 批量分解位置索引列表
    data = None
    def __init__(self):
        self.Clear()
        self.Head.Cmd = 0xA5
        self.Head.SubCmd = 0x19
        return
    def ReadData(self, _lpData, _pos=0, _Len=0):
        self.Clear()
        _pos = self.Head.ReadData(_lpData, _pos)
        self.IsAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        for i in range(self.Count):
            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
            self.PlaceIndexList.append(value)
        return _pos
    def Clear(self):
        self.Head = tagHead()
        self.Head.Clear()
        self.Head.Cmd = 0xA5
        self.Head.SubCmd = 0x19
        self.IsAuto = 0
        self.Count = 0
        self.PlaceIndexList = list()
        return
    def GetLength(self):
        length = 0
        length += self.Head.GetLength()
        length += 1
        length += 1
        length += 2 * self.Count
        return length
    def GetBuffer(self):
        data = ''
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
        data = CommFunc.WriteBYTE(data, self.IsAuto)
        data = CommFunc.WriteBYTE(data, self.Count)
        for i in range(self.Count):
            data = CommFunc.WriteWORD(data, self.PlaceIndexList[i])
        return data
    def OutputString(self):
        DumpString = '''
                                Head:%s,
                                IsAuto:%d,
                                Count:%d,
                                PlaceIndexList:%s
                                '''\
                                %(
                                self.Head.OutputString(),
                                self.IsAuto,
                                self.Count,
                                "..."
                                )
        return DumpString
m_NAtagCMGatherSoulDecompose=tagCMGatherSoulDecompose()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulDecompose.Head.Cmd,m_NAtagCMGatherSoulDecompose.Head.SubCmd))] = m_NAtagCMGatherSoulDecompose
#------------------------------------------------------
# A5 18 聚魂升级 #tagCMGatherSoulUp
class  tagCMGatherSoulUp(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("PlaceType", c_ubyte),    # 位置类型;0-背包,1-孔
                  ("PlaceIndex", c_ushort),    # 位置索引
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xA5
        self.SubCmd = 0x18
        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 = 0xA5
        self.SubCmd = 0x18
        self.PlaceType = 0
        self.PlaceIndex = 0
        return
    def GetLength(self):
        return sizeof(tagCMGatherSoulUp)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// A5 18 聚魂升级 //tagCMGatherSoulUp:
                                Cmd:%s,
                                SubCmd:%s,
                                PlaceType:%d,
                                PlaceIndex:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.PlaceType,
                                self.PlaceIndex
                                )
        return DumpString
m_NAtagCMGatherSoulUp=tagCMGatherSoulUp()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulUp.Cmd,m_NAtagCMGatherSoulUp.SubCmd))] = m_NAtagCMGatherSoulUp
#------------------------------------------------------
# A5 41 领取投资理财回报 #tagCMGetInvestReward
class  tagCMGetInvestReward(Structure):
@@ -8898,6 +9200,58 @@
m_NAtagMCGetSuccessAward=tagMCGetSuccessAward()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGetSuccessAward.Cmd,m_NAtagMCGetSuccessAward.SubCmd))] = m_NAtagMCGetSuccessAward
#------------------------------------------------------
# A5 56 神兵激活 #tagCMGodWeaponActivate
class  tagCMGodWeaponActivate(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("WeaponType", c_int),    # 神兵类型
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xA5
        self.SubCmd = 0x56
        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 = 0xA5
        self.SubCmd = 0x56
        self.WeaponType = 0
        return
    def GetLength(self):
        return sizeof(tagCMGodWeaponActivate)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// A5 56 神兵激活 //tagCMGodWeaponActivate:
                                Cmd:%s,
                                SubCmd:%s,
                                WeaponType:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.WeaponType
                                )
        return DumpString
m_NAtagCMGodWeaponActivate=tagCMGodWeaponActivate()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGodWeaponActivate.Cmd,m_NAtagCMGodWeaponActivate.SubCmd))] = m_NAtagCMGodWeaponActivate
#------------------------------------------------------
@@ -10745,6 +11099,62 @@
m_NAtagUseNewGuyCard=tagUseNewGuyCard()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagUseNewGuyCard.Head.Cmd,m_NAtagUseNewGuyCard.Head.SubCmd))] = m_NAtagUseNewGuyCard
#------------------------------------------------------
# A5 1D 法宝佩戴 #tagCMWearMagicWeapon
class  tagCMWearMagicWeapon(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("MWID", c_int),    #法宝ID
                  ("State", c_ubyte),    #0-卸下 1-佩戴
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xA5
        self.SubCmd = 0x1D
        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 = 0xA5
        self.SubCmd = 0x1D
        self.MWID = 0
        self.State = 0
        return
    def GetLength(self):
        return sizeof(tagCMWearMagicWeapon)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// A5 1D 法宝佩戴 //tagCMWearMagicWeapon:
                                Cmd:%s,
                                SubCmd:%s,
                                MWID:%d,
                                State:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.MWID,
                                self.State
                                )
        return DumpString
m_NAtagCMWearMagicWeapon=tagCMWearMagicWeapon()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMWearMagicWeapon.Cmd,m_NAtagCMWearMagicWeapon.SubCmd))] = m_NAtagCMWearMagicWeapon
#------------------------------------------------------
@@ -13247,6 +13657,162 @@
#------------------------------------------------------
# B1 06 助战召唤 #tagCMHelpBattleCall
class  tagCMHelpBattleCall(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("IsOneKeyCall", c_ubyte),    # 是否一键召唤
                  ("PlayerID", c_int),    # 召唤的玩家ID,大于1小于100代表机器人
                  ("IsGoldCall", c_ubyte),    # 是否仙玉召唤
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xB1
        self.SubCmd = 0x06
        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 = 0x06
        self.IsOneKeyCall = 0
        self.PlayerID = 0
        self.IsGoldCall = 0
        return
    def GetLength(self):
        return sizeof(tagCMHelpBattleCall)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// B1 06 助战召唤 //tagCMHelpBattleCall:
                                Cmd:%s,
                                SubCmd:%s,
                                IsOneKeyCall:%d,
                                PlayerID:%d,
                                IsGoldCall:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.IsOneKeyCall,
                                self.PlayerID,
                                self.IsGoldCall
                                )
        return DumpString
m_NAtagCMHelpBattleCall=tagCMHelpBattleCall()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleCall.Cmd,m_NAtagCMHelpBattleCall.SubCmd))] = m_NAtagCMHelpBattleCall
#------------------------------------------------------
# B1 05 助战登记 #tagCMHelpBattleCheckIn
class  tagCMHelpBattleCheckIn(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xB1
        self.SubCmd = 0x05
        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 = 0x05
        return
    def GetLength(self):
        return sizeof(tagCMHelpBattleCheckIn)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// B1 05 助战登记 //tagCMHelpBattleCheckIn:
                                Cmd:%s,
                                SubCmd:%s
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd
                                )
        return DumpString
m_NAtagCMHelpBattleCheckIn=tagCMHelpBattleCheckIn()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleCheckIn.Cmd,m_NAtagCMHelpBattleCheckIn.SubCmd))] = m_NAtagCMHelpBattleCheckIn
#------------------------------------------------------
# B1 07 助战刷新 #tagCMHelpBattleRefresh
class  tagCMHelpBattleRefresh(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xB1
        self.SubCmd = 0x07
        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 = 0x07
        return
    def GetLength(self):
        return sizeof(tagCMHelpBattleRefresh)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// B1 07 助战刷新 //tagCMHelpBattleRefresh:
                                Cmd:%s,
                                SubCmd:%s
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd
                                )
        return DumpString
m_NAtagCMHelpBattleRefresh=tagCMHelpBattleRefresh()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleRefresh.Cmd,m_NAtagCMHelpBattleRefresh.SubCmd))] = m_NAtagCMHelpBattleRefresh
#------------------------------------------------------
# B1 02 领取多倍副本奖励 #tagCMGetMultiFBPrize
class  tagCMGetMultiFBPrize(Structure):
@@ -14631,61 +15197,9 @@
#------------------------------------------------------
#C1 03 领取奖励表奖励 #tagMSGetReward
# C1 02 跨服PK购买次数 #tagCMCrossRealmPKBuy
class  tagMSGetReward(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("RewardType", c_ubyte),    #奖励表奖励类型
                  ]
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC1
        self.SubCmd = 0x03
        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 = 0xC1
        self.SubCmd = 0x03
        self.RewardType = 0
        return
    def GetLength(self):
        return sizeof(tagMSGetReward)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''//C1 03 领取奖励表奖励 //tagMSGetReward:
                                Cmd:%s,
                                SubCmd:%s,
                                RewardType:%d
                                '''\
                                %(
                                self.Cmd,
                                self.SubCmd,
                                self.RewardType
                                )
        return DumpString
m_NAtagMSGetReward=tagMSGetReward()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMSGetReward.Cmd,m_NAtagMSGetReward.SubCmd))] = m_NAtagMSGetReward
#------------------------------------------------------
#C1 08 玩家执行膜拜 #tagPlayerMergeWorship
class  tagPlayerMergeWorship(Structure):
class  tagCMCrossRealmPKBuy(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
@@ -14695,7 +15209,7 @@
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC1
        self.SubCmd = 0x08
        self.SubCmd = 0x02
        return
    def ReadData(self, stringData, _pos=0, _len=0):
@@ -14705,17 +15219,17 @@
    def Clear(self):
        self.Cmd = 0xC1
        self.SubCmd = 0x08
        self.SubCmd = 0x02
        return
    def GetLength(self):
        return sizeof(tagPlayerMergeWorship)
        return sizeof(tagCMCrossRealmPKBuy)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''//C1 08 玩家执行膜拜 //tagPlayerMergeWorship:
        DumpString = '''// C1 02 跨服PK购买次数 //tagCMCrossRealmPKBuy:
                                Cmd:%s,
                                SubCmd:%s
                                '''\
@@ -14726,106 +15240,70 @@
        return DumpString
m_NAtagPlayerMergeWorship=tagPlayerMergeWorship()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagPlayerMergeWorship.Cmd,m_NAtagPlayerMergeWorship.SubCmd))] = m_NAtagPlayerMergeWorship
m_NAtagCMCrossRealmPKBuy=tagCMCrossRealmPKBuy()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKBuy.Cmd,m_NAtagCMCrossRealmPKBuy.SubCmd))] = m_NAtagCMCrossRealmPKBuy
#------------------------------------------------------
# C1 11 跨服王者争霸押注 #tagCMMergeKingSupport
# C1 03 跨服PK领取奖励 #tagCMCrossRealmPKGetAward
class  tagCMMergeKingSupport(Structure):
    Head = tagHead()
    SupportType = 0    #(BYTE SupportType)// 0-押注; 1-贿赂
    GroupType = 0    #(BYTE GroupType)// 组类型;如32强、16强等
    BattleIndex = 0    #(BYTE BattleIndex)// 对战组索引,每种组类型的索引从1开始
    MoneyType = 0    #(BYTE MoneyType)// 押注的货币类型
    AccIDLen = 0    #(BYTE AccIDLen)
    TagAccID = ""    #(String TagAccID)// 支持的目标账号
    data = None
class  tagCMCrossRealmPKGetAward(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
                  ("SubCmd", c_ubyte),
                  ("AwardType", c_ubyte),    # 奖励类型;1-每日匹配奖励,2-每日胜利奖励,3-段位达标奖励,4-赛季结算奖励
                  ("AwardData", c_ubyte),    # 奖励类型对应领取值;每日匹配奖励时为匹配次数,每日胜利奖励时为胜利次数,段位达标奖励时为领取的段位
                  ]
    def __init__(self):
        self.Clear()
        self.Head.Cmd = 0xC1
        self.Head.SubCmd = 0x11
        self.Cmd = 0xC1
        self.SubCmd = 0x03
        return
    def ReadData(self, _lpData, _pos=0, _Len=0):
    def ReadData(self, stringData, _pos=0, _len=0):
        self.Clear()
        _pos = self.Head.ReadData(_lpData, _pos)
        self.SupportType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.GroupType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.BattleIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.AccIDLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
        self.TagAccID,_pos = CommFunc.ReadString(_lpData, _pos,self.AccIDLen)
        return _pos
        memmove(addressof(self), stringData[_pos:], self.GetLength())
        return _pos + self.GetLength()
    def Clear(self):
        self.Head = tagHead()
        self.Head.Clear()
        self.Head.Cmd = 0xC1
        self.Head.SubCmd = 0x11
        self.SupportType = 0
        self.GroupType = 0
        self.BattleIndex = 0
        self.MoneyType = 0
        self.AccIDLen = 0
        self.TagAccID = ""
        self.Cmd = 0xC1
        self.SubCmd = 0x03
        self.AwardType = 0
        self.AwardData = 0
        return
    def GetLength(self):
        length = 0
        length += self.Head.GetLength()
        length += 1
        length += 1
        length += 1
        length += 1
        length += 1
        length += len(self.TagAccID)
        return length
        return sizeof(tagCMCrossRealmPKGetAward)
    def GetBuffer(self):
        data = ''
        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
        data = CommFunc.WriteBYTE(data, self.SupportType)
        data = CommFunc.WriteBYTE(data, self.GroupType)
        data = CommFunc.WriteBYTE(data, self.BattleIndex)
        data = CommFunc.WriteBYTE(data, self.MoneyType)
        data = CommFunc.WriteBYTE(data, self.AccIDLen)
        data = CommFunc.WriteString(data, self.AccIDLen, self.TagAccID)
        return data
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''
                                Head:%s,
                                SupportType:%d,
                                GroupType:%d,
                                BattleIndex:%d,
                                MoneyType:%d,
                                AccIDLen:%d,
                                TagAccID:%s
        DumpString = '''// C1 03 跨服PK领取奖励 //tagCMCrossRealmPKGetAward:
                                Cmd:%s,
                                SubCmd:%s,
                                AwardType:%d,
                                AwardData:%d
                                '''\
                                %(
                                self.Head.OutputString(),
                                self.SupportType,
                                self.GroupType,
                                self.BattleIndex,
                                self.MoneyType,
                                self.AccIDLen,
                                self.TagAccID
                                self.Cmd,
                                self.SubCmd,
                                self.AwardType,
                                self.AwardData
                                )
        return DumpString
m_NAtagCMMergeKingSupport=tagCMMergeKingSupport()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMergeKingSupport.Head.Cmd,m_NAtagCMMergeKingSupport.Head.SubCmd))] = m_NAtagCMMergeKingSupport
m_NAtagCMCrossRealmPKGetAward=tagCMCrossRealmPKGetAward()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKGetAward.Cmd,m_NAtagCMCrossRealmPKGetAward.SubCmd))] = m_NAtagCMCrossRealmPKGetAward
#------------------------------------------------------
# C1 09 跨服PK匹配 #tagCMMergePKMatch
# C1 01 跨服PK匹配 #tagCMCrossRealmPKMatch
class  tagCMMergePKMatch(Structure):
class  tagCMCrossRealmPKMatch(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
@@ -14836,7 +15314,7 @@
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC1
        self.SubCmd = 0x09
        self.SubCmd = 0x01
        return
    def ReadData(self, stringData, _pos=0, _len=0):
@@ -14846,18 +15324,18 @@
    def Clear(self):
        self.Cmd = 0xC1
        self.SubCmd = 0x09
        self.SubCmd = 0x01
        self.Type = 0
        return
    def GetLength(self):
        return sizeof(tagCMMergePKMatch)
        return sizeof(tagCMCrossRealmPKMatch)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// C1 09 跨服PK匹配 //tagCMMergePKMatch:
        DumpString = '''// C1 01 跨服PK匹配 //tagCMCrossRealmPKMatch:
                                Cmd:%s,
                                SubCmd:%s,
                                Type:%d
@@ -14870,14 +15348,14 @@
        return DumpString
m_NAtagCMMergePKMatch=tagCMMergePKMatch()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMergePKMatch.Cmd,m_NAtagCMMergePKMatch.SubCmd))] = m_NAtagCMMergePKMatch
m_NAtagCMCrossRealmPKMatch=tagCMCrossRealmPKMatch()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKMatch.Cmd,m_NAtagCMCrossRealmPKMatch.SubCmd))] = m_NAtagCMCrossRealmPKMatch
#------------------------------------------------------
# C1 10 跨服PK恢复连胜次数 #tagCMRecoverMergePKWin
# C1 04 主动退出跨服 #tagCMExitCrossRealm
class  tagCMRecoverMergePKWin(Structure):
class  tagCMExitCrossRealm(Structure):
    _pack_ = 1
    _fields_ = [
                  ("Cmd", c_ubyte),
@@ -14887,7 +15365,7 @@
    def __init__(self):
        self.Clear()
        self.Cmd = 0xC1
        self.SubCmd = 0x10
        self.SubCmd = 0x04
        return
    def ReadData(self, stringData, _pos=0, _len=0):
@@ -14897,17 +15375,17 @@
    def Clear(self):
        self.Cmd = 0xC1
        self.SubCmd = 0x10
        self.SubCmd = 0x04
        return
    def GetLength(self):
        return sizeof(tagCMRecoverMergePKWin)
        return sizeof(tagCMExitCrossRealm)
    def GetBuffer(self):
        return string_at(addressof(self), self.GetLength())
    def OutputString(self):
        DumpString = '''// C1 10 跨服PK恢复连胜次数 //tagCMRecoverMergePKWin:
        DumpString = '''// C1 04 主动退出跨服 //tagCMExitCrossRealm:
                                Cmd:%s,
                                SubCmd:%s
                                '''\
@@ -14918,5 +15396,5 @@
        return DumpString
m_NAtagCMRecoverMergePKWin=tagCMRecoverMergePKWin()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRecoverMergePKWin.Cmd,m_NAtagCMRecoverMergePKWin.SubCmd))] = m_NAtagCMRecoverMergePKWin
m_NAtagCMExitCrossRealm=tagCMExitCrossRealm()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExitCrossRealm.Cmd,m_NAtagCMExitCrossRealm.SubCmd))] = m_NAtagCMExitCrossRealm