From b42da850f0f8e8748b429acc3139be53b75a9589 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 九月 2025 16:28:56 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(上阵武将等级加成改为(等级 - 1)*LVAddPer )

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 4588 ++---------------------------------------------------------
 1 files changed, 168 insertions(+), 4,420 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 19a7250..369a2ec 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -22113,513 +22113,6 @@
 
 
 #------------------------------------------------------
-# AA 67 Boss历练活动信息 #tagMCActBossTrialInfo
-
-class  tagMCActBossTrialItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActBossTrialItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 67 Boss历练活动信息 //tagMCActBossTrialInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCActBossTrialAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCActBossTrialItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActBossTrialItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActBossTrialBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表,当仙盟榜时,如果有该奖励则代表盟主奖励,否则默认均为成员奖励
-    MemCount = 0    #(BYTE MemCount)// 成员奖励物品数
-    MemAwardItemList = list()    #(vector<tagMCActBossTrialItem> MemAwardItemList)// 成员奖励物品列表,仅仙盟榜时有效
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCActBossTrialAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActBossTrialItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.MemCount):
-            temMemAwardItemList = tagMCActBossTrialItem()
-            _pos = temMemAwardItemList.ReadData(_lpData, _pos)
-            self.MemAwardItemList.append(temMemAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCActBossTrialAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.MemCount = 0
-        self.MemAwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 1
-        for i in range(self.MemCount):
-            length += self.MemAwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.MemCount)
-        for i in range(self.MemCount):
-            data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                MemCount:%d,
-                                MemAwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.MemCount,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActBossTrialSubmitInfo(Structure):
-    RecordIndex = 0    #(BYTE RecordIndex)// 记录索引
-    NeedCount = 0    #(WORD NeedCount)// 所需提交个数
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.RecordIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.NeedCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActBossTrialItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.RecordIndex = 0
-        self.NeedCount = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 1
-        length += 2
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteBYTE(data, self.RecordIndex)
-        data = CommFunc.WriteWORD(data, self.NeedCount)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                RecordIndex:%d,
-                                NeedCount:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.RecordIndex,
-                                self.NeedCount,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActBossTrialInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
-    ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    ShopType = 0    #(WORD ShopType)// 开放商店类型,可能为0不开放
-    SubResetType = 0    #(BYTE SubResetType)// 提交凭证奖励重置类型,0-跟随活动; 1-0点重置;2-5点重置
-    SubmitCount = 0    #(BYTE SubmitCount)
-    SubmitInfoList = list()    #(vector<tagMCActBossTrialSubmitInfo> SubmitInfoList)// 提交凭证信息列表
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    FamilyBillCount = 0    #(BYTE FamilyBillCount)
-    FamilyBillboardInfoList = list()    #(vector<tagMCActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x67
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.SubResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.SubmitCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.SubmitCount):
-            temSubmitInfoList = tagMCActBossTrialSubmitInfo()
-            _pos = temSubmitInfoList.ReadData(_lpData, _pos)
-            self.SubmitInfoList.append(temSubmitInfoList)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCActBossTrialBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.FamilyBillCount):
-            temFamilyBillboardInfoList = tagMCActBossTrialBillard()
-            _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
-            self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x67
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.IsDayReset = 0
-        self.ResetType = 0
-        self.LimitLV = 0
-        self.ShopType = 0
-        self.SubResetType = 0
-        self.SubmitCount = 0
-        self.SubmitInfoList = list()
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        self.FamilyBillCount = 0
-        self.FamilyBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        length += 1
-        length += 2
-        length += 2
-        length += 1
-        length += 1
-        for i in range(self.SubmitCount):
-            length += self.SubmitInfoList[i].GetLength()
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-        length += 1
-        for i in range(self.FamilyBillCount):
-            length += self.FamilyBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.IsDayReset)
-        data = CommFunc.WriteBYTE(data, self.ResetType)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteWORD(data, self.ShopType)
-        data = CommFunc.WriteBYTE(data, self.SubResetType)
-        data = CommFunc.WriteBYTE(data, self.SubmitCount)
-        for i in range(self.SubmitCount):
-            data = CommFunc.WriteString(data, self.SubmitInfoList[i].GetLength(), self.SubmitInfoList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
-        for i in range(self.FamilyBillCount):
-            data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                IsDayReset:%d,
-                                ResetType:%d,
-                                LimitLV:%d,
-                                ShopType:%d,
-                                SubResetType:%d,
-                                SubmitCount:%d,
-                                SubmitInfoList:%s,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s,
-                                FamilyBillCount:%d,
-                                FamilyBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.IsDayReset,
-                                self.ResetType,
-                                self.LimitLV,
-                                self.ShopType,
-                                self.SubResetType,
-                                self.SubmitCount,
-                                "...",
-                                self.PersonalBillCount,
-                                "...",
-                                self.FamilyBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCActBossTrialInfo=tagMCActBossTrialInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActBossTrialInfo.Head.Cmd,m_NAtagMCActBossTrialInfo.Head.SubCmd))] = m_NAtagMCActBossTrialInfo
-
-
-#------------------------------------------------------
-# AA 68 Boss历练活动玩家信息 #tagMCActBossTrialPlayerInfo
-
-class  tagMCActBossTrialPlayerInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    # 活动编号
-                  ("SubmitCount", c_int),    # 已提交凭证个数,总个数
-                  ("SubmitAwardCount", c_int),    # 已提交凭证个数,关联提交奖励的个数,领奖使用该个数判断
-                  ("SubmitAwardState", c_int),    # 提交凭证奖励领奖状态
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x68
-        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 = 0xAA
-        self.SubCmd = 0x68
-        self.ActNum = 0
-        self.SubmitCount = 0
-        self.SubmitAwardCount = 0
-        self.SubmitAwardState = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActBossTrialPlayerInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 68 Boss历练活动玩家信息 //tagMCActBossTrialPlayerInfo:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                SubmitCount:%d,
-                                SubmitAwardCount:%d,
-                                SubmitAwardState:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.SubmitCount,
-                                self.SubmitAwardCount,
-                                self.SubmitAwardState
-                                )
-        return DumpString
-
-
-m_NAtagMCActBossTrialPlayerInfo=tagMCActBossTrialPlayerInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActBossTrialPlayerInfo.Cmd,m_NAtagMCActBossTrialPlayerInfo.SubCmd))] = m_NAtagMCActBossTrialPlayerInfo
-
-
-#------------------------------------------------------
 # AA 74 购买次数礼包活动信息 #tagMCActBuyCountGiftInfo
 
 class  tagMCActBuyCountGiftItem(Structure):
@@ -23891,285 +23384,6 @@
 
 
 #------------------------------------------------------
-# AA 55 垃圾收集活动信息 #tagMCActGarbageSortingInfo
-
-class  tagMCActGarbageSortingInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点开,5点重置;2-5点开,0点重置
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x55
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x55
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.LimitLV = 0
-        self.ResetType = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 2
-        length += 1
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteBYTE(data, self.ResetType)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                LimitLV:%d,
-                                ResetType:%d
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.LimitLV,
-                                self.ResetType
-                                )
-        return DumpString
-
-
-m_NAtagMCActGarbageSortingInfo=tagMCActGarbageSortingInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGarbageSortingInfo.Head.Cmd,m_NAtagMCActGarbageSortingInfo.Head.SubCmd))] = m_NAtagMCActGarbageSortingInfo
-
-
-#------------------------------------------------------
-# AA 57 垃圾收集活动分类结果 #tagMCActGarbageSortingResult
-
-class  tagMCActGarbageSortingResult(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ("GarbageSortingType", c_ubyte),    #垃圾分类类型
-                  ("IsRight", c_ubyte),    #是否正确
-                  ("AddEnvValue", c_int),    #增加环保值
-                  ("HisEnvValueTotal", c_int),    # 当前活动累计获得环保值
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x57
-        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 = 0xAA
-        self.SubCmd = 0x57
-        self.ActNum = 0
-        self.GarbageSortingType = 0
-        self.IsRight = 0
-        self.AddEnvValue = 0
-        self.HisEnvValueTotal = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActGarbageSortingResult)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 57 垃圾收集活动分类结果 //tagMCActGarbageSortingResult:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                GarbageSortingType:%d,
-                                IsRight:%d,
-                                AddEnvValue:%d,
-                                HisEnvValueTotal:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.GarbageSortingType,
-                                self.IsRight,
-                                self.AddEnvValue,
-                                self.HisEnvValueTotal
-                                )
-        return DumpString
-
-
-m_NAtagMCActGarbageSortingResult=tagMCActGarbageSortingResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGarbageSortingResult.Cmd,m_NAtagMCActGarbageSortingResult.SubCmd))] = m_NAtagMCActGarbageSortingResult
-
-
-#------------------------------------------------------
-# AA 56 垃圾收集活动任务进度信息 #tagMCActGarbageTaskInfo
-
-class  tagMCActGarbageTask(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("GarbageTaskID", c_ubyte),    #垃圾任务ID
-                  ("GarbageTaskValue", c_int),    #当前进度值,一直累加
-                  ("GarbageTaskFinishCount", c_int),    #当前已完成次数; 前端计算未完成次数的进度值=max(0, 当前进度值 - (完成次数 * 单次所需进度))
-                  ]
-
-    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.GarbageTaskID = 0
-        self.GarbageTaskValue = 0
-        self.GarbageTaskFinishCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActGarbageTask)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 56 垃圾收集活动任务进度信息 //tagMCActGarbageTaskInfo:
-                                GarbageTaskID:%d,
-                                GarbageTaskValue:%d,
-                                GarbageTaskFinishCount:%d
-                                '''\
-                                %(
-                                self.GarbageTaskID,
-                                self.GarbageTaskValue,
-                                self.GarbageTaskFinishCount
-                                )
-        return DumpString
-
-
-class  tagMCActGarbageTaskInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    HisEnvValueTotal = 0    #(DWORD HisEnvValueTotal)// 当前活动累计获得环保值
-    GarbageTaskCount = 0    #(BYTE GarbageTaskCount)//任务数
-    GarbageTaskList = list()    #(vector<tagMCActGarbageTask> GarbageTaskList)//任务信息列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x56
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.HisEnvValueTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.GarbageTaskCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.GarbageTaskCount):
-            temGarbageTaskList = tagMCActGarbageTask()
-            _pos = temGarbageTaskList.ReadData(_lpData, _pos)
-            self.GarbageTaskList.append(temGarbageTaskList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x56
-        self.ActNum = 0
-        self.HisEnvValueTotal = 0
-        self.GarbageTaskCount = 0
-        self.GarbageTaskList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 4
-        length += 1
-        for i in range(self.GarbageTaskCount):
-            length += self.GarbageTaskList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteDWORD(data, self.HisEnvValueTotal)
-        data = CommFunc.WriteBYTE(data, self.GarbageTaskCount)
-        for i in range(self.GarbageTaskCount):
-            data = CommFunc.WriteString(data, self.GarbageTaskList[i].GetLength(), self.GarbageTaskList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                HisEnvValueTotal:%d,
-                                GarbageTaskCount:%d,
-                                GarbageTaskList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.HisEnvValueTotal,
-                                self.GarbageTaskCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCActGarbageTaskInfo=tagMCActGarbageTaskInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGarbageTaskInfo.Head.Cmd,m_NAtagMCActGarbageTaskInfo.Head.SubCmd))] = m_NAtagMCActGarbageTaskInfo
-
-
-#------------------------------------------------------
 # AA 60 天帝礼包活动信息 #tagMCActGodGiftInfo
 
 class  tagMCActGodGiftItem(Structure):
@@ -24832,862 +24046,6 @@
 
 m_NAtagMCActGrowupBuyInfo=tagMCActGrowupBuyInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGrowupBuyInfo.Head.Cmd,m_NAtagMCActGrowupBuyInfo.Head.SubCmd))] = m_NAtagMCActGrowupBuyInfo
-
-
-#------------------------------------------------------
-# AA 81 古宝养成活动信息 #tagMCActGubaoInfo
-
-class  tagMCActGubaoItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActGubaoItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 81 古宝养成活动信息 //tagMCActGubaoInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCActGubaoAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCActGubaoItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActGubaoItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActGubaoBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActGubaoItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCActGubaoAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActGubaoItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCActGubaoAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActGubaoInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    ShopType = 0    #(WORD ShopType)// 开放商店类型,可能为0不开放
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCActGubaoBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x81
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCActGubaoBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x81
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.LimitLV = 0
-        self.ShopType = 0
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 2
-        length += 2
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteWORD(data, self.ShopType)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                LimitLV:%d,
-                                ShopType:%d,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.LimitLV,
-                                self.ShopType,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCActGubaoInfo=tagMCActGubaoInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGubaoInfo.Head.Cmd,m_NAtagMCActGubaoInfo.Head.SubCmd))] = m_NAtagMCActGubaoInfo
-
-
-#------------------------------------------------------
-# AA 82 古宝养成活动玩家信息 #tagMCActGubaoPlayerInfo
-
-class  tagMCActGubaoPlayerInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    # 活动编号
-                  ("Score", c_int),    # 当前积分
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x82
-        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 = 0xAA
-        self.SubCmd = 0x82
-        self.ActNum = 0
-        self.Score = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActGubaoPlayerInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 82 古宝养成活动玩家信息 //tagMCActGubaoPlayerInfo:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                Score:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.Score
-                                )
-        return DumpString
-
-
-m_NAtagMCActGubaoPlayerInfo=tagMCActGubaoPlayerInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActGubaoPlayerInfo.Cmd,m_NAtagMCActGubaoPlayerInfo.SubCmd))] = m_NAtagMCActGubaoPlayerInfo
-
-
-#------------------------------------------------------
-# AA 54 骑宠盛宴活动信息 #tagMCActHorsePetFeastInfo
-
-class  tagMCActHorsePetFeastTime(Structure):
-    StartTime = ""    #(char StartTime[5])// 开始时间 H:M
-    EndtTime = ""    #(char EndtTime[5])// 结束时间 H:M
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.StartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.EndtTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        return _pos
-
-    def Clear(self):
-        self.StartTime = ""
-        self.EndtTime = ""
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 5
-        length += 5
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, 5, self.StartTime)
-        data = CommFunc.WriteString(data, 5, self.EndtTime)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                StartTime:%s,
-                                EndtTime:%s
-                                '''\
-                                %(
-                                self.StartTime,
-                                self.EndtTime
-                                )
-        return DumpString
-
-
-class  tagMCActHorsePetFeastInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)//活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    TimeCount = 0    #(BYTE TimeCount)
-    ActTimeList = list()    #(vector<tagMCActHorsePetFeastTime> ActTimeList)// 活动时间 H:M 列表
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x54
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.TimeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.TimeCount):
-            temActTimeList = tagMCActHorsePetFeastTime()
-            _pos = temActTimeList.ReadData(_lpData, _pos)
-            self.ActTimeList.append(temActTimeList)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x54
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.TimeCount = 0
-        self.ActTimeList = list()
-        self.LimitLV = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 1
-        for i in range(self.TimeCount):
-            length += self.ActTimeList[i].GetLength()
-        length += 2
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteBYTE(data, self.TimeCount)
-        for i in range(self.TimeCount):
-            data = CommFunc.WriteString(data, self.ActTimeList[i].GetLength(), self.ActTimeList[i].GetBuffer())
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                TimeCount:%d,
-                                ActTimeList:%s,
-                                LimitLV:%d
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.TimeCount,
-                                "...",
-                                self.LimitLV
-                                )
-        return DumpString
-
-
-m_NAtagMCActHorsePetFeastInfo=tagMCActHorsePetFeastInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActHorsePetFeastInfo.Head.Cmd,m_NAtagMCActHorsePetFeastInfo.Head.SubCmd))] = m_NAtagMCActHorsePetFeastInfo
-
-
-#------------------------------------------------------
-# AA 84 骑宠养成活动信息 #tagMCActHorsePetTrainInfo
-
-class  tagMCActHorsePetTrainItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActHorsePetTrainItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 84 骑宠养成活动信息 //tagMCActHorsePetTrainInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCActHorsePetTrainAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCActHorsePetTrainItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActHorsePetTrainItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActHorsePetTrainBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActHorsePetTrainItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCActHorsePetTrainAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActHorsePetTrainItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCActHorsePetTrainAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActHorsePetTrainInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    ShopType = 0    #(WORD ShopType)// 开放商店类型,可能为0不开放
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCActHorsePetTrainBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x84
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCActHorsePetTrainBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x84
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.LimitLV = 0
-        self.ShopType = 0
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 2
-        length += 2
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteWORD(data, self.ShopType)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                LimitLV:%d,
-                                ShopType:%d,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.LimitLV,
-                                self.ShopType,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCActHorsePetTrainInfo=tagMCActHorsePetTrainInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActHorsePetTrainInfo.Head.Cmd,m_NAtagMCActHorsePetTrainInfo.Head.SubCmd))] = m_NAtagMCActHorsePetTrainInfo
-
-
-#------------------------------------------------------
-# AA 85 骑宠养成活动玩家信息 #tagMCActHorsePetTrainPlayerInfo
-
-class  tagMCActHorsePetTrainPlayerInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    # 活动编号
-                  ("Score", c_int),    # 当前活动积分
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x85
-        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 = 0xAA
-        self.SubCmd = 0x85
-        self.ActNum = 0
-        self.Score = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActHorsePetTrainPlayerInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 85 骑宠养成活动玩家信息 //tagMCActHorsePetTrainPlayerInfo:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                Score:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.Score
-                                )
-        return DumpString
-
-
-m_NAtagMCActHorsePetTrainPlayerInfo=tagMCActHorsePetTrainPlayerInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActHorsePetTrainPlayerInfo.Cmd,m_NAtagMCActHorsePetTrainPlayerInfo.SubCmd))] = m_NAtagMCActHorsePetTrainPlayerInfo
 
 
 #------------------------------------------------------
@@ -29573,593 +27931,6 @@
 
 
 #------------------------------------------------------
-# AA 59 仙匣秘境抽奖结果 #tagMCActXianXiaMJAwardItemResult
-
-class  tagMCActXianXiaMJAwardItemResult(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    # 活动编号
-                  ("ItemLibType", c_ubyte),    #物品库类型;9-固定为大奖库,非9-策划自定义库
-                  ("ItemID", c_int),    # 注意: 不同库物品ID可能相同,但个数不同
-                  ("ItemCount", c_ushort),    
-                  ("PosNum", c_ubyte),    # 被抽中时的位置编号,1~99,前端自定义展示位置编号,0代表未被抽中;
-                  ("TotalTimesNow", c_ubyte),    #当前已产出次数,不限制次数时不记录,即同样为0
-                  ("LotteryScore", c_int),    #当前抽奖积分
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x59
-        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 = 0xAA
-        self.SubCmd = 0x59
-        self.ActNum = 0
-        self.ItemLibType = 0
-        self.ItemID = 0
-        self.ItemCount = 0
-        self.PosNum = 0
-        self.TotalTimesNow = 0
-        self.LotteryScore = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActXianXiaMJAwardItemResult)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 59 仙匣秘境抽奖结果 //tagMCActXianXiaMJAwardItemResult:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                ItemLibType:%d,
-                                ItemID:%d,
-                                ItemCount:%d,
-                                PosNum:%d,
-                                TotalTimesNow:%d,
-                                LotteryScore:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.ItemLibType,
-                                self.ItemID,
-                                self.ItemCount,
-                                self.PosNum,
-                                self.TotalTimesNow,
-                                self.LotteryScore
-                                )
-        return DumpString
-
-
-m_NAtagMCActXianXiaMJAwardItemResult=tagMCActXianXiaMJAwardItemResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJAwardItemResult.Cmd,m_NAtagMCActXianXiaMJAwardItemResult.SubCmd))] = m_NAtagMCActXianXiaMJAwardItemResult
-
-
-#------------------------------------------------------
-# AA 58 仙匣秘境活动信息 #tagMCActXianXiaMJInfo
-
-class  tagMCActXianXiaMJItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActXianXiaMJItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 58 仙匣秘境活动信息 //tagMCActXianXiaMJInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCActXianXiaMJAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCActXianXiaMJItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActXianXiaMJItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActXianXiaMJBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActXianXiaMJItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCActXianXiaMJAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCActXianXiaMJItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCActXianXiaMJAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCActXianXiaMJInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    UseItemID = 0    #(DWORD UseItemID)//消耗物品ID,默认1个;消耗物品或货币二选一即可,或都配则先消耗道具,不足则消耗货币
-    MoneyType = 0    #(BYTE MoneyType)//消耗货币类型
-    MoneyValue = 0    #(WORD MoneyValue)//消耗货币值
-    LotteryAddScore = 0    #(WORD LotteryAddScore)//每次抽奖加积分
-    LayerAddScore = 0    #(WORD LayerAddScore)//每次跨层加积分
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCActXianXiaMJBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x58
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.UseItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.MoneyValue,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.LotteryAddScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.LayerAddScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCActXianXiaMJBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x58
-        self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.IsDayReset = 0
-        self.LimitLV = 0
-        self.UseItemID = 0
-        self.MoneyType = 0
-        self.MoneyValue = 0
-        self.LotteryAddScore = 0
-        self.LayerAddScore = 0
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        length += 2
-        length += 4
-        length += 1
-        length += 2
-        length += 2
-        length += 2
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.IsDayReset)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteDWORD(data, self.UseItemID)
-        data = CommFunc.WriteBYTE(data, self.MoneyType)
-        data = CommFunc.WriteWORD(data, self.MoneyValue)
-        data = CommFunc.WriteWORD(data, self.LotteryAddScore)
-        data = CommFunc.WriteWORD(data, self.LayerAddScore)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                IsDayReset:%d,
-                                LimitLV:%d,
-                                UseItemID:%d,
-                                MoneyType:%d,
-                                MoneyValue:%d,
-                                LotteryAddScore:%d,
-                                LayerAddScore:%d,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.IsDayReset,
-                                self.LimitLV,
-                                self.UseItemID,
-                                self.MoneyType,
-                                self.MoneyValue,
-                                self.LotteryAddScore,
-                                self.LayerAddScore,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCActXianXiaMJInfo=tagMCActXianXiaMJInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJInfo.Head.Cmd,m_NAtagMCActXianXiaMJInfo.Head.SubCmd))] = m_NAtagMCActXianXiaMJInfo
-
-
-#------------------------------------------------------
-# AA 79 仙匣秘境层信息 #tagMCActXianXiaMJLayerInfo
-
-class  tagMCActXianXiaMJLayerItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemLibType", c_ubyte),    #物品库类型;9-固定为大奖库,非9-策划自定义库
-                  ("ItemID", c_int),    # 注意: 不同库物品ID可能相同,但个数不同
-                  ("ItemCount", c_ushort),    
-                  ("PosNum", c_ubyte),    # 被抽中时的位置编号,1~99,前端自定义展示位置编号,0代表未被抽中;
-                  ("TotalTimesNow", c_ubyte),    #当前已产出次数,不限制次数时不记录,即同样为0
-                  ("TotalTimesMax", c_ubyte),    #最大可产出次数,0不限
-                  ("LayerLimit", c_ubyte),    #大于等于X层后可产出,0不限
-                  ]
-
-    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.ItemLibType = 0
-        self.ItemID = 0
-        self.ItemCount = 0
-        self.PosNum = 0
-        self.TotalTimesNow = 0
-        self.TotalTimesMax = 0
-        self.LayerLimit = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActXianXiaMJLayerItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 79 仙匣秘境层信息 //tagMCActXianXiaMJLayerInfo:
-                                ItemLibType:%d,
-                                ItemID:%d,
-                                ItemCount:%d,
-                                PosNum:%d,
-                                TotalTimesNow:%d,
-                                TotalTimesMax:%d,
-                                LayerLimit:%d
-                                '''\
-                                %(
-                                self.ItemLibType,
-                                self.ItemID,
-                                self.ItemCount,
-                                self.PosNum,
-                                self.TotalTimesNow,
-                                self.TotalTimesMax,
-                                self.LayerLimit
-                                )
-        return DumpString
-
-
-class  tagMCActXianXiaMJLayerInfo(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)// 活动编号
-    LayerNum = 0    #(WORD LayerNum)//当前奖池第几层
-    LotteryScore = 0    #(DWORD LotteryScore)//当前抽奖积分
-    AwardItemCount = 0    #(BYTE AwardItemCount)
-    AwardItemList = list()    #(vector<tagMCActXianXiaMJLayerItem> AwardItemList)// 奖池物品列表,已生成的,包含已选择的大奖物品
-    SuperItemCount = 0    #(BYTE SuperItemCount)
-    SuperItemList = list()    #(vector<tagMCActXianXiaMJLayerItem> SuperItemList)// 大奖物品待选择库,由玩家从库中选择放入奖池的物品;
-    SuperItemCanChooseCount = 0    #(BYTE SuperItemCanChooseCount)// 大奖物品可选择个数
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x79
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.LayerNum,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.LotteryScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.AwardItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.AwardItemCount):
-            temAwardItemList = tagMCActXianXiaMJLayerItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.SuperItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.SuperItemCount):
-            temSuperItemList = tagMCActXianXiaMJLayerItem()
-            _pos = temSuperItemList.ReadData(_lpData, _pos)
-            self.SuperItemList.append(temSuperItemList)
-        self.SuperItemCanChooseCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x79
-        self.ActNum = 0
-        self.LayerNum = 0
-        self.LotteryScore = 0
-        self.AwardItemCount = 0
-        self.AwardItemList = list()
-        self.SuperItemCount = 0
-        self.SuperItemList = list()
-        self.SuperItemCanChooseCount = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 2
-        length += 4
-        length += 1
-        for i in range(self.AwardItemCount):
-            length += self.AwardItemList[i].GetLength()
-        length += 1
-        for i in range(self.SuperItemCount):
-            length += self.SuperItemList[i].GetLength()
-        length += 1
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteWORD(data, self.LayerNum)
-        data = CommFunc.WriteDWORD(data, self.LotteryScore)
-        data = CommFunc.WriteBYTE(data, self.AwardItemCount)
-        for i in range(self.AwardItemCount):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.SuperItemCount)
-        for i in range(self.SuperItemCount):
-            data = CommFunc.WriteString(data, self.SuperItemList[i].GetLength(), self.SuperItemList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.SuperItemCanChooseCount)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                LayerNum:%d,
-                                LotteryScore:%d,
-                                AwardItemCount:%d,
-                                AwardItemList:%s,
-                                SuperItemCount:%d,
-                                SuperItemList:%s,
-                                SuperItemCanChooseCount:%d
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.LayerNum,
-                                self.LotteryScore,
-                                self.AwardItemCount,
-                                "...",
-                                self.SuperItemCount,
-                                "...",
-                                self.SuperItemCanChooseCount
-                                )
-        return DumpString
-
-
-m_NAtagMCActXianXiaMJLayerInfo=tagMCActXianXiaMJLayerInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJLayerInfo.Head.Cmd,m_NAtagMCActXianXiaMJLayerInfo.Head.SubCmd))] = m_NAtagMCActXianXiaMJLayerInfo
-
-
-#------------------------------------------------------
 # AA 87 运势活动信息 #tagMCActYunshiInfo
 
 class  tagMCActYunshiInfo(Structure):
@@ -31172,961 +28943,6 @@
 
 
 #------------------------------------------------------
-# AA 76 Boss历练跨服活动信息 #tagMCCrossActBossTrialInfo
-
-class  tagMCCrossActBossTrialItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCCrossActBossTrialItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 76 Boss历练跨服活动信息 //tagMCCrossActBossTrialInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCCrossActBossTrialAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActBossTrialItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActBossTrialItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActBossTrialBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActBossTrialItem> AwardItemList)// 奖励物品列表,当仙盟榜时,如果有该奖励则代表盟主奖励,否则默认均为成员奖励
-    MemCount = 0    #(BYTE MemCount)// 成员奖励物品数
-    MemAwardItemList = list()    #(vector<tagMCCrossActBossTrialItem> MemAwardItemList)// 成员奖励物品列表,仅仙盟榜时有效
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCCrossActBossTrialAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActBossTrialItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.MemCount):
-            temMemAwardItemList = tagMCCrossActBossTrialItem()
-            _pos = temMemAwardItemList.ReadData(_lpData, _pos)
-            self.MemAwardItemList.append(temMemAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCCrossActBossTrialAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.MemCount = 0
-        self.MemAwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 1
-        for i in range(self.MemCount):
-            length += self.MemAwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.MemCount)
-        for i in range(self.MemCount):
-            data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                MemCount:%d,
-                                MemAwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.MemCount,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActBossTrialInfo(Structure):
-    Head = tagHead()
-    ServerInfoLen = 0    #(BYTE ServerInfoLen)
-    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
-    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
-    ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    FamilyBillCount = 0    #(BYTE FamilyBillCount)
-    FamilyBillboardInfoList = list()    #(vector<tagMCCrossActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x76
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
-        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCCrossActBossTrialBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.FamilyBillCount):
-            temFamilyBillboardInfoList = tagMCCrossActBossTrialBillard()
-            _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
-            self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x76
-        self.ServerInfoLen = 0
-        self.ServerIDRangeInfo = ""
-        self.GroupValue1 = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.IsDayReset = 0
-        self.ResetType = 0
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        self.FamilyBillCount = 0
-        self.FamilyBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += len(self.ServerIDRangeInfo)
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        length += 1
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-        length += 1
-        for i in range(self.FamilyBillCount):
-            length += self.FamilyBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
-        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
-        data = CommFunc.WriteBYTE(data, self.GroupValue1)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.IsDayReset)
-        data = CommFunc.WriteBYTE(data, self.ResetType)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
-        for i in range(self.FamilyBillCount):
-            data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ServerInfoLen:%d,
-                                ServerIDRangeInfo:%s,
-                                GroupValue1:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                IsDayReset:%d,
-                                ResetType:%d,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s,
-                                FamilyBillCount:%d,
-                                FamilyBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ServerInfoLen,
-                                self.ServerIDRangeInfo,
-                                self.GroupValue1,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.IsDayReset,
-                                self.ResetType,
-                                self.PersonalBillCount,
-                                "...",
-                                self.FamilyBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCCrossActBossTrialInfo=tagMCCrossActBossTrialInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActBossTrialInfo.Head.Cmd,m_NAtagMCCrossActBossTrialInfo.Head.SubCmd))] = m_NAtagMCCrossActBossTrialInfo
-
-
-#------------------------------------------------------
-# AA 83 古宝养成跨服活动信息 #tagMCCrossActGubaoInfo
-
-class  tagMCCrossActGubaoItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCCrossActGubaoItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 83 古宝养成跨服活动信息 //tagMCCrossActGubaoInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCCrossActGubaoAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActGubaoItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActGubaoItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActGubaoBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActGubaoItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCCrossActGubaoAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActGubaoItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCCrossActGubaoAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActGubaoInfo(Structure):
-    Head = tagHead()
-    ServerInfoLen = 0    #(BYTE ServerInfoLen)
-    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
-    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActGubaoBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x83
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
-        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCCrossActGubaoBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x83
-        self.ServerInfoLen = 0
-        self.ServerIDRangeInfo = ""
-        self.GroupValue1 = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += len(self.ServerIDRangeInfo)
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
-        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
-        data = CommFunc.WriteBYTE(data, self.GroupValue1)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ServerInfoLen:%d,
-                                ServerIDRangeInfo:%s,
-                                GroupValue1:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ServerInfoLen,
-                                self.ServerIDRangeInfo,
-                                self.GroupValue1,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCCrossActGubaoInfo=tagMCCrossActGubaoInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActGubaoInfo.Head.Cmd,m_NAtagMCCrossActGubaoInfo.Head.SubCmd))] = m_NAtagMCCrossActGubaoInfo
-
-
-#------------------------------------------------------
-# AA 86 骑宠养成跨服活动信息 #tagMCCrossActHorsePetTrainInfo
-
-class  tagMCCrossActHorsePetTrainItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCCrossActHorsePetTrainItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 86 骑宠养成跨服活动信息 //tagMCCrossActHorsePetTrainInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCCrossActHorsePetTrainAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActHorsePetTrainItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActHorsePetTrainItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActHorsePetTrainBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActHorsePetTrainItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCCrossActHorsePetTrainAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActHorsePetTrainItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCCrossActHorsePetTrainAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActHorsePetTrainInfo(Structure):
-    Head = tagHead()
-    ServerInfoLen = 0    #(BYTE ServerInfoLen)
-    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
-    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActHorsePetTrainBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x86
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
-        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCCrossActHorsePetTrainBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x86
-        self.ServerInfoLen = 0
-        self.ServerIDRangeInfo = ""
-        self.GroupValue1 = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += len(self.ServerIDRangeInfo)
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
-        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
-        data = CommFunc.WriteBYTE(data, self.GroupValue1)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ServerInfoLen:%d,
-                                ServerIDRangeInfo:%s,
-                                GroupValue1:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ServerInfoLen,
-                                self.ServerIDRangeInfo,
-                                self.GroupValue1,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCCrossActHorsePetTrainInfo=tagMCCrossActHorsePetTrainInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActHorsePetTrainInfo.Head.Cmd,m_NAtagMCCrossActHorsePetTrainInfo.Head.SubCmd))] = m_NAtagMCCrossActHorsePetTrainInfo
-
-
-#------------------------------------------------------
 # AA 90 炼器跨服活动信息 #tagMCCrossActLianqiInfo
 
 class  tagMCCrossActLianqiItem(Structure):
@@ -32628,314 +29444,6 @@
 
 m_NAtagMCActLianqiPlayerInfo=tagMCActLianqiPlayerInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActLianqiPlayerInfo.Head.Cmd,m_NAtagMCActLianqiPlayerInfo.Head.SubCmd))] = m_NAtagMCActLianqiPlayerInfo
-
-
-#------------------------------------------------------
-# AA 80 仙匣秘境跨服活动信息 #tagMCCrossActXianXiaMJInfo
-
-class  tagMCCrossActXianXiaMJItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", c_ushort),    
-                  ("IsBind", 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.ItemID = 0
-        self.ItemCount = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCCrossActXianXiaMJItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 80 仙匣秘境跨服活动信息 //tagMCCrossActXianXiaMJInfo:
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCCrossActXianXiaMJAwardEx(Structure):
-    NeedScore = 0    #(DWORD NeedScore)// 额外奖励所需积分
-    Count = 0    #(BYTE Count)// 额外奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActXianXiaMJItem> AwardItemList)// 额外奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActXianXiaMJItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.NeedScore = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                NeedScore:%d,
-                                Count:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.NeedScore,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActXianXiaMJBillard(Structure):
-    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
-    Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCCrossActXianXiaMJItem> AwardItemList)// 奖励物品列表
-    NeedScore = 0    #(DWORD NeedScore)// 上榜所需积分
-    CountEx = 0    #(BYTE CountEx)// 额外奖励数
-    AwardItemExList = list()    #(vector<tagMCCrossActXianXiaMJAwardEx> AwardItemExList)// 额外奖励列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temAwardItemList = tagMCCrossActXianXiaMJItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        self.NeedScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.CountEx,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.CountEx):
-            temAwardItemExList = tagMCCrossActXianXiaMJAwardEx()
-            _pos = temAwardItemExList.ReadData(_lpData, _pos)
-            self.AwardItemExList.append(temAwardItemExList)
-        return _pos
-
-    def Clear(self):
-        self.Rank = 0
-        self.Count = 0
-        self.AwardItemList = list()
-        self.NeedScore = 0
-        self.CountEx = 0
-        self.AwardItemExList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.AwardItemList[i].GetLength()
-        length += 4
-        length += 1
-        for i in range(self.CountEx):
-            length += self.AwardItemExList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.Rank)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.NeedScore)
-        data = CommFunc.WriteBYTE(data, self.CountEx)
-        for i in range(self.CountEx):
-            data = CommFunc.WriteString(data, self.AwardItemExList[i].GetLength(), self.AwardItemExList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Rank:%d,
-                                Count:%d,
-                                AwardItemList:%s,
-                                NeedScore:%d,
-                                CountEx:%d,
-                                AwardItemExList:%s
-                                '''\
-                                %(
-                                self.Rank,
-                                self.Count,
-                                "...",
-                                self.NeedScore,
-                                self.CountEx,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagMCCrossActXianXiaMJInfo(Structure):
-    Head = tagHead()
-    ServerInfoLen = 0    #(BYTE ServerInfoLen)
-    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
-    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
-    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
-    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
-    PersonalBillCount = 0    #(BYTE PersonalBillCount)
-    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActXianXiaMJBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x80
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
-        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
-        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PersonalBillCount):
-            temPersonalBillboardInfoList = tagMCCrossActXianXiaMJBillard()
-            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
-            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x80
-        self.ServerInfoLen = 0
-        self.ServerIDRangeInfo = ""
-        self.GroupValue1 = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.JoinStartTime = ""
-        self.JoinEndTime = ""
-        self.IsDayReset = 0
-        self.PersonalBillCount = 0
-        self.PersonalBillboardInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += len(self.ServerIDRangeInfo)
-        length += 1
-        length += 10
-        length += 10
-        length += 5
-        length += 5
-        length += 1
-        length += 1
-        for i in range(self.PersonalBillCount):
-            length += self.PersonalBillboardInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
-        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
-        data = CommFunc.WriteBYTE(data, self.GroupValue1)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
-        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
-        data = CommFunc.WriteBYTE(data, self.IsDayReset)
-        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
-        for i in range(self.PersonalBillCount):
-            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ServerInfoLen:%d,
-                                ServerIDRangeInfo:%s,
-                                GroupValue1:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                JoinStartTime:%s,
-                                JoinEndTime:%s,
-                                IsDayReset:%d,
-                                PersonalBillCount:%d,
-                                PersonalBillboardInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ServerInfoLen,
-                                self.ServerIDRangeInfo,
-                                self.GroupValue1,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.JoinStartTime,
-                                self.JoinEndTime,
-                                self.IsDayReset,
-                                self.PersonalBillCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCCrossActXianXiaMJInfo=tagMCCrossActXianXiaMJInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActXianXiaMJInfo.Head.Cmd,m_NAtagMCCrossActXianXiaMJInfo.Head.SubCmd))] = m_NAtagMCCrossActXianXiaMJInfo
 
 
 #------------------------------------------------------
@@ -40077,54 +36585,6 @@
 
 
 #------------------------------------------------------
-# B0 50 收杆结果 #tagMCFishResult
-
-class  tagMCFishResult(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x50
-        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 = 0xB0
-        self.SubCmd = 0x50
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCFishResult)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 50 收杆结果 //tagMCFishResult:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagMCFishResult=tagMCFishResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFishResult.Cmd,m_NAtagMCFishResult.SubCmd))] = m_NAtagMCFishResult
-
-
-#------------------------------------------------------
 # B0 05 接收协助感谢礼物预览 #tagGCGetAssistThanksGiftPreview
 
 class  tagGCGetAssistThanksGiftPreview(Structure):
@@ -40280,568 +36740,20 @@
 
 
 #------------------------------------------------------
-# B0 34 福地结算奖励信息 #tagGCMineAreaAwardInfo
+# B0 37 淘金营地信息 #tagSCGoldRushCampInfo
 
-class  tagGCMineAreaAwardInfo(Structure):
-    Head = tagHead()
-    AwardType = 0    #(BYTE AwardType)// 0-通知有奖励,前端下次进入福地可请求进行结算;1-结算奖励结果通知
-    AwardLen = 0    #(BYTE AwardLen)
-    AwardInfo = ""    #(String AwardInfo)//奖励信息 [物品ID,个数,是否拍品], ...]
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x34
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.AwardType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.AwardLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.AwardInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.AwardLen)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x34
-        self.AwardType = 0
-        self.AwardLen = 0
-        self.AwardInfo = ""
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += len(self.AwardInfo)
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.AwardType)
-        data = CommFunc.WriteBYTE(data, self.AwardLen)
-        data = CommFunc.WriteString(data, self.AwardLen, self.AwardInfo)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                AwardType:%d,
-                                AwardLen:%d,
-                                AwardInfo:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.AwardType,
-                                self.AwardLen,
-                                self.AwardInfo
-                                )
-        return DumpString
-
-
-m_NAtagGCMineAreaAwardInfo=tagGCMineAreaAwardInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineAreaAwardInfo.Head.Cmd,m_NAtagGCMineAreaAwardInfo.Head.SubCmd))] = m_NAtagGCMineAreaAwardInfo
-
-
-#------------------------------------------------------
-# B0 33 福地详细信息 #tagGCMineAreaInfo
-
-class  tagGCMineItem(Structure):
-    Index = 0    #(BYTE Index)// 矿物所在福地位置索引,0~n
-    MineID = 0    #(WORD MineID)// 矿物ID,对应福地采集表中ID,0代表该索引位置没有矿物
-    MineType = 0    #(BYTE MineType)// 矿物类型:0-常规;1-超级
-    UpdTime = 0    #(DWORD UpdTime)// 最后一次更新时间戳
-    PosLen = 0    #(BYTE PosLen)
-    Position = ""    #(String Position)// 最后一次更新时所在位置百分比,0~100,支持小数,下0上100,可认为分为100格,速度为 x格/秒
-    SpeedLen = 0    #(BYTE SpeedLen)
-    MoveSpeed = ""    #(String MoveSpeed)// 移动速度,x格/秒,支持小数
-    EndTime = 0    #(DWORD EndTime)// 拉取结束时间戳
-    WorkerCount = 0    #(BYTE WorkerCount)// 工人个数,为0时代表福地玩家没有使用工人拉回
-    RobPlayerID = 0    #(DWORD RobPlayerID)// 抢夺玩家ID,为0时代表没人抢夺
-    RobWorkerCount = 0    #(BYTE RobWorkerCount)// 抢夺工人个数
-    RobPlayerName = ""    #(char RobPlayerName[33])
-    RobJob = 0    #(BYTE RobJob)
-    RobFace = 0    #(DWORD RobFace)
-    RobFacePic = 0    #(DWORD RobFacePic)
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Index,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.MineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.MineType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.UpdTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.PosLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.Position,_pos = CommFunc.ReadString(_lpData, _pos,self.PosLen)
-        self.SpeedLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.MoveSpeed,_pos = CommFunc.ReadString(_lpData, _pos,self.SpeedLen)
-        self.EndTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.WorkerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.RobPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.RobWorkerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.RobPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,33)
-        self.RobJob,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.RobFace,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.RobFacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Index = 0
-        self.MineID = 0
-        self.MineType = 0
-        self.UpdTime = 0
-        self.PosLen = 0
-        self.Position = ""
-        self.SpeedLen = 0
-        self.MoveSpeed = ""
-        self.EndTime = 0
-        self.WorkerCount = 0
-        self.RobPlayerID = 0
-        self.RobWorkerCount = 0
-        self.RobPlayerName = ""
-        self.RobJob = 0
-        self.RobFace = 0
-        self.RobFacePic = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 1
-        length += 2
-        length += 1
-        length += 4
-        length += 1
-        length += len(self.Position)
-        length += 1
-        length += len(self.MoveSpeed)
-        length += 4
-        length += 1
-        length += 4
-        length += 1
-        length += 33
-        length += 1
-        length += 4
-        length += 4
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteBYTE(data, self.Index)
-        data = CommFunc.WriteWORD(data, self.MineID)
-        data = CommFunc.WriteBYTE(data, self.MineType)
-        data = CommFunc.WriteDWORD(data, self.UpdTime)
-        data = CommFunc.WriteBYTE(data, self.PosLen)
-        data = CommFunc.WriteString(data, self.PosLen, self.Position)
-        data = CommFunc.WriteBYTE(data, self.SpeedLen)
-        data = CommFunc.WriteString(data, self.SpeedLen, self.MoveSpeed)
-        data = CommFunc.WriteDWORD(data, self.EndTime)
-        data = CommFunc.WriteBYTE(data, self.WorkerCount)
-        data = CommFunc.WriteDWORD(data, self.RobPlayerID)
-        data = CommFunc.WriteBYTE(data, self.RobWorkerCount)
-        data = CommFunc.WriteString(data, 33, self.RobPlayerName)
-        data = CommFunc.WriteBYTE(data, self.RobJob)
-        data = CommFunc.WriteDWORD(data, self.RobFace)
-        data = CommFunc.WriteDWORD(data, self.RobFacePic)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Index:%d,
-                                MineID:%d,
-                                MineType:%d,
-                                UpdTime:%d,
-                                PosLen:%d,
-                                Position:%s,
-                                SpeedLen:%d,
-                                MoveSpeed:%s,
-                                EndTime:%d,
-                                WorkerCount:%d,
-                                RobPlayerID:%d,
-                                RobWorkerCount:%d,
-                                RobPlayerName:%s,
-                                RobJob:%d,
-                                RobFace:%d,
-                                RobFacePic:%d
-                                '''\
-                                %(
-                                self.Index,
-                                self.MineID,
-                                self.MineType,
-                                self.UpdTime,
-                                self.PosLen,
-                                self.Position,
-                                self.SpeedLen,
-                                self.MoveSpeed,
-                                self.EndTime,
-                                self.WorkerCount,
-                                self.RobPlayerID,
-                                self.RobWorkerCount,
-                                self.RobPlayerName,
-                                self.RobJob,
-                                self.RobFace,
-                                self.RobFacePic
-                                )
-        return DumpString
-
-
-class  tagGCMineArea(Structure):
-    PlayerID = 0    #(DWORD PlayerID)// 福地所属玩家ID,可能是自己或其他玩家ID,当ID小于10000时为假人
-    PlayerName = ""    #(char PlayerName[33])// 可能为空,如自己或假人
-    Job = 0    #(BYTE Job)
-    Face = 0    #(DWORD Face)
-    FacePic = 0    #(DWORD FacePic)
-    RobValue = 0    #(DWORD RobValue)// 抢劫敌对值
-    MineCount = 0    #(BYTE MineCount)
-    MineItemList = list()    #(vector<tagGCMineItem> MineItemList)// 矿物列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.PlayerName,_pos = CommFunc.ReadString(_lpData, _pos,33)
-        self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.Face,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.FacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.RobValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.MineCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.MineCount):
-            temMineItemList = tagGCMineItem()
-            _pos = temMineItemList.ReadData(_lpData, _pos)
-            self.MineItemList.append(temMineItemList)
-        return _pos
-
-    def Clear(self):
-        self.PlayerID = 0
-        self.PlayerName = ""
-        self.Job = 0
-        self.Face = 0
-        self.FacePic = 0
-        self.RobValue = 0
-        self.MineCount = 0
-        self.MineItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 4
-        length += 33
-        length += 1
-        length += 4
-        length += 4
-        length += 4
-        length += 1
-        for i in range(self.MineCount):
-            length += self.MineItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteDWORD(data, self.PlayerID)
-        data = CommFunc.WriteString(data, 33, self.PlayerName)
-        data = CommFunc.WriteBYTE(data, self.Job)
-        data = CommFunc.WriteDWORD(data, self.Face)
-        data = CommFunc.WriteDWORD(data, self.FacePic)
-        data = CommFunc.WriteDWORD(data, self.RobValue)
-        data = CommFunc.WriteBYTE(data, self.MineCount)
-        for i in range(self.MineCount):
-            data = CommFunc.WriteString(data, self.MineItemList[i].GetLength(), self.MineItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                PlayerID:%d,
-                                PlayerName:%s,
-                                Job:%d,
-                                Face:%d,
-                                FacePic:%d,
-                                RobValue:%d,
-                                MineCount:%d,
-                                MineItemList:%s
-                                '''\
-                                %(
-                                self.PlayerID,
-                                self.PlayerName,
-                                self.Job,
-                                self.Face,
-                                self.FacePic,
-                                self.RobValue,
-                                self.MineCount,
-                                "..."
-                                )
-        return DumpString
-
-
-class  tagGCMineAreaInfo(Structure):
-    Head = tagHead()
-    QueryType = 0    #(BYTE QueryType)// 查询同步类型:0-后端主动同步;1-查看指定福地;2-查看道友福地列表;3-查看周围随机福地列表
-    QueryValue = 0    #(DWORD QueryValue)// 查询值,类型1时-发送目标玩家ID;3时-发送是否重新随机
-    AreaCount = 0    #(BYTE AreaCount)
-    AreaList = list()    #(vector<tagGCMineArea> AreaList)// 福地列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x33
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.QueryType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.QueryValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.AreaCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.AreaCount):
-            temAreaList = tagGCMineArea()
-            _pos = temAreaList.ReadData(_lpData, _pos)
-            self.AreaList.append(temAreaList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x33
-        self.QueryType = 0
-        self.QueryValue = 0
-        self.AreaCount = 0
-        self.AreaList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 4
-        length += 1
-        for i in range(self.AreaCount):
-            length += self.AreaList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.QueryType)
-        data = CommFunc.WriteDWORD(data, self.QueryValue)
-        data = CommFunc.WriteBYTE(data, self.AreaCount)
-        for i in range(self.AreaCount):
-            data = CommFunc.WriteString(data, self.AreaList[i].GetLength(), self.AreaList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                QueryType:%d,
-                                QueryValue:%d,
-                                AreaCount:%d,
-                                AreaList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.QueryType,
-                                self.QueryValue,
-                                self.AreaCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagGCMineAreaInfo=tagGCMineAreaInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineAreaInfo.Head.Cmd,m_NAtagGCMineAreaInfo.Head.SubCmd))] = m_NAtagGCMineAreaInfo
-
-
-#------------------------------------------------------
-# B0 35 福地记录信息 #tagGCMineAreaRecordInfo
-
-class  tagGCMineAreaRecord(Structure):
-    RecordType = 0    #(BYTE RecordType)// 记录类型;1-自己拉物品;2-物品被人抢
-    TagPlayerID = 0    #(DWORD TagPlayerID)// 目标玩家ID,等于自己玩家ID时代表拉自己的,反之为抢别人的
-    RecordTime = 0    #(DWORD RecordTime)// 记录时间戳
-    MineID = 0    #(WORD MineID)// 矿物ID,对应福地采集表中ID
-    TagPlayerName = ""    #(char TagPlayerName[33])
-    TagJob = 0    #(BYTE TagJob)
-    TagFace = 0    #(DWORD TagFace)
-    TagFacePic = 0    #(DWORD TagFacePic)
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.RecordType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.TagPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.RecordTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.MineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.TagPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,33)
-        self.TagJob,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.TagFace,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.TagFacePic,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.RecordType = 0
-        self.TagPlayerID = 0
-        self.RecordTime = 0
-        self.MineID = 0
-        self.TagPlayerName = ""
-        self.TagJob = 0
-        self.TagFace = 0
-        self.TagFacePic = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 1
-        length += 4
-        length += 4
-        length += 2
-        length += 33
-        length += 1
-        length += 4
-        length += 4
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteBYTE(data, self.RecordType)
-        data = CommFunc.WriteDWORD(data, self.TagPlayerID)
-        data = CommFunc.WriteDWORD(data, self.RecordTime)
-        data = CommFunc.WriteWORD(data, self.MineID)
-        data = CommFunc.WriteString(data, 33, self.TagPlayerName)
-        data = CommFunc.WriteBYTE(data, self.TagJob)
-        data = CommFunc.WriteDWORD(data, self.TagFace)
-        data = CommFunc.WriteDWORD(data, self.TagFacePic)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                RecordType:%d,
-                                TagPlayerID:%d,
-                                RecordTime:%d,
-                                MineID:%d,
-                                TagPlayerName:%s,
-                                TagJob:%d,
-                                TagFace:%d,
-                                TagFacePic:%d
-                                '''\
-                                %(
-                                self.RecordType,
-                                self.TagPlayerID,
-                                self.RecordTime,
-                                self.MineID,
-                                self.TagPlayerName,
-                                self.TagJob,
-                                self.TagFace,
-                                self.TagFacePic
-                                )
-        return DumpString
-
-
-class  tagGCMineAreaRecordInfo(Structure):
-    Head = tagHead()
-    RecordCount = 0    #(BYTE RecordCount)
-    AreaRecordList = list()    #(vector<tagGCMineAreaRecord> AreaRecordList)
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x35
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.RecordCount):
-            temAreaRecordList = tagGCMineAreaRecord()
-            _pos = temAreaRecordList.ReadData(_lpData, _pos)
-            self.AreaRecordList.append(temAreaRecordList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x35
-        self.RecordCount = 0
-        self.AreaRecordList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        for i in range(self.RecordCount):
-            length += self.AreaRecordList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.RecordCount)
-        for i in range(self.RecordCount):
-            data = CommFunc.WriteString(data, self.AreaRecordList[i].GetLength(), self.AreaRecordList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                RecordCount:%d,
-                                AreaRecordList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.RecordCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagGCMineAreaRecordInfo=tagGCMineAreaRecordInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineAreaRecordInfo.Head.Cmd,m_NAtagGCMineAreaRecordInfo.Head.SubCmd))] = m_NAtagGCMineAreaRecordInfo
-
-
-#------------------------------------------------------
-# B0 32 福地物品拉预览结果 #tagGCMineItemPullPreviewRet
-
-class  tagGCMineItemPullPreviewRet(Structure):
+class  tagSCGoldRushCamp(Structure):
     _pack_ = 1
     _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("PlayerID", c_int),    # 福地所属玩家ID,0默认自己
-                  ("ItemIndex", c_ubyte),    # 物品所在位置索引0~n
-                  ("WorkerCount", c_ubyte),    # 上工人人数
-                  ("NeedSeconds", c_int),    # 预计需要时间,秒
+                  ("CampID", c_ubyte),    # 营地ID,从1开始
+                  ("GoldID", c_ubyte),    # 淘金ID,为0时代表该营地为空
+                  ("RefreshCnt", c_ushort),    # 已刷新次数
+                  ("EndTime", c_int),    # 预计完成时的时间戳,为0时代表还未开始淘金,通过该时间进行倒计时
+                  ("WorkerCnt", c_ubyte),    # 使用监工数
                   ]
 
     def __init__(self):
         self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x32
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -40850,178 +36762,203 @@
         return _pos + self.GetLength()
 
     def Clear(self):
-        self.Cmd = 0xB0
-        self.SubCmd = 0x32
-        self.PlayerID = 0
-        self.ItemIndex = 0
-        self.WorkerCount = 0
-        self.NeedSeconds = 0
+        self.CampID = 0
+        self.GoldID = 0
+        self.RefreshCnt = 0
+        self.EndTime = 0
+        self.WorkerCnt = 0
         return
 
     def GetLength(self):
-        return sizeof(tagGCMineItemPullPreviewRet)
+        return sizeof(tagSCGoldRushCamp)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B0 32 福地物品拉预览结果 //tagGCMineItemPullPreviewRet:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                PlayerID:%d,
-                                ItemIndex:%d,
-                                WorkerCount:%d,
-                                NeedSeconds:%d
+        DumpString = '''// B0 37 淘金营地信息 //tagSCGoldRushCampInfo:
+                                CampID:%d,
+                                GoldID:%d,
+                                RefreshCnt:%d,
+                                EndTime:%d,
+                                WorkerCnt:%d
                                 '''\
                                 %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.PlayerID,
-                                self.ItemIndex,
-                                self.WorkerCount,
-                                self.NeedSeconds
+                                self.CampID,
+                                self.GoldID,
+                                self.RefreshCnt,
+                                self.EndTime,
+                                self.WorkerCnt
                                 )
         return DumpString
 
 
-m_NAtagGCMineItemPullPreviewRet=tagGCMineItemPullPreviewRet()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineItemPullPreviewRet.Cmd,m_NAtagGCMineItemPullPreviewRet.SubCmd))] = m_NAtagGCMineItemPullPreviewRet
-
-
-#------------------------------------------------------
-# B0 30 玩家福地相关信息 #tagMCPlayerMineAreaInfo
-
-class  tagMCPlayerMineAreaInfo(Structure):
+class  tagSCGoldRushCampInfo(Structure):
     Head = tagHead()
-    WorkerCount = 0    #(BYTE WorkerCount)// 已雇佣工人数
-    EnergyUsed = 0    #(WORD EnergyUsed)// 今日已消耗体力
-    RefreshCount = 0    #(DWORD RefreshCount)// 今日福地刷新物品次数 - 普通刷新
-    RefreshCountSuper = 0    #(BYTE RefreshCountSuper)// 今日福地刷新物品次数 - 超级刷新
-    RefreshCountRob = 0    #(WORD RefreshCountRob)// 今日福地刷新周围玩家次数
-    TreasureCount = 0    #(BYTE TreasureCount)// 聚宝盆类型个数,对应类型 0~n
-    TreasureState = list()    #(vector<BYTE> TreasureState)// 聚宝盆是否已激活列表,[类型0是否已激活, ...]
-    TreasureAward = list()    #(vector<BYTE> TreasureAward)// 聚宝盆奖励是否已领取列表,[类型0是否已领取, ...]
-    TreasureProgress = list()    #(vector<BYTE> TreasureProgress)// 聚宝盆进度值列表,[类型0进度值, ...],满进度100
-    HelpAwardCount = 0    #(BYTE HelpAwardCount)// 今日已帮助别人奖励次数
-    HousekeeperEndTime = 0    #(DWORD HousekeeperEndTime)// 自动管家到期时间戳,有值同时也代表免费试用已使用
+    CampCnt = 0    #(BYTE CampCnt)
+    CampList = list()    #(vector<tagSCGoldRushCamp> CampList)// 营地列表
     data = None
 
     def __init__(self):
         self.Clear()
         self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x30
+        self.Head.SubCmd = 0x37
         return
 
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.WorkerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.EnergyUsed,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.RefreshCount,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.RefreshCountSuper,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.RefreshCountRob,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.TreasureCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.TreasureCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.TreasureState.append(value)
-        for i in range(self.TreasureCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.TreasureAward.append(value)
-        for i in range(self.TreasureCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.TreasureProgress.append(value)
-        self.HelpAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.HousekeeperEndTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.CampCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.CampCnt):
+            temCampList = tagSCGoldRushCamp()
+            _pos = temCampList.ReadData(_lpData, _pos)
+            self.CampList.append(temCampList)
         return _pos
 
     def Clear(self):
         self.Head = tagHead()
         self.Head.Clear()
         self.Head.Cmd = 0xB0
-        self.Head.SubCmd = 0x30
-        self.WorkerCount = 0
-        self.EnergyUsed = 0
-        self.RefreshCount = 0
-        self.RefreshCountSuper = 0
-        self.RefreshCountRob = 0
-        self.TreasureCount = 0
-        self.TreasureState = list()
-        self.TreasureAward = list()
-        self.TreasureProgress = list()
-        self.HelpAwardCount = 0
-        self.HousekeeperEndTime = 0
+        self.Head.SubCmd = 0x37
+        self.CampCnt = 0
+        self.CampList = list()
         return
 
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
         length += 1
-        length += 2
-        length += 4
-        length += 1
-        length += 2
-        length += 1
-        length += 1 * self.TreasureCount
-        length += 1 * self.TreasureCount
-        length += 1 * self.TreasureCount
-        length += 1
-        length += 4
+        for i in range(self.CampCnt):
+            length += self.CampList[i].GetLength()
 
         return length
 
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.WorkerCount)
-        data = CommFunc.WriteWORD(data, self.EnergyUsed)
-        data = CommFunc.WriteDWORD(data, self.RefreshCount)
-        data = CommFunc.WriteBYTE(data, self.RefreshCountSuper)
-        data = CommFunc.WriteWORD(data, self.RefreshCountRob)
-        data = CommFunc.WriteBYTE(data, self.TreasureCount)
-        for i in range(self.TreasureCount):
-            data = CommFunc.WriteBYTE(data, self.TreasureState[i])
-        for i in range(self.TreasureCount):
-            data = CommFunc.WriteBYTE(data, self.TreasureAward[i])
-        for i in range(self.TreasureCount):
-            data = CommFunc.WriteBYTE(data, self.TreasureProgress[i])
-        data = CommFunc.WriteBYTE(data, self.HelpAwardCount)
-        data = CommFunc.WriteDWORD(data, self.HousekeeperEndTime)
+        data = CommFunc.WriteBYTE(data, self.CampCnt)
+        for i in range(self.CampCnt):
+            data = CommFunc.WriteString(data, self.CampList[i].GetLength(), self.CampList[i].GetBuffer())
         return data
 
     def OutputString(self):
         DumpString = '''
                                 Head:%s,
-                                WorkerCount:%d,
-                                EnergyUsed:%d,
-                                RefreshCount:%d,
-                                RefreshCountSuper:%d,
-                                RefreshCountRob:%d,
-                                TreasureCount:%d,
-                                TreasureState:%s,
-                                TreasureAward:%s,
-                                TreasureProgress:%s,
-                                HelpAwardCount:%d,
-                                HousekeeperEndTime:%d
+                                CampCnt:%d,
+                                CampList:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
-                                self.WorkerCount,
-                                self.EnergyUsed,
-                                self.RefreshCount,
-                                self.RefreshCountSuper,
-                                self.RefreshCountRob,
-                                self.TreasureCount,
-                                "...",
-                                "...",
-                                "...",
-                                self.HelpAwardCount,
-                                self.HousekeeperEndTime
+                                self.CampCnt,
+                                "..."
                                 )
         return DumpString
 
 
-m_NAtagMCPlayerMineAreaInfo=tagMCPlayerMineAreaInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCPlayerMineAreaInfo.Head.Cmd,m_NAtagMCPlayerMineAreaInfo.Head.SubCmd))] = m_NAtagMCPlayerMineAreaInfo
+m_NAtagSCGoldRushCampInfo=tagSCGoldRushCampInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCGoldRushCampInfo.Head.Cmd,m_NAtagSCGoldRushCampInfo.Head.SubCmd))] = m_NAtagSCGoldRushCampInfo
+
+
+#------------------------------------------------------
+# B0 36 淘金相关信息 #tagSCGoldRushInfo
+
+class  tagSCGoldRushInfo(Structure):
+    Head = tagHead()
+    CampState = 0    #(DWORD CampState)// 已解锁营地状态,按营地ID二进制位运算判断是否已解锁
+    WorkerState = 0    #(DWORD WorkerState)// 已雇佣工人状态,按工人ID二进制位运算判断是否已解锁
+    PanningCnt = 0    #(DWORD PanningCnt)// 累计淘金次数
+    LastRecoverTime = 0    #(DWORD LastRecoverTime)// 上次免费恢复淘金令时间戳,为0时可不用倒计时
+    HousekeeperEndTime = 0    #(DWORD HousekeeperEndTime)// 自动管家到期时间戳,有值同时也代表免费试用已使用
+    WarehouseCnt = 0    #(BYTE WarehouseCnt)// 淘金仓库物品数
+    WarehouseIDList = list()    #(vector<BYTE> WarehouseIDList)// 淘金仓库已完成淘金ID列表 [索引0淘金ID, ...],淘金ID为0代表该索引位置为空
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x36
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.CampState,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.WorkerState,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.PanningCnt,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.LastRecoverTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.HousekeeperEndTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.WarehouseCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.WarehouseCnt):
+            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
+            self.WarehouseIDList.append(value)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x36
+        self.CampState = 0
+        self.WorkerState = 0
+        self.PanningCnt = 0
+        self.LastRecoverTime = 0
+        self.HousekeeperEndTime = 0
+        self.WarehouseCnt = 0
+        self.WarehouseIDList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 1
+        length += 1 * self.WarehouseCnt
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteDWORD(data, self.CampState)
+        data = CommFunc.WriteDWORD(data, self.WorkerState)
+        data = CommFunc.WriteDWORD(data, self.PanningCnt)
+        data = CommFunc.WriteDWORD(data, self.LastRecoverTime)
+        data = CommFunc.WriteDWORD(data, self.HousekeeperEndTime)
+        data = CommFunc.WriteBYTE(data, self.WarehouseCnt)
+        for i in range(self.WarehouseCnt):
+            data = CommFunc.WriteBYTE(data, self.WarehouseIDList[i])
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                CampState:%d,
+                                WorkerState:%d,
+                                PanningCnt:%d,
+                                LastRecoverTime:%d,
+                                HousekeeperEndTime:%d,
+                                WarehouseCnt:%d,
+                                WarehouseIDList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.CampState,
+                                self.WorkerState,
+                                self.PanningCnt,
+                                self.LastRecoverTime,
+                                self.HousekeeperEndTime,
+                                self.WarehouseCnt,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagSCGoldRushInfo=tagSCGoldRushInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCGoldRushInfo.Head.Cmd,m_NAtagSCGoldRushInfo.Head.SubCmd))] = m_NAtagSCGoldRushInfo
 
 
 #------------------------------------------------------
@@ -42053,207 +37990,6 @@
 
 
 #------------------------------------------------------
-# B1 09 玩家挂机系统信息 #tagMCGuajiInfo
-
-class  tagMCGuajiMoney(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("MoneyType", c_ubyte),    
-                  ("MoneyValue", c_int),    
-                  ]
-
-    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.MoneyType = 0
-        self.MoneyValue = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCGuajiMoney)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
-                                MoneyType:%d,
-                                MoneyValue:%d
-                                '''\
-                                %(
-                                self.MoneyType,
-                                self.MoneyValue
-                                )
-        return DumpString
-
-
-class  tagMCGuajiItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("Count", c_ushort),    
-                  ]
-
-    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.ItemID = 0
-        self.Count = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCGuajiItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
-                                ItemID:%d,
-                                Count:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.Count
-                                )
-        return DumpString
-
-
-class  tagMCGuajiInfo(Structure):
-    Head = tagHead()
-    QuickAwardCount = 0    #(BYTE QuickAwardCount)// 今日已快速挂机收益次数
-    AwardType = 0    #(BYTE AwardType)// 收益类型: 0-已累计预览;1-领取结算结果(包含常规领取跟快速领取)
-    AwardSeconds = 0    #(DWORD AwardSeconds)// 已累计收益时长,秒
-    Exp = 0    #(DWORD Exp)// 已累计经验,求余亿部分
-    ExpPoint = 0    #(DWORD ExpPoint)// 已累计经验,整除亿部分
-    MoneyLen = 0    #(BYTE MoneyLen)
-    MoneyList = list()    #(vector<tagMCGuajiMoney> MoneyList)// 已累计货币
-    ItemLen = 0    #(BYTE ItemLen)
-    ItemList = list()    #(vector<tagMCGuajiItem> ItemList)// 已累计物品
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xB1
-        self.Head.SubCmd = 0x09
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.QuickAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.AwardType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.AwardSeconds,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Exp,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.ExpPoint,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.MoneyLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.MoneyLen):
-            temMoneyList = tagMCGuajiMoney()
-            _pos = temMoneyList.ReadData(_lpData, _pos)
-            self.MoneyList.append(temMoneyList)
-        self.ItemLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.ItemLen):
-            temItemList = tagMCGuajiItem()
-            _pos = temItemList.ReadData(_lpData, _pos)
-            self.ItemList.append(temItemList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xB1
-        self.Head.SubCmd = 0x09
-        self.QuickAwardCount = 0
-        self.AwardType = 0
-        self.AwardSeconds = 0
-        self.Exp = 0
-        self.ExpPoint = 0
-        self.MoneyLen = 0
-        self.MoneyList = list()
-        self.ItemLen = 0
-        self.ItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 4
-        length += 4
-        length += 4
-        length += 1
-        for i in range(self.MoneyLen):
-            length += self.MoneyList[i].GetLength()
-        length += 1
-        for i in range(self.ItemLen):
-            length += self.ItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.QuickAwardCount)
-        data = CommFunc.WriteBYTE(data, self.AwardType)
-        data = CommFunc.WriteDWORD(data, self.AwardSeconds)
-        data = CommFunc.WriteDWORD(data, self.Exp)
-        data = CommFunc.WriteDWORD(data, self.ExpPoint)
-        data = CommFunc.WriteBYTE(data, self.MoneyLen)
-        for i in range(self.MoneyLen):
-            data = CommFunc.WriteString(data, self.MoneyList[i].GetLength(), self.MoneyList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ItemLen)
-        for i in range(self.ItemLen):
-            data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                QuickAwardCount:%d,
-                                AwardType:%d,
-                                AwardSeconds:%d,
-                                Exp:%d,
-                                ExpPoint:%d,
-                                MoneyLen:%d,
-                                MoneyList:%s,
-                                ItemLen:%d,
-                                ItemList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.QuickAwardCount,
-                                self.AwardType,
-                                self.AwardSeconds,
-                                self.Exp,
-                                self.ExpPoint,
-                                self.MoneyLen,
-                                "...",
-                                self.ItemLen,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCGuajiInfo=tagMCGuajiInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGuajiInfo.Head.Cmd,m_NAtagMCGuajiInfo.Head.SubCmd))] = m_NAtagMCGuajiInfo
-
-
-#------------------------------------------------------
 # B1 22 武将信息 #tagSCHeroInfo
 
 class  tagSCHero(Structure):
@@ -42264,6 +38000,8 @@
                   ("BookInitState", c_ubyte),    # 图鉴激活状态:0-未激活;1-可激活;2-已激活
                   ("BookStarLV", c_ushort),    # 图鉴星级等级
                   ("BookBreakLV", c_ushort),    # 图鉴突破等级
+                  ("BookStarLVH", c_ushort),    # 图鉴星级历史最高等级
+                  ("BookBreakLVH", c_ushort),    # 图鉴突破历史最高等级
                   ]
 
     def __init__(self):
@@ -42281,6 +38019,8 @@
         self.BookInitState = 0
         self.BookStarLV = 0
         self.BookBreakLV = 0
+        self.BookStarLVH = 0
+        self.BookBreakLVH = 0
         return
 
     def GetLength(self):
@@ -42295,14 +38035,18 @@
                                 SkinState:%d,
                                 BookInitState:%d,
                                 BookStarLV:%d,
-                                BookBreakLV:%d
+                                BookBreakLV:%d,
+                                BookStarLVH:%d,
+                                BookBreakLVH:%d
                                 '''\
                                 %(
                                 self.HeroID,
                                 self.SkinState,
                                 self.BookInitState,
                                 self.BookStarLV,
-                                self.BookBreakLV
+                                self.BookBreakLV,
+                                self.BookStarLVH,
+                                self.BookBreakLVH
                                 )
         return DumpString
 
@@ -47164,6 +42908,7 @@
                   ("Value1", c_int),    
                   ("Value2", c_int),    
                   ("Value3", c_int),    
+                  ("IsAdd", c_ubyte),    # 是否是添加/覆盖的,1-是;0-否一般为buff的数据刷新
                   ]
 
     def __init__(self):
@@ -47190,6 +42935,7 @@
         self.Value1 = 0
         self.Value2 = 0
         self.Value3 = 0
+        self.IsAdd = 0
         return
 
     def GetLength(self):
@@ -47211,7 +42957,8 @@
                                 OwnerID:%d,
                                 Value1:%d,
                                 Value2:%d,
-                                Value3:%d
+                                Value3:%d,
+                                IsAdd:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -47225,7 +42972,8 @@
                                 self.OwnerID,
                                 self.Value1,
                                 self.Value2,
-                                self.Value3
+                                self.Value3,
+                                self.IsAdd
                                 )
         return DumpString
 
@@ -48360,13 +44108,13 @@
     _fields_ = [
                   ("ObjID", c_int),    # 战斗单位唯一ID
                   ("NPCID", c_int),    # 战斗NPCID,不同的实例ID对应的NPCID可能一样
-                  ("HeroID", c_int),    # 玩家武将ID,仅玩家阵容有
-                  ("SkinID", c_int),    # 玩家武将皮肤ID,仅玩家阵容有
+                  ("HeroID", c_int),    # 武将ID,玩家或NPC均可能有,如果有值则外观相关以该武将为准,否则以NPCID为准
+                  ("SkinID", c_int),    # 武将皮肤ID,玩家或NPC均可能有,如果有值则皮肤以该值为准,否则取NPCID对应的皮肤ID
                   ("HP", c_int),    # 当前血量,求余20亿部分
                   ("HPEx", c_int),    # 当前血量,整除20亿部分
                   ("MaxHP", c_int),    # 最大血量,求余20亿部分
                   ("MaxHPEx", c_int),    # 最大血量,整除20亿部分
-                  ("LV", c_ushort),    # 等级
+                  ("LV", c_ushort),    # 等级,玩家的武将等级或NPC成长等级,等级显示以该值为准
                   ("PosNum", c_ubyte),    # 在本阵容中的站位,从1开始,非主战斗武将为0,如红颜
                   ("AngreXP", c_ushort),    # 当前怒气值
                   ]

--
Gitblit v1.8.0