From 4e3d1ff7e0b98fc18b0b6e63e449f3d7577c0ba6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 05 十一月 2025 11:16:31 +0800
Subject: [PATCH] 16 卡牌服务端(功能开启增加开服天条件支持;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 3407 ++++++-----------------------------------------------------
 1 files changed, 342 insertions(+), 3,065 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index ee35ff6..a543af3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -275,20 +275,21 @@
 
 
 #------------------------------------------------------
-#A0 01 查看玩家信息通用记录 #tagViewUniversalGameRec
+# A0 08 查看通用记录 #tagCSViewGameRec
 
-class  tagViewUniversalGameRec(Structure):
+class  tagCSViewGameRec(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("ViewType", c_ubyte),    #查看记录的类型
+                  ("RecType", c_ushort),    #记录类型
+                  ("RecID", c_int),    #自定义记录ID
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xA0
-        self.SubCmd = 0x01
+        self.SubCmd = 0x08
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -298,32 +299,35 @@
 
     def Clear(self):
         self.Cmd = 0xA0
-        self.SubCmd = 0x01
-        self.ViewType = 0
+        self.SubCmd = 0x08
+        self.RecType = 0
+        self.RecID = 0
         return
 
     def GetLength(self):
-        return sizeof(tagViewUniversalGameRec)
+        return sizeof(tagCSViewGameRec)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''//A0 01 查看玩家信息通用记录 //tagViewUniversalGameRec:
+        DumpString = '''// A0 08 查看通用记录 //tagCSViewGameRec:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                ViewType:%d
+                                RecType:%d,
+                                RecID:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.ViewType
+                                self.RecType,
+                                self.RecID
                                 )
         return DumpString
 
 
-m_NAtagViewUniversalGameRec=tagViewUniversalGameRec()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagViewUniversalGameRec.Cmd,m_NAtagViewUniversalGameRec.SubCmd))] = m_NAtagViewUniversalGameRec
+m_NAtagCSViewGameRec=tagCSViewGameRec()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSViewGameRec.Cmd,m_NAtagCSViewGameRec.SubCmd))] = m_NAtagCSViewGameRec
 
 
 #------------------------------------------------------
@@ -1027,214 +1031,6 @@
 
 
 #------------------------------------------------------
-# A2 36 聊天气泡框升星 #tagCMChatBubbleBoxStarUP
-
-class  tagCMChatBubbleBoxStarUP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("BoxID", c_ubyte),    #气泡ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x36
-        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 = 0xA2
-        self.SubCmd = 0x36
-        self.BoxID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMChatBubbleBoxStarUP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 36 聊天气泡框升星 //tagCMChatBubbleBoxStarUP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                BoxID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.BoxID
-                                )
-        return DumpString
-
-
-m_NAtagCMChatBubbleBoxStarUP=tagCMChatBubbleBoxStarUP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMChatBubbleBoxStarUP.Cmd,m_NAtagCMChatBubbleBoxStarUP.SubCmd))] = m_NAtagCMChatBubbleBoxStarUP
-
-
-#------------------------------------------------------
-# A2 10 清除副本CD#tagCMClearFBCD
-
-class  tagCMClearFBCD(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x10
-        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 = 0xA2
-        self.SubCmd = 0x10
-        self.MapID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMClearFBCD)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 10 清除副本CD//tagCMClearFBCD:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID
-                                )
-        return DumpString
-
-
-m_NAtagCMClearFBCD=tagCMClearFBCD()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClearFBCD.Cmd,m_NAtagCMClearFBCD.SubCmd))] = m_NAtagCMClearFBCD
-
-
-#------------------------------------------------------
-# A2 33 前端退出自定义场景 #tagCMClientExitCustomScene
-
-class  tagCMClientExitCustomScene(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x33
-        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 = 0xA2
-        self.SubCmd = 0x33
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMClientExitCustomScene)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 33 前端退出自定义场景 //tagCMClientExitCustomScene:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMClientExitCustomScene=tagCMClientExitCustomScene()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClientExitCustomScene.Cmd,m_NAtagCMClientExitCustomScene.SubCmd))] = m_NAtagCMClientExitCustomScene
-
-
-#------------------------------------------------------
-# A2 31 前端开始自定义场景 #tagCMClientStartCustomScene
-
-class  tagCMClientStartCustomScene(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    
-                  ("FuncLineID", c_ushort),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x31
-        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 = 0xA2
-        self.SubCmd = 0x31
-        self.MapID = 0
-        self.FuncLineID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMClientStartCustomScene)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 31 前端开始自定义场景 //tagCMClientStartCustomScene:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d,
-                                FuncLineID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID,
-                                self.FuncLineID
-                                )
-        return DumpString
-
-
-m_NAtagCMClientStartCustomScene=tagCMClientStartCustomScene()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClientStartCustomScene.Cmd,m_NAtagCMClientStartCustomScene.SubCmd))] = m_NAtagCMClientStartCustomScene
-
-
-#------------------------------------------------------
 # A2 24 触碰NPC #tagCMTouchNPC
 
 class  tagCMTouchNPC(Structure):
@@ -1284,58 +1080,6 @@
 
 m_NAtagCMTouchNPC=tagCMTouchNPC()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTouchNPC.Cmd,m_NAtagCMTouchNPC.SubCmd))] = m_NAtagCMTouchNPC
-
-
-#------------------------------------------------------
-# A2 34 自定义场景中获取采集奖励 #tagCMGetCustomSceneCollectAward
-
-class  tagCMGetCustomSceneCollectAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("NPCID", c_int),    #采集的NPCID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x34
-        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 = 0xA2
-        self.SubCmd = 0x34
-        self.NPCID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGetCustomSceneCollectAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 34 自定义场景中获取采集奖励 //tagCMGetCustomSceneCollectAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                NPCID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.NPCID
-                                )
-        return DumpString
-
-
-m_NAtagCMGetCustomSceneCollectAward=tagCMGetCustomSceneCollectAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetCustomSceneCollectAward.Cmd,m_NAtagCMGetCustomSceneCollectAward.SubCmd))] = m_NAtagCMGetCustomSceneCollectAward
 
 
 #------------------------------------------------------
@@ -1901,58 +1645,6 @@
 
 
 #------------------------------------------------------
-#A2 01 请求npc商店物品信息 #tagCMQueryNPCShopItem
-
-class  tagCMQueryNPCShopItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("NPCShopID", c_int),    #商店npcid
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x01
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA2
-        self.SubCmd = 0x01
-        self.NPCShopID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMQueryNPCShopItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A2 01 请求npc商店物品信息 //tagCMQueryNPCShopItem:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                NPCShopID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.NPCShopID
-                                )
-        return DumpString
-
-
-m_NAtagCMQueryNPCShopItem=tagCMQueryNPCShopItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMQueryNPCShopItem.Cmd,m_NAtagCMQueryNPCShopItem.SubCmd))] = m_NAtagCMQueryNPCShopItem
-
-
-#------------------------------------------------------
 # A2 06 快速完成任务#tagCMQuickFinishMission
 
 class  tagCMQuickFinishMission(Structure):
@@ -2009,13 +1701,14 @@
 
 
 #------------------------------------------------------
-# A2 32 神秘商店刷新 #tagCMRefreshMysticalShop
+# A2 32 刷新商店 #tagCSRefreshShop
 
-class  tagCMRefreshMysticalShop(Structure):
+class  tagCSRefreshShop(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
+                  ("ShopType", c_ushort),    
                   ]
 
     def __init__(self):
@@ -2032,28 +1725,31 @@
     def Clear(self):
         self.Cmd = 0xA2
         self.SubCmd = 0x32
+        self.ShopType = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMRefreshMysticalShop)
+        return sizeof(tagCSRefreshShop)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A2 32 神秘商店刷新 //tagCMRefreshMysticalShop:
+        DumpString = '''// A2 32 刷新商店 //tagCSRefreshShop:
                                 Cmd:%s,
-                                SubCmd:%s
+                                SubCmd:%s,
+                                ShopType:%d
                                 '''\
                                 %(
                                 self.Cmd,
-                                self.SubCmd
+                                self.SubCmd,
+                                self.ShopType
                                 )
         return DumpString
 
 
-m_NAtagCMRefreshMysticalShop=tagCMRefreshMysticalShop()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshMysticalShop.Cmd,m_NAtagCMRefreshMysticalShop.SubCmd))] = m_NAtagCMRefreshMysticalShop
+m_NAtagCSRefreshShop=tagCSRefreshShop()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSRefreshShop.Cmd,m_NAtagCSRefreshShop.SubCmd))] = m_NAtagCSRefreshShop
 
 
 #------------------------------------------------------
@@ -2166,58 +1862,6 @@
 
 m_NAtagCMSelectRealmDifficulty=tagCMSelectRealmDifficulty()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSelectRealmDifficulty.Cmd,m_NAtagCMSelectRealmDifficulty.SubCmd))] = m_NAtagCMSelectRealmDifficulty
-
-
-#------------------------------------------------------
-# A2 30 设置聊天气泡框 #tagCMSetChatBubbleBox
-
-class  tagCMSetChatBubbleBox(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("BubbleBoxType", c_ubyte),    #气泡框类型
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA2
-        self.SubCmd = 0x30
-        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 = 0xA2
-        self.SubCmd = 0x30
-        self.BubbleBoxType = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMSetChatBubbleBox)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A2 30 设置聊天气泡框 //tagCMSetChatBubbleBox:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                BubbleBoxType:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.BubbleBoxType
-                                )
-        return DumpString
-
-
-m_NAtagCMSetChatBubbleBox=tagCMSetChatBubbleBox()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSetChatBubbleBox.Cmd,m_NAtagCMSetChatBubbleBox.SubCmd))] = m_NAtagCMSetChatBubbleBox
 
 
 #------------------------------------------------------
@@ -2569,14 +2213,14 @@
 
 
 #------------------------------------------------------
-# A3 10 购买商城物品 #tagCMBuyItem
+# A3 10 购买商城物品 #tagCSBuyItem
 
-class  tagCMBuyItem(Structure):
+class  tagCSBuyItem(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("BuyItemIndex", c_ushort),    #购买的物品索引
+                  ("ShopID", c_int),    #商品ID
                   ("BuyCount", c_int),    #购买数量
                   ]
 
@@ -2594,34 +2238,34 @@
     def Clear(self):
         self.Cmd = 0xA3
         self.SubCmd = 0x10
-        self.BuyItemIndex = 0
+        self.ShopID = 0
         self.BuyCount = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMBuyItem)
+        return sizeof(tagCSBuyItem)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A3 10 购买商城物品 //tagCMBuyItem:
+        DumpString = '''// A3 10 购买商城物品 //tagCSBuyItem:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                BuyItemIndex:%d,
+                                ShopID:%d,
                                 BuyCount:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.BuyItemIndex,
+                                self.ShopID,
                                 self.BuyCount
                                 )
         return DumpString
 
 
-m_NAtagCMBuyItem=tagCMBuyItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyItem.Cmd,m_NAtagCMBuyItem.SubCmd))] = m_NAtagCMBuyItem
+m_NAtagCSBuyItem=tagCSBuyItem()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSBuyItem.Cmd,m_NAtagCSBuyItem.SubCmd))] = m_NAtagCSBuyItem
 
 
 #------------------------------------------------------
@@ -3576,73 +3220,6 @@
 
 
 #------------------------------------------------------
-# A3 12 守护拾取物品 #tagCMGuardPickupItem
-
-class  tagCMGuardPickupItem(Structure):
-    Head = tagHead()
-    ItemCount = 0    #(WORD ItemCount)
-    MapItemID = list()    #(vector<WORD> MapItemID)//size = ItemCount
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x12
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ItemCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        for i in range(self.ItemCount):
-            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
-            self.MapItemID.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x12
-        self.ItemCount = 0
-        self.MapItemID = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 2
-        length += 2 * self.ItemCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteWORD(data, self.ItemCount)
-        for i in range(self.ItemCount):
-            data = CommFunc.WriteWORD(data, self.MapItemID[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ItemCount:%d,
-                                MapItemID:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ItemCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMGuardPickupItem=tagCMGuardPickupItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGuardPickupItem.Head.Cmd,m_NAtagCMGuardPickupItem.Head.SubCmd))] = m_NAtagCMGuardPickupItem
-
-
-#------------------------------------------------------
 # A3 13 物品拆解 #tagCMItemDecompound
 
 class  tagCMItemDecompound(Structure):
@@ -4384,73 +3961,6 @@
 
 
 #------------------------------------------------------
-#A3 2E 羽翼精炼 #tagCMWingUp
-
-class  tagCMWingUp(Structure):
-    Head = tagHead()
-    Count = 0    #(BYTE Count)//索引个数
-    WingIndexList = list()    #(vector<BYTE> WingIndexList)//材料翅膀在背包中的索引列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x2E
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.WingIndexList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x2E
-        self.Count = 0
-        self.WingIndexList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1 * self.Count
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteBYTE(data, self.WingIndexList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Count:%d,
-                                WingIndexList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMWingUp=tagCMWingUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMWingUp.Head.Cmd,m_NAtagCMWingUp.Head.SubCmd))] = m_NAtagCMWingUp
-
-
-#------------------------------------------------------
 #A4 06 变更家族成员加入审核方式#tagCGChangeFamilyAcceptJoinType
 
 class  tagCGChangeFamilyAcceptJoinType(Structure):
@@ -4656,73 +4166,6 @@
 
 m_NAtagCGFamilyLVUp=tagCGFamilyLVUp()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGFamilyLVUp.Cmd,m_NAtagCGFamilyLVUp.SubCmd))] = m_NAtagCGFamilyLVUp
-
-
-#------------------------------------------------------
-# A4 09 家族仓库删除物品 #tagCGFamilyStoreDel
-
-class  tagCGFamilyStoreDel(Structure):
-    Head = tagHead()
-    IndexCount = 0    #(BYTE IndexCount)
-    StoreItemIndex = list()    #(vector<BYTE> StoreItemIndex)// 仓库物品索引,1代表索引0的物品,与兑换一致
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x09
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.IndexCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.StoreItemIndex.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x09
-        self.IndexCount = 0
-        self.StoreItemIndex = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1 * self.IndexCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.IndexCount)
-        for i in range(self.IndexCount):
-            data = CommFunc.WriteBYTE(data, self.StoreItemIndex[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                IndexCount:%d,
-                                StoreItemIndex:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.IndexCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCGFamilyStoreDel=tagCGFamilyStoreDel()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGFamilyStoreDel.Head.Cmd,m_NAtagCGFamilyStoreDel.Head.SubCmd))] = m_NAtagCGFamilyStoreDel
 
 
 #------------------------------------------------------
@@ -5150,58 +4593,6 @@
 
 
 #------------------------------------------------------
-#A5 01 坐骑激活 #tagPlayerActivateHorse
-
-class  tagPlayerActivateHorse(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("HorseID", c_int),    #坐骑幻化ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x01
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x01
-        self.HorseID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagPlayerActivateHorse)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A5 01 坐骑激活 //tagPlayerActivateHorse:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                HorseID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.HorseID
-                                )
-        return DumpString
-
-
-m_NAtagPlayerActivateHorse=tagPlayerActivateHorse()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagPlayerActivateHorse.Cmd,m_NAtagPlayerActivateHorse.SubCmd))] = m_NAtagPlayerActivateHorse
-
-
-#------------------------------------------------------
 # A5 C7 激活大师强化等级 #tagCMActivateMasterPlusLV
 
 class  tagCMActivateMasterPlusLV(Structure):
@@ -5324,9 +4715,7 @@
                   ("MapID", c_int),    
                   ("LineID", c_ushort),    
                   ("Cnt", c_ubyte),    # 扫荡次数
-                  ("IsFinish", c_ubyte),    # 是否立即完成; 0-否;1-花钱立即完成;2-客户端自行倒计时间到后发送2代表领取扫荡完成奖励
                   ("DataEx", c_int),    #附带信息
-                  ("IsLittleHelper", c_ubyte),    # 是否小助手扫荡
                   ]
 
     def __init__(self):
@@ -5346,9 +4735,7 @@
         self.MapID = 0
         self.LineID = 0
         self.Cnt = 0
-        self.IsFinish = 0
         self.DataEx = 0
-        self.IsLittleHelper = 0
         return
 
     def GetLength(self):
@@ -5364,9 +4751,7 @@
                                 MapID:%d,
                                 LineID:%d,
                                 Cnt:%d,
-                                IsFinish:%d,
-                                DataEx:%d,
-                                IsLittleHelper:%d
+                                DataEx:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -5374,9 +4759,7 @@
                                 self.MapID,
                                 self.LineID,
                                 self.Cnt,
-                                self.IsFinish,
-                                self.DataEx,
-                                self.IsLittleHelper
+                                self.DataEx
                                 )
         return DumpString
 
@@ -5663,62 +5046,6 @@
 
 
 #------------------------------------------------------
-# A5 25 购买日常活动次数 #tagCMBuyDailyActionCnt
-
-class  tagCMBuyDailyActionCnt(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActionID", c_int),    # ID
-                  ("AddType", c_ubyte),    # 0-花仙玉 1-用物品
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x25
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x25
-        self.ActionID = 0
-        self.AddType = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMBuyDailyActionCnt)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 25 购买日常活动次数 //tagCMBuyDailyActionCnt:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActionID:%d,
-                                AddType:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActionID,
-                                self.AddType
-                                )
-        return DumpString
-
-
-m_NAtagCMBuyDailyActionCnt=tagCMBuyDailyActionCnt()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyDailyActionCnt.Cmd,m_NAtagCMBuyDailyActionCnt.SubCmd))] = m_NAtagCMBuyDailyActionCnt
-
-
-#------------------------------------------------------
 #A5 75 购买副本进入次数#tagCMBuyEnterCount
 
 class  tagCMBuyEnterCount(Structure):
@@ -5768,54 +5095,6 @@
 
 m_NAtagCMBuyEnterCount=tagCMBuyEnterCount()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyEnterCount.Cmd,m_NAtagCMBuyEnterCount.SubCmd))] = m_NAtagCMBuyEnterCount
-
-
-#------------------------------------------------------
-# A5 1B 购买挑战副本精力 #tagCMBuyFBEnergy
-
-class  tagCMBuyFBEnergy(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x1B
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x1B
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMBuyFBEnergy)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 1B 购买挑战副本精力 //tagCMBuyFBEnergy:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMBuyFBEnergy=tagCMBuyFBEnergy()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyFBEnergy.Cmd,m_NAtagCMBuyFBEnergy.SubCmd))] = m_NAtagCMBuyFBEnergy
 
 
 #------------------------------------------------------
@@ -6309,14 +5588,14 @@
 
 
 #------------------------------------------------------
-#A5 09 玩家签到 #tagCMDaySign
+#A5 09 玩家签到领奖 #tagCSDaySign
 
-class  tagCMDaySign(Structure):
+class  tagCSDaySign(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("Day", c_ubyte),    #默认0表示当日签到,可扩展做补签用
+                  ("Day", c_ubyte),    # 第x天,从1开始
                   ]
 
     def __init__(self):
@@ -6337,13 +5616,13 @@
         return
 
     def GetLength(self):
-        return sizeof(tagCMDaySign)
+        return sizeof(tagCSDaySign)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''//A5 09 玩家签到 //tagCMDaySign:
+        DumpString = '''//A5 09 玩家签到领奖 //tagCSDaySign:
                                 Cmd:%s,
                                 SubCmd:%s,
                                 Day:%d
@@ -6356,8 +5635,8 @@
         return DumpString
 
 
-m_NAtagCMDaySign=tagCMDaySign()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDaySign.Cmd,m_NAtagCMDaySign.SubCmd))] = m_NAtagCMDaySign
+m_NAtagCSDaySign=tagCSDaySign()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSDaySign.Cmd,m_NAtagCSDaySign.SubCmd))] = m_NAtagCSDaySign
 
 
 #------------------------------------------------------
@@ -7061,118 +6340,6 @@
 
 
 #------------------------------------------------------
-#A5 06 玩家领取在线奖励 #tagCMGetOnlinePrize
-
-class  tagCMGetOnlinePrize(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("Index", c_ubyte),    # 奖励索引,其他按顺序
-                  ("IsDaily", c_ubyte),    # 是否领取每日日常的奖励,是发1,如果领取定制创角天奖励的则默认发0即可
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x06
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x06
-        self.Index = 0
-        self.IsDaily = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGetOnlinePrize)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A5 06 玩家领取在线奖励 //tagCMGetOnlinePrize:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                Index:%d,
-                                IsDaily:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.Index,
-                                self.IsDaily
-                                )
-        return DumpString
-
-
-m_NAtagCMGetOnlinePrize=tagCMGetOnlinePrize()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetOnlinePrize.Cmd,m_NAtagCMGetOnlinePrize.SubCmd))] = m_NAtagCMGetOnlinePrize
-
-
-#------------------------------------------------------
-# A5 42 领取成就奖励 #tagMCGetSuccessAward
-
-class  tagMCGetSuccessAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("SuccID", c_int),    #成就ID
-                  ("IsPassport", c_ubyte),    #是否通行证奖励
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x42
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x42
-        self.SuccID = 0
-        self.IsPassport = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCGetSuccessAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 42 领取成就奖励 //tagMCGetSuccessAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                SuccID:%d,
-                                IsPassport:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.SuccID,
-                                self.IsPassport
-                                )
-        return DumpString
-
-
-m_NAtagMCGetSuccessAward=tagMCGetSuccessAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGetSuccessAward.Cmd,m_NAtagMCGetSuccessAward.SubCmd))] = m_NAtagMCGetSuccessAward
-
-
-#------------------------------------------------------
 # A5 44 通天令领取等级奖励 #tagCMGetTongTianLVAward
 
 class  tagCMGetTongTianLVAward(Structure):
@@ -7281,122 +6448,6 @@
 
 
 #------------------------------------------------------
-# A5 56 神兵激活 #tagCMGodWeaponActivate
-
-class  tagCMGodWeaponActivate(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("WeaponType", c_int),    # 神兵类型
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x56
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x56
-        self.WeaponType = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGodWeaponActivate)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 56 神兵激活 //tagCMGodWeaponActivate:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                WeaponType:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.WeaponType
-                                )
-        return DumpString
-
-
-m_NAtagCMGodWeaponActivate=tagCMGodWeaponActivate()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGodWeaponActivate.Cmd,m_NAtagCMGodWeaponActivate.SubCmd))] = m_NAtagCMGodWeaponActivate
-
-
-#------------------------------------------------------
-# A5 55 神兵升级 #tagCMGodWeaponPlus
-
-class  tagCMGodWeaponPlus(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("WeaponType", c_int),    # 神兵类型
-                  ("ItemID", c_int),    #消耗的物品ID
-                  ("ItemCount", c_ubyte),    #消耗个数,默认1
-                  ("IsAutoBuy", c_ubyte),    #是否自动购买,默认0
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x55
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x55
-        self.WeaponType = 0
-        self.ItemID = 0
-        self.ItemCount = 0
-        self.IsAutoBuy = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGodWeaponPlus)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 55 神兵升级 //tagCMGodWeaponPlus:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                WeaponType:%d,
-                                ItemID:%d,
-                                ItemCount:%d,
-                                IsAutoBuy:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.WeaponType,
-                                self.ItemID,
-                                self.ItemCount,
-                                self.IsAutoBuy
-                                )
-        return DumpString
-
-
-m_NAtagCMGodWeaponPlus=tagCMGodWeaponPlus()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGodWeaponPlus.Cmd,m_NAtagCMGodWeaponPlus.SubCmd))] = m_NAtagCMGodWeaponPlus
-
-
-#------------------------------------------------------
 # A5 40 投资理财 #tagCMGoldInvest
 
 class  tagCMGoldInvest(Structure):
@@ -7450,290 +6501,6 @@
 
 m_NAtagCMGoldInvest=tagCMGoldInvest()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGoldInvest.Cmd,m_NAtagCMGoldInvest.SubCmd))] = m_NAtagCMGoldInvest
-
-
-#------------------------------------------------------
-# A5 29 骑宠觉醒 #tagCMHorsePetAwake
-
-class  tagCMHorsePetAwake(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("Type", c_ushort),    # 1-坐骑 2-灵宠
-                  ("ID", c_int),    # 对应坐骑表灵宠表ID
-                  ("EatItemID", c_int),    # 吞噬的物品ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x29
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x29
-        self.Type = 0
-        self.ID = 0
-        self.EatItemID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMHorsePetAwake)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 29 骑宠觉醒 //tagCMHorsePetAwake:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                Type:%d,
-                                ID:%d,
-                                EatItemID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.Type,
-                                self.ID,
-                                self.EatItemID
-                                )
-        return DumpString
-
-
-m_NAtagCMHorsePetAwake=tagCMHorsePetAwake()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorsePetAwake.Cmd,m_NAtagCMHorsePetAwake.SubCmd))] = m_NAtagCMHorsePetAwake
-
-
-#------------------------------------------------------
-# A5 30 骑宠外观选择 #tagCMHorsePetSkinSelect
-
-class  tagCMHorsePetSkinSelect(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("Type", c_ushort),    # 1-坐骑 2-灵宠
-                  ("ID", c_int),    # 对应坐骑表灵宠表ID
-                  ("SkinIndex", c_ubyte),    # 外观索引
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x30
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x30
-        self.Type = 0
-        self.ID = 0
-        self.SkinIndex = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMHorsePetSkinSelect)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 30 骑宠外观选择 //tagCMHorsePetSkinSelect:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                Type:%d,
-                                ID:%d,
-                                SkinIndex:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.Type,
-                                self.ID,
-                                self.SkinIndex
-                                )
-        return DumpString
-
-
-m_NAtagCMHorsePetSkinSelect=tagCMHorsePetSkinSelect()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorsePetSkinSelect.Cmd,m_NAtagCMHorsePetSkinSelect.SubCmd))] = m_NAtagCMHorsePetSkinSelect
-
-
-#------------------------------------------------------
-# A5 35 坐骑升星 #tagCMHorseStarUp
-
-class  tagCMHorseStarUp(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("HorseID", c_int),    #坐骑ID,对应坐骑表ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x35
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x35
-        self.HorseID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMHorseStarUp)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 35 坐骑升星 //tagCMHorseStarUp:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                HorseID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.HorseID
-                                )
-        return DumpString
-
-
-m_NAtagCMHorseStarUp=tagCMHorseStarUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorseStarUp.Cmd,m_NAtagCMHorseStarUp.SubCmd))] = m_NAtagCMHorseStarUp
-
-
-#------------------------------------------------------
-# A5 31 坐骑培养 #tagCMHorseTrain
-
-class  tagCMHorseTrain(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("TrainType", c_ubyte),    #培养类型: 1-基础培养,2-特殊培养,3-百分比培养
-                  ("UseItemCnt", c_ushort),    #消耗材料个数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x31
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x31
-        self.TrainType = 0
-        self.UseItemCnt = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMHorseTrain)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 31 坐骑培养 //tagCMHorseTrain:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TrainType:%d,
-                                UseItemCnt:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TrainType,
-                                self.UseItemCnt
-                                )
-        return DumpString
-
-
-m_NAtagCMHorseTrain=tagCMHorseTrain()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorseTrain.Cmd,m_NAtagCMHorseTrain.SubCmd))] = m_NAtagCMHorseTrain
-
-
-#------------------------------------------------------
-# A5 27 坐骑提升 #tagCMHorseUp
-
-class  tagCMHorseUp(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("UseItemCnt", c_ushort),    #消耗材料个数
-                  ("IsAutoBuy", c_ubyte),    #是否自动购买
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x27
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x27
-        self.UseItemCnt = 0
-        self.IsAutoBuy = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMHorseUp)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 27 坐骑提升 //tagCMHorseUp:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                UseItemCnt:%d,
-                                IsAutoBuy:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.UseItemCnt,
-                                self.IsAutoBuy
-                                )
-        return DumpString
-
-
-m_NAtagCMHorseUp=tagCMHorseUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorseUp.Cmd,m_NAtagCMHorseUp.SubCmd))] = m_NAtagCMHorseUp
 
 
 #------------------------------------------------------
@@ -7889,62 +6656,6 @@
 
 
 #------------------------------------------------------
-#A5 02 坐骑选择 #tagPlayerChooseHorse
-
-class  tagPlayerChooseHorse(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ChooseType", c_ubyte),    # 1-按等阶,2-按幻化
-                  ("LVID", c_ubyte),    # 阶等级或幻化ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x02
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x02
-        self.ChooseType = 0
-        self.LVID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagPlayerChooseHorse)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A5 02 坐骑选择 //tagPlayerChooseHorse:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ChooseType:%d,
-                                LVID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ChooseType,
-                                self.LVID
-                                )
-        return DumpString
-
-
-m_NAtagPlayerChooseHorse=tagPlayerChooseHorse()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagPlayerChooseHorse.Cmd,m_NAtagPlayerChooseHorse.SubCmd))] = m_NAtagPlayerChooseHorse
-
-
-#------------------------------------------------------
 #A5 04 玩家领取奖励 #tagCMPlayerGetReward
 
 class  tagCMPlayerGetReward(Structure):
@@ -8023,54 +6734,6 @@
 
 
 #------------------------------------------------------
-#A5 07 查询在线奖励 #tagCMQueryOnlinePrizeInfo
-
-class  tagCMQueryOnlinePrizeInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x07
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x07
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMQueryOnlinePrizeInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A5 07 查询在线奖励 //tagCMQueryOnlinePrizeInfo:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMQueryOnlinePrizeInfo=tagCMQueryOnlinePrizeInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMQueryOnlinePrizeInfo.Cmd,m_NAtagCMQueryOnlinePrizeInfo.SubCmd))] = m_NAtagCMQueryOnlinePrizeInfo
-
-
-#------------------------------------------------------
 # A5 23 提升境界等级 # tagCMRealmLVUp
 
 class  tagCMRealmLVUp(Structure):
@@ -8116,90 +6779,6 @@
 
 m_NAtagCMRealmLVUp=tagCMRealmLVUp()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRealmLVUp.Cmd,m_NAtagCMRealmLVUp.SubCmd))] = m_NAtagCMRealmLVUp
-
-
-#------------------------------------------------------
-# A5 53 资源找回 #tagCMRecoverGain
-
-class  tagCMRecoverGain(Structure):
-    Head = tagHead()
-    Type = 0    #(BYTE Type)// 找回方式 0 仙玉 1铜钱
-    Cnt = 0    #(BYTE Cnt)
-    IndexList = list()    #(vector<BYTE> IndexList)// 找回索引列表
-    RecoverCntList = list()    #(vector<BYTE> RecoverCntList)// 索引对应找回次数列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x53
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.Type,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.Cnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Cnt):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.IndexList.append(value)
-        for i in range(self.Cnt):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.RecoverCntList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x53
-        self.Type = 0
-        self.Cnt = 0
-        self.IndexList = list()
-        self.RecoverCntList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 1 * self.Cnt
-        length += 1 * self.Cnt
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.Type)
-        data = CommFunc.WriteBYTE(data, self.Cnt)
-        for i in range(self.Cnt):
-            data = CommFunc.WriteBYTE(data, self.IndexList[i])
-        for i in range(self.Cnt):
-            data = CommFunc.WriteBYTE(data, self.RecoverCntList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Type:%d,
-                                Cnt:%d,
-                                IndexList:%s,
-                                RecoverCntList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Type,
-                                self.Cnt,
-                                "...",
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMRecoverGain=tagCMRecoverGain()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRecoverGain.Head.Cmd,m_NAtagCMRecoverGain.Head.SubCmd))] = m_NAtagCMRecoverGain
 
 
 #------------------------------------------------------
@@ -8424,54 +7003,6 @@
 
 m_NAtagCMRequestTreasure=tagCMRequestTreasure()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRequestTreasure.Cmd,m_NAtagCMRequestTreasure.SubCmd))] = m_NAtagCMRequestTreasure
-
-
-#------------------------------------------------------
-#A5 60 重置副本挑战次数 #tagCMResetFBJoinCnt
-
-class  tagCMResetFBJoinCnt(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x60
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x60
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMResetFBJoinCnt)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''//A5 60 重置副本挑战次数 //tagCMResetFBJoinCnt:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMResetFBJoinCnt=tagCMResetFBJoinCnt()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMResetFBJoinCnt.Cmd,m_NAtagCMResetFBJoinCnt.SubCmd))] = m_NAtagCMResetFBJoinCnt
 
 
 #------------------------------------------------------
@@ -8800,106 +7331,6 @@
 
 
 #------------------------------------------------------
-# A5 36 称号升星 #tagCMTitleStarUp
-
-class  tagCMTitleStarUp(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("TitleID", c_int),    #称号ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x36
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x36
-        self.TitleID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMTitleStarUp)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 36 称号升星 //tagCMTitleStarUp:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TitleID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TitleID
-                                )
-        return DumpString
-
-
-m_NAtagCMTitleStarUp=tagCMTitleStarUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTitleStarUp.Cmd,m_NAtagCMTitleStarUp.SubCmd))] = m_NAtagCMTitleStarUp
-
-
-#------------------------------------------------------
-# A5 11 试用首充武器 #tagCMTryFirstGoldItem
-
-class  tagCMTryFirstGoldItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x11
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x11
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMTryFirstGoldItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 11 试用首充武器 //tagCMTryFirstGoldItem:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMTryFirstGoldItem=tagCMTryFirstGoldItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTryFirstGoldItem.Cmd,m_NAtagCMTryFirstGoldItem.SubCmd))] = m_NAtagCMTryFirstGoldItem
-
-
-#------------------------------------------------------
 # A5 73 解锁命格孔 #tagCMUnLockBirthChartHole
 
 class  tagCMUnLockBirthChartHole(Structure):
@@ -9064,52 +7495,64 @@
 # A6 24 修改家族徽章 #tagCMChangeFamilyEmblem
 
 class  tagCMChangeFamilyEmblem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("EmblemID", c_ubyte),    # 更换的徽章ID
-                  ]
+    Head = tagHead()
+    EmblemID = 0    #(BYTE EmblemID)// 更换的徽章ID
+    EmblemWord = ""    #(char EmblemWord[3])// 徽章文字
+    data = None
 
     def __init__(self):
         self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x24
+        self.Head.Cmd = 0xA6
+        self.Head.SubCmd = 0x24
         return
 
-    def ReadData(self, stringData, _pos=0, _len=0):
+    def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.EmblemID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.EmblemWord,_pos = CommFunc.ReadString(_lpData, _pos,3)
+        return _pos
 
     def Clear(self):
-        self.Cmd = 0xA6
-        self.SubCmd = 0x24
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA6
+        self.Head.SubCmd = 0x24
         self.EmblemID = 0
+        self.EmblemWord = ""
         return
 
     def GetLength(self):
-        return sizeof(tagCMChangeFamilyEmblem)
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 3
+
+        return length
 
     def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.EmblemID)
+        data = CommFunc.WriteString(data, 3, self.EmblemWord)
+        return data
 
     def OutputString(self):
-        DumpString = '''// A6 24 修改家族徽章 //tagCMChangeFamilyEmblem:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                EmblemID:%d
+        DumpString = '''
+                                Head:%s,
+                                EmblemID:%d,
+                                EmblemWord:%s
                                 '''\
                                 %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.EmblemID
+                                self.Head.OutputString(),
+                                self.EmblemID,
+                                self.EmblemWord
                                 )
         return DumpString
 
 
 m_NAtagCMChangeFamilyEmblem=tagCMChangeFamilyEmblem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMChangeFamilyEmblem.Cmd,m_NAtagCMChangeFamilyEmblem.SubCmd))] = m_NAtagCMChangeFamilyEmblem
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMChangeFamilyEmblem.Head.Cmd,m_NAtagCMChangeFamilyEmblem.Head.SubCmd))] = m_NAtagCMChangeFamilyEmblem
 
 
 #------------------------------------------------------
@@ -9225,66 +7668,6 @@
 
 
 #------------------------------------------------------
-# A6 15 传功操作 #tagCMChuangongOP
-
-class  tagCMChuangongOP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("OPType", c_ubyte),    # 操作类型:1-邀请;2-回应;3-领奖;
-                  ("PlayerID", c_int),    # 目标玩家ID;回应时为邀请方玩家ID
-                  ("OPData", c_ubyte),    # 操作数据,可选:回应时为是否同意
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x15
-        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 = 0xA6
-        self.SubCmd = 0x15
-        self.OPType = 0
-        self.PlayerID = 0
-        self.OPData = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMChuangongOP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A6 15 传功操作 //tagCMChuangongOP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                OPType:%d,
-                                PlayerID:%d,
-                                OPData:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.OPType,
-                                self.PlayerID,
-                                self.OPData
-                                )
-        return DumpString
-
-
-m_NAtagCMChuangongOP=tagCMChuangongOP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMChuangongOP.Cmd,m_NAtagCMChuangongOP.SubCmd))] = m_NAtagCMChuangongOP
-
-
-#------------------------------------------------------
 # A6 11 家族改名 #tagCMRenameFamily
 
 class  tagCMRenameFamily(Structure):
@@ -9362,6 +7745,7 @@
     Head = tagHead()
     Name = ""    #(char Name[33])
     EmblemID = 0    #(WORD EmblemID)//选择徽章ID,解锁仙盟等级为1级的均为可选ID
+    EmblemWord = ""    #(char EmblemWord[3])//徽章文字
     data = None
 
     def __init__(self):
@@ -9375,6 +7759,7 @@
         _pos = self.Head.ReadData(_lpData, _pos)
         self.Name,_pos = CommFunc.ReadString(_lpData, _pos,33)
         self.EmblemID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.EmblemWord,_pos = CommFunc.ReadString(_lpData, _pos,3)
         return _pos
 
     def Clear(self):
@@ -9384,6 +7769,7 @@
         self.Head.SubCmd = 0x04
         self.Name = ""
         self.EmblemID = 0
+        self.EmblemWord = ""
         return
 
     def GetLength(self):
@@ -9391,6 +7777,7 @@
         length += self.Head.GetLength()
         length += 33
         length += 2
+        length += 3
 
         return length
 
@@ -9399,18 +7786,21 @@
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
         data = CommFunc.WriteString(data, 33, self.Name)
         data = CommFunc.WriteWORD(data, self.EmblemID)
+        data = CommFunc.WriteString(data, 3, self.EmblemWord)
         return data
 
     def OutputString(self):
         DumpString = '''
                                 Head:%s,
                                 Name:%s,
-                                EmblemID:%d
+                                EmblemID:%d,
+                                EmblemWord:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
                                 self.Name,
-                                self.EmblemID
+                                self.EmblemID,
+                                self.EmblemWord
                                 )
         return DumpString
 
@@ -9472,139 +7862,6 @@
 
 
 #------------------------------------------------------
-# A6 06 家族兑换活跃令 #tagCMFamilyActivityExchange
-
-class  tagCMFamilyActivityExchange(Structure):
-    Head = tagHead()
-    Count = 0    #(BYTE Count)//材料所在背包索引的数量
-    IndexList = list()    #(vector<WORD> IndexList)//材料所在背包索引列表
-    ItemIDList = list()    #(vector<DWORD> ItemIDList)//材料所在背包物品ID列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA6
-        self.Head.SubCmd = 0x06
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
-            self.IndexList.append(value)
-        for i in range(self.Count):
-            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
-            self.ItemIDList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA6
-        self.Head.SubCmd = 0x06
-        self.Count = 0
-        self.IndexList = list()
-        self.ItemIDList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 2 * self.Count
-        length += 4 * self.Count
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteWORD(data, self.IndexList[i])
-        for i in range(self.Count):
-            data = CommFunc.WriteDWORD(data, self.ItemIDList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Count:%d,
-                                IndexList:%s,
-                                ItemIDList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Count,
-                                "...",
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMFamilyActivityExchange=tagCMFamilyActivityExchange()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyActivityExchange.Head.Cmd,m_NAtagCMFamilyActivityExchange.Head.SubCmd))] = m_NAtagCMFamilyActivityExchange
-
-
-#------------------------------------------------------
-# A6 13 家族事务操作 #tagCMFamilyAffairOP
-
-class  tagCMFamilyAffairOP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("OPType", c_ubyte),    # 操作类型:1-刷新事务;2-开始事务;3-领取事务奖励;
-                  ("AffairID", c_ushort),    # 事务ID,可选
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x13
-        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 = 0xA6
-        self.SubCmd = 0x13
-        self.OPType = 0
-        self.AffairID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFamilyAffairOP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A6 13 家族事务操作 //tagCMFamilyAffairOP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                OPType:%d,
-                                AffairID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.OPType,
-                                self.AffairID
-                                )
-        return DumpString
-
-
-m_NAtagCMFamilyAffairOP=tagCMFamilyAffairOP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyAffairOP.Cmd,m_NAtagCMFamilyAffairOP.SubCmd))] = m_NAtagCMFamilyAffairOP
-
-
-#------------------------------------------------------
 # A6 12 家族捐献货币 #tagCMFamilyMoneyDonate
 
 class  tagCMFamilyMoneyDonate(Structure):
@@ -9657,20 +7914,20 @@
 
 
 #------------------------------------------------------
-# A6 09  家族仓库捐赠物品 #tagCMFamilyStoreDonate
+# A6 13 公会讨伐 #tagCSFamilyTaofaOP
 
-class  tagCMFamilyStoreDonate(Structure):
+class  tagCSFamilyTaofaOP(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("ItemIndex", c_ubyte),    # 捐赠物品在背包中的索引
+                  ("OpType", c_ubyte),    # 操作:0-斩杀攻击;1-布阵
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xA6
-        self.SubCmd = 0x09
+        self.SubCmd = 0x13
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -9680,152 +7937,32 @@
 
     def Clear(self):
         self.Cmd = 0xA6
-        self.SubCmd = 0x09
-        self.ItemIndex = 0
+        self.SubCmd = 0x13
+        self.OpType = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMFamilyStoreDonate)
+        return sizeof(tagCSFamilyTaofaOP)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A6 09  家族仓库捐赠物品 //tagCMFamilyStoreDonate:
+        DumpString = '''// A6 13 公会讨伐 //tagCSFamilyTaofaOP:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                ItemIndex:%d
+                                OpType:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.ItemIndex
+                                self.OpType
                                 )
         return DumpString
 
 
-m_NAtagCMFamilyStoreDonate=tagCMFamilyStoreDonate()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyStoreDonate.Cmd,m_NAtagCMFamilyStoreDonate.SubCmd))] = m_NAtagCMFamilyStoreDonate
-
-
-#------------------------------------------------------
-# A6 10  家族仓库兑换物品 #tagCMFamilyStoreExchange
-
-class  tagCMFamilyStoreExchange(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("StoreItemIndex", c_ubyte),    # 0-兑换口粮;>0-兑换仓库物品,1代表索引0的物品
-                  ("ItemID", c_int),    # 兑换的物品ID
-                  ("ExcangeCount", c_ushort),    # 兑换个数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x10
-        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 = 0xA6
-        self.SubCmd = 0x10
-        self.StoreItemIndex = 0
-        self.ItemID = 0
-        self.ExcangeCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFamilyStoreExchange)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A6 10  家族仓库兑换物品 //tagCMFamilyStoreExchange:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                StoreItemIndex:%d,
-                                ItemID:%d,
-                                ExcangeCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.StoreItemIndex,
-                                self.ItemID,
-                                self.ExcangeCount
-                                )
-        return DumpString
-
-
-m_NAtagCMFamilyStoreExchange=tagCMFamilyStoreExchange()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyStoreExchange.Cmd,m_NAtagCMFamilyStoreExchange.SubCmd))] = m_NAtagCMFamilyStoreExchange
-
-
-#------------------------------------------------------
-# A6 14 家族阵法升级 #tagCMFamilyZhenfaLVUP
-
-class  tagCMFamilyZhenfaLVUP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ZhenfaType", c_ubyte),    # 阵法类型
-                  ("ItemID", c_int),    # 消耗的物品ID
-                  ("ItemCount", c_ushort),    # 消耗个数,默认1
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x14
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA6
-        self.SubCmd = 0x14
-        self.ZhenfaType = 0
-        self.ItemID = 0
-        self.ItemCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFamilyZhenfaLVUP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A6 14 家族阵法升级 //tagCMFamilyZhenfaLVUP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ZhenfaType:%d,
-                                ItemID:%d,
-                                ItemCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ZhenfaType,
-                                self.ItemID,
-                                self.ItemCount
-                                )
-        return DumpString
-
-
-m_NAtagCMFamilyZhenfaLVUP=tagCMFamilyZhenfaLVUP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyZhenfaLVUP.Cmd,m_NAtagCMFamilyZhenfaLVUP.SubCmd))] = m_NAtagCMFamilyZhenfaLVUP
+m_NAtagCSFamilyTaofaOP=tagCSFamilyTaofaOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFamilyTaofaOP.Cmd,m_NAtagCSFamilyTaofaOP.SubCmd))] = m_NAtagCSFamilyTaofaOP
 
 
 #------------------------------------------------------
@@ -10142,143 +8279,6 @@
 
 m_NAtagCMRequestJoinFamilyByPlayer=tagCMRequestJoinFamilyByPlayer()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRequestJoinFamilyByPlayer.Cmd,m_NAtagCMRequestJoinFamilyByPlayer.SubCmd))] = m_NAtagCMRequestJoinFamilyByPlayer
-
-
-#------------------------------------------------------
-# A6 08  发家族红包 #tagCMSendFamilyRedPacket
-
-class  tagCMSendFamilyRedPacket(Structure):
-    Head = tagHead()
-    RedPacketID = 0    #(DWORD RedPacketID)// 红包ID,没有发0
-    PacketCnt = 0    #(WORD PacketCnt)// 红包数量
-    MoneyNum = 0    #(WORD MoneyNum)//金钱数量
-    Wish = ""    #(char Wish[33])//祝福语
-    IsAnonymous = 0    #(BYTE IsAnonymous)//是否匿名
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA6
-        self.Head.SubCmd = 0x08
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.RedPacketID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.PacketCnt,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.MoneyNum,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.Wish,_pos = CommFunc.ReadString(_lpData, _pos,33)
-        self.IsAnonymous,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA6
-        self.Head.SubCmd = 0x08
-        self.RedPacketID = 0
-        self.PacketCnt = 0
-        self.MoneyNum = 0
-        self.Wish = ""
-        self.IsAnonymous = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 4
-        length += 2
-        length += 2
-        length += 33
-        length += 1
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.RedPacketID)
-        data = CommFunc.WriteWORD(data, self.PacketCnt)
-        data = CommFunc.WriteWORD(data, self.MoneyNum)
-        data = CommFunc.WriteString(data, 33, self.Wish)
-        data = CommFunc.WriteBYTE(data, self.IsAnonymous)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                RedPacketID:%d,
-                                PacketCnt:%d,
-                                MoneyNum:%d,
-                                Wish:%s,
-                                IsAnonymous:%d
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.RedPacketID,
-                                self.PacketCnt,
-                                self.MoneyNum,
-                                self.Wish,
-                                self.IsAnonymous
-                                )
-        return DumpString
-
-
-m_NAtagCMSendFamilyRedPacket=tagCMSendFamilyRedPacket()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSendFamilyRedPacket.Head.Cmd,m_NAtagCMSendFamilyRedPacket.Head.SubCmd))] = m_NAtagCMSendFamilyRedPacket
-
-
-#------------------------------------------------------
-# A6 07  自身家族科技等级提升 #tagCMFamilyTechLVUP
-
-class  tagCMFamilyTechLVUP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("TechID", c_int),    # 科技ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA6
-        self.SubCmd = 0x07
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA6
-        self.SubCmd = 0x07
-        self.TechID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFamilyTechLVUP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A6 07  自身家族科技等级提升 //tagCMFamilyTechLVUP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TechID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TechID
-                                )
-        return DumpString
-
-
-m_NAtagCMFamilyTechLVUP=tagCMFamilyTechLVUP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyTechLVUP.Cmd,m_NAtagCMFamilyTechLVUP.SubCmd))] = m_NAtagCMFamilyTechLVUP
 
 
 #------------------------------------------------------
@@ -12437,122 +10437,6 @@
 
 
 #------------------------------------------------------
-# AB 12 抢红包 #tagCMGrabFamilyRedPacket
-
-class  tagCMGrabFamilyRedPacket(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("RedPaketID", c_int),    # 红包ID
-                  ("GetWay", c_ubyte),    #获得途径
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAB
-        self.SubCmd = 0x12
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAB
-        self.SubCmd = 0x12
-        self.RedPaketID = 0
-        self.GetWay = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGrabFamilyRedPacket)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AB 12 抢红包 //tagCMGrabFamilyRedPacket:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                RedPaketID:%d,
-                                GetWay:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.RedPaketID,
-                                self.GetWay
-                                )
-        return DumpString
-
-
-m_NAtagCMGrabFamilyRedPacket=tagCMGrabFamilyRedPacket()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGrabFamilyRedPacket.Cmd,m_NAtagCMGrabFamilyRedPacket.SubCmd))] = m_NAtagCMGrabFamilyRedPacket
-
-
-#------------------------------------------------------
-# AB 11 开服活动奖励 #tagCMOpenServerCampaignAward
-
-class  tagCMOpenServerCampaignAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("CampaignType", c_int),    #活动类型
-                  ("AwardType", c_ubyte),    #奖励类型,1-排行,2-目标
-                  ("AwardIndex", c_ubyte),    #目标奖励索引,领取目标奖励时用,目标条件在目标奖励列表中索引
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAB
-        self.SubCmd = 0x11
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAB
-        self.SubCmd = 0x11
-        self.CampaignType = 0
-        self.AwardType = 0
-        self.AwardIndex = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMOpenServerCampaignAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AB 11 开服活动奖励 //tagCMOpenServerCampaignAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                CampaignType:%d,
-                                AwardType:%d,
-                                AwardIndex:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.CampaignType,
-                                self.AwardType,
-                                self.AwardIndex
-                                )
-        return DumpString
-
-
-m_NAtagCMOpenServerCampaignAward=tagCMOpenServerCampaignAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMOpenServerCampaignAward.Cmd,m_NAtagCMOpenServerCampaignAward.SubCmd))] = m_NAtagCMOpenServerCampaignAward
-
-
-#------------------------------------------------------
 # AC 05 召集仙盟成员打boss #tagCGCallupFamilyMemberToBoss
 
 class  tagCGCallupFamilyMemberToBoss(Structure):
@@ -12714,154 +10598,6 @@
 
 m_NAtagCMMixCampaignAward=tagCMMixCampaignAward()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMixCampaignAward.Cmd,m_NAtagCMMixCampaignAward.SubCmd))] = m_NAtagCMMixCampaignAward
-
-
-#------------------------------------------------------
-# B0 29 活跃放置明细查询 #tagCMActivityPlaceQuery
-
-class  tagCMActivityPlaceQuery(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x29
-        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 = 0x29
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActivityPlaceQuery)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 29 活跃放置明细查询 //tagCMActivityPlaceQuery:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMActivityPlaceQuery=tagCMActivityPlaceQuery()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActivityPlaceQuery.Cmd,m_NAtagCMActivityPlaceQuery.SubCmd))] = m_NAtagCMActivityPlaceQuery
-
-
-#------------------------------------------------------
-# B0 28 活跃放置快速完成 #tagCMActivityPlaceQuickFinish
-
-class  tagCMActivityPlaceQuickFinish(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FinishCount", c_ubyte),    #完成次数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x28
-        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 = 0x28
-        self.FinishCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActivityPlaceQuickFinish)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 28 活跃放置快速完成 //tagCMActivityPlaceQuickFinish:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FinishCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FinishCount
-                                )
-        return DumpString
-
-
-m_NAtagCMActivityPlaceQuickFinish=tagCMActivityPlaceQuickFinish()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActivityPlaceQuickFinish.Cmd,m_NAtagCMActivityPlaceQuickFinish.SubCmd))] = m_NAtagCMActivityPlaceQuickFinish
-
-
-#------------------------------------------------------
-# B0 27 活跃放置启动 #tagCMActivityPlaceStart
-
-class  tagCMActivityPlaceStart(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x27
-        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 = 0x27
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActivityPlaceStart)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 27 活跃放置启动 //tagCMActivityPlaceStart:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMActivityPlaceStart=tagCMActivityPlaceStart()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActivityPlaceStart.Cmd,m_NAtagCMActivityPlaceStart.SubCmd))] = m_NAtagCMActivityPlaceStart
 
 
 #------------------------------------------------------
@@ -13587,174 +11323,6 @@
 
 
 #------------------------------------------------------
-# B1 01 客户端副本发送结束 #tagCMClientEndFB
-
-class  tagCMClientEndFB(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    
-                  ("LineID", c_ushort),    
-                  ("Data1", c_int),    #副本数据
-                  ("Data2", c_int),    #副本数据
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB1
-        self.SubCmd = 0x01
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB1
-        self.SubCmd = 0x01
-        self.MapID = 0
-        self.LineID = 0
-        self.Data1 = 0
-        self.Data2 = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMClientEndFB)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 01 客户端副本发送结束 //tagCMClientEndFB:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d,
-                                LineID:%d,
-                                Data1:%d,
-                                Data2:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID,
-                                self.LineID,
-                                self.Data1,
-                                self.Data2
-                                )
-        return DumpString
-
-
-m_NAtagCMClientEndFB=tagCMClientEndFB()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClientEndFB.Cmd,m_NAtagCMClientEndFB.SubCmd))] = m_NAtagCMClientEndFB
-
-
-#------------------------------------------------------
-# B1 04 客户端发送开始副本 #tagCMClientStartFB
-
-class  tagCMClientStartFB(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB1
-        self.SubCmd = 0x04
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB1
-        self.SubCmd = 0x04
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMClientStartFB)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 04 客户端发送开始副本 //tagCMClientStartFB:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMClientStartFB=tagCMClientStartFB()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClientStartFB.Cmd,m_NAtagCMClientStartFB.SubCmd))] = m_NAtagCMClientStartFB
-
-
-#------------------------------------------------------
-# B1 0A 副本购买buff #tagCMFBBuyBuff
-
-class  tagCMFBBuyBuff(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    
-                  ("MoneyCnt", c_ushort),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB1
-        self.SubCmd = 0x0A
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB1
-        self.SubCmd = 0x0A
-        self.MapID = 0
-        self.MoneyCnt = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFBBuyBuff)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 0A 副本购买buff //tagCMFBBuyBuff:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d,
-                                MoneyCnt:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID,
-                                self.MoneyCnt
-                                )
-        return DumpString
-
-
-m_NAtagCMFBBuyBuff=tagCMFBBuyBuff()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFBBuyBuff.Cmd,m_NAtagCMFBBuyBuff.SubCmd))] = m_NAtagCMFBBuyBuff
-
-
-#------------------------------------------------------
 # B1 08 快速一键过关副本 #tagCMFBQuickPass
 
 class  tagCMFBQuickPass(Structure):
@@ -13808,66 +11376,6 @@
 
 m_NAtagCMFBQuickPass=tagCMFBQuickPass()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFBQuickPass.Cmd,m_NAtagCMFBQuickPass.SubCmd))] = m_NAtagCMFBQuickPass
-
-
-#------------------------------------------------------
-# B1 02 领取多倍副本奖励 #tagCMGetMultiFBPrize
-
-class  tagCMGetMultiFBPrize(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    
-                  ("LineID", c_ushort),    
-                  ("Percent", c_ushort),    # 额外奖励百分比, 如50代表额外50%奖励
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB1
-        self.SubCmd = 0x02
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB1
-        self.SubCmd = 0x02
-        self.MapID = 0
-        self.LineID = 0
-        self.Percent = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGetMultiFBPrize)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B1 02 领取多倍副本奖励 //tagCMGetMultiFBPrize:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d,
-                                LineID:%d,
-                                Percent:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID,
-                                self.LineID,
-                                self.Percent
-                                )
-        return DumpString
-
-
-m_NAtagCMGetMultiFBPrize=tagCMGetMultiFBPrize()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetMultiFBPrize.Cmd,m_NAtagCMGetMultiFBPrize.SubCmd))] = m_NAtagCMGetMultiFBPrize
 
 
 #------------------------------------------------------
@@ -14015,70 +11523,14 @@
 
 
 #------------------------------------------------------
-# B2 10 竞技场挑战玩家 #tagCMArenaBattle
+# B2 09 演武场匹配玩家 #tagCSArenaMatch
 
-class  tagCMArenaBattle(Structure):
+class  tagCSArenaMatch(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("TagPlayerID", c_int),    # 目标玩家ID或机器人ID
-                  ("Result", c_ubyte),    # 0-进入自定义场景发送通知后端;1-胜利(后端处理,暂时不需要发送此状态);2-失败(前端被对手击杀需要发送此状态)
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB2
-        self.SubCmd = 0x10
-        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 = 0xB2
-        self.SubCmd = 0x10
-        self.TagPlayerID = 0
-        self.Result = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMArenaBattle)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B2 10 竞技场挑战玩家 //tagCMArenaBattle:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TagPlayerID:%d,
-                                Result:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TagPlayerID,
-                                self.Result
-                                )
-        return DumpString
-
-
-m_NAtagCMArenaBattle=tagCMArenaBattle()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMArenaBattle.Cmd,m_NAtagCMArenaBattle.SubCmd))] = m_NAtagCMArenaBattle
-
-
-#------------------------------------------------------
-# B2 09 竞技场匹配玩家 #tagCMArenaMatch
-
-class  tagCMArenaMatch(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("IsRefresh", c_ubyte),    # 0-打开界面无匹配数据时时查询,1-强制刷新匹配列表
+                  ("IsRefresh", c_ubyte),    # 0-打开界面无匹配数据时查询,1-强制刷新匹配列表
                   ]
 
     def __init__(self):
@@ -14099,13 +11551,13 @@
         return
 
     def GetLength(self):
-        return sizeof(tagCMArenaMatch)
+        return sizeof(tagCSArenaMatch)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B2 09 竞技场匹配玩家 //tagCMArenaMatch:
+        DumpString = '''// B2 09 演武场匹配玩家 //tagCSArenaMatch:
                                 Cmd:%s,
                                 SubCmd:%s,
                                 IsRefresh:%d
@@ -14118,216 +11570,8 @@
         return DumpString
 
 
-m_NAtagCMArenaMatch=tagCMArenaMatch()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMArenaMatch.Cmd,m_NAtagCMArenaMatch.SubCmd))] = m_NAtagCMArenaMatch
-
-
-#------------------------------------------------------
-# B2 26 头像幻化 #tagCMFaceChange
-
-class  tagCMFaceChange(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FaceID", c_int),    # 幻化的ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB2
-        self.SubCmd = 0x26
-        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 = 0xB2
-        self.SubCmd = 0x26
-        self.FaceID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFaceChange)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B2 26 头像幻化 //tagCMFaceChange:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FaceID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FaceID
-                                )
-        return DumpString
-
-
-m_NAtagCMFaceChange=tagCMFaceChange()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFaceChange.Cmd,m_NAtagCMFaceChange.SubCmd))] = m_NAtagCMFaceChange
-
-
-#------------------------------------------------------
-# B2 28 头像框幻化 #tagCMFacePicChange
-
-class  tagCMFacePicChange(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FacePicID", c_int),    # 幻化的ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB2
-        self.SubCmd = 0x28
-        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 = 0xB2
-        self.SubCmd = 0x28
-        self.FacePicID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFacePicChange)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B2 28 头像框幻化 //tagCMFacePicChange:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FacePicID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FacePicID
-                                )
-        return DumpString
-
-
-m_NAtagCMFacePicChange=tagCMFacePicChange()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFacePicChange.Cmd,m_NAtagCMFacePicChange.SubCmd))] = m_NAtagCMFacePicChange
-
-
-#------------------------------------------------------
-# B2 29 头像框升星 #tagCMFacePicStarUP
-
-class  tagCMFacePicStarUP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FacePicID", c_int),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB2
-        self.SubCmd = 0x29
-        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 = 0xB2
-        self.SubCmd = 0x29
-        self.FacePicID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFacePicStarUP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B2 29 头像框升星 //tagCMFacePicStarUP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FacePicID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FacePicID
-                                )
-        return DumpString
-
-
-m_NAtagCMFacePicStarUP=tagCMFacePicStarUP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFacePicStarUP.Cmd,m_NAtagCMFacePicStarUP.SubCmd))] = m_NAtagCMFacePicStarUP
-
-
-#------------------------------------------------------
-# B2 27 头像升星 #tagCMFaceStarUP
-
-class  tagCMFaceStarUP(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FaceID", c_int),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB2
-        self.SubCmd = 0x27
-        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 = 0xB2
-        self.SubCmd = 0x27
-        self.FaceID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMFaceStarUP)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B2 27 头像升星 //tagCMFaceStarUP:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FaceID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FaceID
-                                )
-        return DumpString
-
-
-m_NAtagCMFaceStarUP=tagCMFaceStarUP()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFaceStarUP.Cmd,m_NAtagCMFaceStarUP.SubCmd))] = m_NAtagCMFaceStarUP
+m_NAtagCSArenaMatch=tagCSArenaMatch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSArenaMatch.Cmd,m_NAtagCSArenaMatch.SubCmd))] = m_NAtagCSArenaMatch
 
 
 #------------------------------------------------------
@@ -14493,15 +11737,18 @@
 #------------------------------------------------------
 # B2 17 古宝升星 #tagCMGubaoStarUp
 
-class  tagCMGubaoPieceUse(Structure):
+class  tagCMGubaoStarUp(Structure):
     _pack_ = 1
     _fields_ = [
-                  ("GubaoID", c_ushort),    # 通用碎片古宝ID
-                  ("PieceCount", c_ushort),    # 使用碎片个数
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("GubaoID", c_ushort),    
                   ]
 
     def __init__(self):
         self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x17
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -14510,99 +11757,33 @@
         return _pos + self.GetLength()
 
     def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x17
         self.GubaoID = 0
-        self.PieceCount = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMGubaoPieceUse)
+        return sizeof(tagCMGubaoStarUp)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
         DumpString = '''// B2 17 古宝升星 //tagCMGubaoStarUp:
-                                GubaoID:%d,
-                                PieceCount:%d
+                                Cmd:%s,
+                                SubCmd:%s,
+                                GubaoID:%d
                                 '''\
                                 %(
-                                self.GubaoID,
-                                self.PieceCount
-                                )
-        return DumpString
-
-
-class  tagCMGubaoStarUp(Structure):
-    Head = tagHead()
-    GubaoID = 0    #(WORD GubaoID)
-    PieceSelectCount = 0    #(BYTE PieceSelectCount)
-    CommPieceUseList = list()    #(vector<tagCMGubaoPieceUse> CommPieceUseList)// 通用古宝碎片使用列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xB2
-        self.Head.SubCmd = 0x17
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.GubaoID,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.PieceSelectCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.PieceSelectCount):
-            temCommPieceUseList = tagCMGubaoPieceUse()
-            _pos = temCommPieceUseList.ReadData(_lpData, _pos)
-            self.CommPieceUseList.append(temCommPieceUseList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xB2
-        self.Head.SubCmd = 0x17
-        self.GubaoID = 0
-        self.PieceSelectCount = 0
-        self.CommPieceUseList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 2
-        length += 1
-        for i in range(self.PieceSelectCount):
-            length += self.CommPieceUseList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteWORD(data, self.GubaoID)
-        data = CommFunc.WriteBYTE(data, self.PieceSelectCount)
-        for i in range(self.PieceSelectCount):
-            data = CommFunc.WriteString(data, self.CommPieceUseList[i].GetLength(), self.CommPieceUseList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                GubaoID:%d,
-                                PieceSelectCount:%d,
-                                CommPieceUseList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.GubaoID,
-                                self.PieceSelectCount,
-                                "..."
+                                self.Cmd,
+                                self.SubCmd,
+                                self.GubaoID
                                 )
         return DumpString
 
 
 m_NAtagCMGubaoStarUp=tagCMGubaoStarUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGubaoStarUp.Head.Cmd,m_NAtagCMGubaoStarUp.Head.SubCmd))] = m_NAtagCMGubaoStarUp
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGubaoStarUp.Cmd,m_NAtagCMGubaoStarUp.SubCmd))] = m_NAtagCMGubaoStarUp
 
 
 #------------------------------------------------------
@@ -14722,7 +11903,6 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("HeroID", c_int),    #武将ID
-                  ("ItemIndex", c_ushort),    #关联武将物品所在武将背包索引,激活时可不用发
                   ("BookType", c_ubyte),    #图鉴激活类型: 0-初始激活;1-星级升级;2-突破等级升级
                   ]
 
@@ -14741,7 +11921,6 @@
         self.Cmd = 0xB2
         self.SubCmd = 0x37
         self.HeroID = 0
-        self.ItemIndex = 0
         self.BookType = 0
         return
 
@@ -14756,14 +11935,12 @@
                                 Cmd:%s,
                                 SubCmd:%s,
                                 HeroID:%d,
-                                ItemIndex:%d,
                                 BookType:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.HeroID,
-                                self.ItemIndex,
                                 self.BookType
                                 )
         return DumpString
@@ -15243,6 +12420,222 @@
 
 m_NAtagCSHeroWearSkin=tagCSHeroWearSkin()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroWearSkin.Cmd,m_NAtagCSHeroWearSkin.SubCmd))] = m_NAtagCSHeroWearSkin
+
+
+#------------------------------------------------------
+# B2 25 幻境阁操作 #tagCSHJGOP
+
+class  tagCSHJGOP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("Type", c_ubyte),    # 类型 1-形象;2-头像;3-头像框;4-气泡;5-称号	
+                  ("OPType", c_ubyte),    # 操作 1-激活;2-佩戴;3-卸下;4-升星
+                  ("OPID", c_int),    # 操作对应的ID,如形象ID等
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x25
+        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 = 0xB2
+        self.SubCmd = 0x25
+        self.Type = 0
+        self.OPType = 0
+        self.OPID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSHJGOP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 25 幻境阁操作 //tagCSHJGOP:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                Type:%d,
+                                OPType:%d,
+                                OPID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.Type,
+                                self.OPType,
+                                self.OPID
+                                )
+        return DumpString
+
+
+m_NAtagCSHJGOP=tagCSHJGOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHJGOP.Cmd,m_NAtagCSHJGOP.SubCmd))] = m_NAtagCSHJGOP
+
+
+#------------------------------------------------------
+# B2 02 坐骑进阶 #tagCSHorseClassUP
+
+class  tagCSHorseClassUP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x02
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x02
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSHorseClassUP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 02 坐骑进阶 //tagCSHorseClassUP:
+                                Cmd:%s,
+                                SubCmd:%s
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd
+                                )
+        return DumpString
+
+
+m_NAtagCSHorseClassUP=tagCSHorseClassUP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHorseClassUP.Cmd,m_NAtagCSHorseClassUP.SubCmd))] = m_NAtagCSHorseClassUP
+
+
+#------------------------------------------------------
+# B2 03 坐骑外观操作 #tagCSHorseSkinOP
+
+class  tagCSHorseSkinOP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("OPType", c_ubyte),    # 操作 1-激活;2-佩戴;3-升星
+                  ("SkinID", c_ubyte),    # 外观ID,佩戴时发0即为卸下
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x03
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x03
+        self.OPType = 0
+        self.SkinID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSHorseSkinOP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 03 坐骑外观操作 //tagCSHorseSkinOP:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                OPType:%d,
+                                SkinID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.OPType,
+                                self.SkinID
+                                )
+        return DumpString
+
+
+m_NAtagCSHorseSkinOP=tagCSHorseSkinOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHorseSkinOP.Cmd,m_NAtagCSHorseSkinOP.SubCmd))] = m_NAtagCSHorseSkinOP
+
+
+#------------------------------------------------------
+# B2 01 坐骑升级 #tagCSHorseLVUP
+
+class  tagCSHorseLVUP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("IsQuick", c_ubyte),    # 是否快速升级,0-只消耗1个道具;1-消耗升1级的道具
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x01
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x01
+        self.IsQuick = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSHorseLVUP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 01 坐骑升级 //tagCSHorseLVUP:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                IsQuick:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.IsQuick
+                                )
+        return DumpString
+
+
+m_NAtagCSHorseLVUP=tagCSHorseLVUP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHorseLVUP.Cmd,m_NAtagCSHorseLVUP.SubCmd))] = m_NAtagCSHorseLVUP
 
 
 #------------------------------------------------------
@@ -16776,58 +14169,6 @@
 
 
 #------------------------------------------------------
-# B4 0F 回收私有专属木桩怪 #tagCMRecyclePriWoodPile
-
-class  tagCMRecyclePriWoodPile(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ObjID", c_int),    
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB4
-        self.SubCmd = 0x0F
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB4
-        self.SubCmd = 0x0F
-        self.ObjID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMRecyclePriWoodPile)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B4 0F 回收私有专属木桩怪 //tagCMRecyclePriWoodPile:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ObjID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ObjID
-                                )
-        return DumpString
-
-
-m_NAtagCMRecyclePriWoodPile=tagCMRecyclePriWoodPile()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRecyclePriWoodPile.Cmd,m_NAtagCMRecyclePriWoodPile.SubCmd))] = m_NAtagCMRecyclePriWoodPile
-
-
-#------------------------------------------------------
 # B4 0E 玩家掉血 #tagCMRoleLostHP
 
 class  tagCMRoleLostHP(Structure):
@@ -16881,70 +14222,6 @@
 
 m_NAtagCMRoleLostHP=tagCMRoleLostHP()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRoleLostHP.Cmd,m_NAtagCMRoleLostHP.SubCmd))] = m_NAtagCMRoleLostHP
-
-
-#------------------------------------------------------
-# B4 0C 召唤私有专属木桩怪 #tagCMSummonPriWoodPile
-
-class  tagCMSummonPriWoodPile(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("NPCID", c_int),    
-                  ("Count", c_ubyte),    #默认1个,最多5个
-                  ("HP", c_int),    #默认0取最大值,其中一个血量数值大于0则用指定血量
-                  ("HPEx", c_int),    #默认0取最大值,其中一个血量数值大于0则用指定血量
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB4
-        self.SubCmd = 0x0C
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB4
-        self.SubCmd = 0x0C
-        self.NPCID = 0
-        self.Count = 0
-        self.HP = 0
-        self.HPEx = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMSummonPriWoodPile)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B4 0C 召唤私有专属木桩怪 //tagCMSummonPriWoodPile:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                NPCID:%d,
-                                Count:%d,
-                                HP:%d,
-                                HPEx:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.NPCID,
-                                self.Count,
-                                self.HP,
-                                self.HPEx
-                                )
-        return DumpString
-
-
-m_NAtagCMSummonPriWoodPile=tagCMSummonPriWoodPile()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSummonPriWoodPile.Cmd,m_NAtagCMSummonPriWoodPile.SubCmd))] = m_NAtagCMSummonPriWoodPile
 
 
 #------------------------------------------------------

--
Gitblit v1.8.0