From edf5674b9d6a4812b1a36b32e0e1bfd5b0cb968e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 15 十月 2025 09:19:42 +0800
Subject: [PATCH] 263 【主界面】头像系统(内政-幻境阁系统)-服务端(形象、头像、头像框、气泡、称号)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 2561 +++++------------------------------------------------------
 1 files changed, 215 insertions(+), 2,346 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 82a2cc6..4b5679d 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
 
 
 #------------------------------------------------------
@@ -2166,58 +1910,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
 
 
 #------------------------------------------------------
@@ -3573,73 +3265,6 @@
 
 m_NAtagCMEquipXLAttrChangeOK=tagCMEquipXLAttrChangeOK()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMEquipXLAttrChangeOK.Cmd,m_NAtagCMEquipXLAttrChangeOK.SubCmd))] = m_NAtagCMEquipXLAttrChangeOK
-
-
-#------------------------------------------------------
-# 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
 
 
 #------------------------------------------------------
@@ -5324,9 +4949,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 +4969,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 +4985,7 @@
                                 MapID:%d,
                                 LineID:%d,
                                 Cnt:%d,
-                                IsFinish:%d,
-                                DataEx:%d,
-                                IsLittleHelper:%d
+                                DataEx:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -5374,9 +4993,7 @@
                                 self.MapID,
                                 self.LineID,
                                 self.Cnt,
-                                self.IsFinish,
-                                self.DataEx,
-                                self.IsLittleHelper
+                                self.DataEx
                                 )
         return DumpString
 
@@ -5768,54 +5385,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 +5878,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 +5906,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 +5925,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
 
 
 #------------------------------------------------------
@@ -7058,62 +6627,6 @@
 
 m_NAtagCMGetInvestReward=tagCMGetInvestReward()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetInvestReward.Cmd,m_NAtagCMGetInvestReward.SubCmd))] = m_NAtagCMGetInvestReward
-
-
-#------------------------------------------------------
-#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
 
 
 #------------------------------------------------------
@@ -8023,54 +7536,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 +7581,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 +7805,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 +8133,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 +8297,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
 
 
 #------------------------------------------------------
@@ -9362,6 +8607,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 +8621,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 +8631,7 @@
         self.Head.SubCmd = 0x04
         self.Name = ""
         self.EmblemID = 0
+        self.EmblemWord = ""
         return
 
     def GetLength(self):
@@ -9391,6 +8639,7 @@
         length += self.Head.GetLength()
         length += 33
         length += 2
+        length += 3
 
         return length
 
@@ -9399,18 +8648,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
 
@@ -9469,139 +8721,6 @@
 
 m_NAtagCMDeleteFamilyMember=tagCMDeleteFamilyMember()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDeleteFamilyMember.Cmd,m_NAtagCMDeleteFamilyMember.SubCmd))] = m_NAtagCMDeleteFamilyMember
-
-
-#------------------------------------------------------
-# 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
 
 
 #------------------------------------------------------
@@ -10227,58 +9346,6 @@
 
 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
 
 
 #------------------------------------------------------
@@ -11555,118 +10622,6 @@
 
 
 #------------------------------------------------------
-# AA 24 Boss历练领奖 #tagCMActBossTrialGetAward
-
-class  tagCMActBossTrialGetAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ("SubmitCount", c_ushort),    #领取凭证个数对应奖励
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x24
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAA
-        self.SubCmd = 0x24
-        self.ActNum = 0
-        self.SubmitCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActBossTrialGetAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 24 Boss历练领奖 //tagCMActBossTrialGetAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                SubmitCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.SubmitCount
-                                )
-        return DumpString
-
-
-m_NAtagCMActBossTrialGetAward=tagCMActBossTrialGetAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActBossTrialGetAward.Cmd,m_NAtagCMActBossTrialGetAward.SubCmd))] = m_NAtagCMActBossTrialGetAward
-
-
-#------------------------------------------------------
-# AA 23 Boss历练提交凭证 #tagCMActBossTrialSubmit
-
-class  tagCMActBossTrialSubmit(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ("SubmitCount", c_ushort),    #提交凭证个数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x23
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAA
-        self.SubCmd = 0x23
-        self.ActNum = 0
-        self.SubmitCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActBossTrialSubmit)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 23 Boss历练提交凭证 //tagCMActBossTrialSubmit:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                SubmitCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.SubmitCount
-                                )
-        return DumpString
-
-
-m_NAtagCMActBossTrialSubmit=tagCMActBossTrialSubmit()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActBossTrialSubmit.Cmd,m_NAtagCMActBossTrialSubmit.SubCmd))] = m_NAtagCMActBossTrialSubmit
-
-
-#------------------------------------------------------
 # AA 09 集字活动兑换 #tagCMActCollectWordsExchange
 
 class  tagCMActCollectWordsExchange(Structure):
@@ -11720,143 +10675,6 @@
 
 m_NAtagCMActCollectWordsExchange=tagCMActCollectWordsExchange()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActCollectWordsExchange.Cmd,m_NAtagCMActCollectWordsExchange.SubCmd))] = m_NAtagCMActCollectWordsExchange
-
-
-#------------------------------------------------------
-# AA 15 垃圾分类活动收集已完成的任务垃圾 #tagCMActGarbageGetTaskAward
-
-class  tagCMActGarbageGetTaskAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ("GarbageTaskID", c_ubyte),    #垃圾任务ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        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 = 0xAA
-        self.SubCmd = 0x15
-        self.ActNum = 0
-        self.GarbageTaskID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActGarbageGetTaskAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 15 垃圾分类活动收集已完成的任务垃圾 //tagCMActGarbageGetTaskAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                GarbageTaskID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.GarbageTaskID
-                                )
-        return DumpString
-
-
-m_NAtagCMActGarbageGetTaskAward=tagCMActGarbageGetTaskAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActGarbageGetTaskAward.Cmd,m_NAtagCMActGarbageGetTaskAward.SubCmd))] = m_NAtagCMActGarbageGetTaskAward
-
-
-#------------------------------------------------------
-# AA 14 垃圾分类活动分类垃圾 #tagCMActGarbageSorting
-
-class  tagCMActGarbageSorting(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)//活动编号
-    GarbageSortingType = 0    #(BYTE GarbageSortingType)//垃圾分类类型,即属于哪种垃圾
-    ItemIndexCount = 0    #(BYTE ItemIndexCount)//垃圾背包中的物品索引数
-    ItemIndexList = list()    #(vector<BYTE> ItemIndexList)//垃圾背包中的物品索引列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x14
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.GarbageSortingType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ItemIndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.ItemIndexCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.ItemIndexList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x14
-        self.ActNum = 0
-        self.GarbageSortingType = 0
-        self.ItemIndexCount = 0
-        self.ItemIndexList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 1
-        length += 1 * self.ItemIndexCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteBYTE(data, self.GarbageSortingType)
-        data = CommFunc.WriteBYTE(data, self.ItemIndexCount)
-        for i in range(self.ItemIndexCount):
-            data = CommFunc.WriteBYTE(data, self.ItemIndexList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                GarbageSortingType:%d,
-                                ItemIndexCount:%d,
-                                ItemIndexList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.GarbageSortingType,
-                                self.ItemIndexCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMActGarbageSorting=tagCMActGarbageSorting()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActGarbageSorting.Head.Cmd,m_NAtagCMActGarbageSorting.Head.SubCmd))] = m_NAtagCMActGarbageSorting
 
 
 #------------------------------------------------------
@@ -12351,188 +11169,6 @@
 
 m_NAtagCMActWishingRefresh=tagCMActWishingRefresh()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActWishingRefresh.Cmd,m_NAtagCMActWishingRefresh.SubCmd))] = m_NAtagCMActWishingRefresh
-
-
-#------------------------------------------------------
-# AA 18 仙匣秘境活动奖池刷新 #tagCMActXianXiaMJAwardPoolRefresh
-
-class  tagCMActXianXiaMJAwardPoolRefresh(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x18
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAA
-        self.SubCmd = 0x18
-        self.ActNum = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActXianXiaMJAwardPoolRefresh)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 18 仙匣秘境活动奖池刷新 //tagCMActXianXiaMJAwardPoolRefresh:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum
-                                )
-        return DumpString
-
-
-m_NAtagCMActXianXiaMJAwardPoolRefresh=tagCMActXianXiaMJAwardPoolRefresh()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActXianXiaMJAwardPoolRefresh.Cmd,m_NAtagCMActXianXiaMJAwardPoolRefresh.SubCmd))] = m_NAtagCMActXianXiaMJAwardPoolRefresh
-
-
-#------------------------------------------------------
-# AA 17 仙匣秘境活动抽奖 #tagCMActXianXiaMJLottery
-
-class  tagCMActXianXiaMJLottery(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ActNum", c_ubyte),    #活动编号
-                  ("PosNum", c_ubyte),    #玩家点击的奖励位置编号,从1开始
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xAA
-        self.SubCmd = 0x17
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xAA
-        self.SubCmd = 0x17
-        self.ActNum = 0
-        self.PosNum = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMActXianXiaMJLottery)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 17 仙匣秘境活动抽奖 //tagCMActXianXiaMJLottery:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ActNum:%d,
-                                PosNum:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ActNum,
-                                self.PosNum
-                                )
-        return DumpString
-
-
-m_NAtagCMActXianXiaMJLottery=tagCMActXianXiaMJLottery()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActXianXiaMJLottery.Cmd,m_NAtagCMActXianXiaMJLottery.SubCmd))] = m_NAtagCMActXianXiaMJLottery
-
-
-#------------------------------------------------------
-# AA 16 仙匣秘境活动选择大奖 #tagCMActXianXiaMJSuperItem
-
-class  tagCMActXianXiaMJSuperItem(Structure):
-    Head = tagHead()
-    ActNum = 0    #(BYTE ActNum)//活动编号
-    SuperItemCount = 0    #(BYTE SuperItemCount)//选择物品数量
-    SuperItemIDList = list()    #(vector<DWORD> SuperItemIDList)//选择的大奖库物品ID列表,每次重新选择需要发送全部已选择的大奖物品ID,不能只发单个物品ID;
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x16
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.SuperItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.SuperItemCount):
-            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
-            self.SuperItemIDList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x16
-        self.ActNum = 0
-        self.SuperItemCount = 0
-        self.SuperItemIDList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 4 * self.SuperItemCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteBYTE(data, self.SuperItemCount)
-        for i in range(self.SuperItemCount):
-            data = CommFunc.WriteDWORD(data, self.SuperItemIDList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ActNum:%d,
-                                SuperItemCount:%d,
-                                SuperItemIDList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ActNum,
-                                self.SuperItemCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMActXianXiaMJSuperItem=tagCMActXianXiaMJSuperItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActXianXiaMJSuperItem.Head.Cmd,m_NAtagCMActXianXiaMJSuperItem.Head.SubCmd))] = m_NAtagCMActXianXiaMJSuperItem
 
 
 #------------------------------------------------------
@@ -13353,62 +11989,6 @@
 
 
 #------------------------------------------------------
-# B0 50 钓鱼收杆 #tagCMDoFish
-
-class  tagCMDoFish(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("FishNum", c_ubyte),    # 钓鱼编号1~N
-                  ("PosIndex", c_ubyte),    # 停留位置1~N
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x50
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB0
-        self.SubCmd = 0x50
-        self.FishNum = 0
-        self.PosIndex = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMDoFish)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 50 钓鱼收杆 //tagCMDoFish:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                FishNum:%d,
-                                PosIndex:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.FishNum,
-                                self.PosIndex
-                                )
-        return DumpString
-
-
-m_NAtagCMDoFish=tagCMDoFish()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDoFish.Cmd,m_NAtagCMDoFish.SubCmd))] = m_NAtagCMDoFish
-
-
-#------------------------------------------------------
 # B0 15 接收协助感谢礼物 #tagCGGetAssistThanksGift
 
 class  tagCGGetAssistThanksGift(Structure):
@@ -13461,9 +12041,9 @@
 
 
 #------------------------------------------------------
-# B0 34 福地请求结算奖励 #tagCGMineAreaAwardGet
+# B0 39 自动淘金免费使用 #tagCSGoldRushAutoFreeUse
 
-class  tagCGMineAreaAwardGet(Structure):
+class  tagCSGoldRushAutoFreeUse(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
@@ -13473,7 +12053,7 @@
     def __init__(self):
         self.Clear()
         self.Cmd = 0xB0
-        self.SubCmd = 0x34
+        self.SubCmd = 0x39
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -13483,17 +12063,17 @@
 
     def Clear(self):
         self.Cmd = 0xB0
-        self.SubCmd = 0x34
+        self.SubCmd = 0x39
         return
 
     def GetLength(self):
-        return sizeof(tagCGMineAreaAwardGet)
+        return sizeof(tagCSGoldRushAutoFreeUse)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B0 34 福地请求结算奖励 //tagCGMineAreaAwardGet:
+        DumpString = '''// B0 39 自动淘金免费使用 //tagCSGoldRushAutoFreeUse:
                                 Cmd:%s,
                                 SubCmd:%s
                                 '''\
@@ -13504,26 +12084,27 @@
         return DumpString
 
 
-m_NAtagCGMineAreaAwardGet=tagCGMineAreaAwardGet()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMineAreaAwardGet.Cmd,m_NAtagCGMineAreaAwardGet.SubCmd))] = m_NAtagCGMineAreaAwardGet
+m_NAtagCSGoldRushAutoFreeUse=tagCSGoldRushAutoFreeUse()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSGoldRushAutoFreeUse.Cmd,m_NAtagCSGoldRushAutoFreeUse.SubCmd))] = m_NAtagCSGoldRushAutoFreeUse
 
 
 #------------------------------------------------------
-# B0 33 福地查看 #tagCGMineAreaView
+# B0 36 淘金操作 #tagCSGoldRushOP
 
-class  tagCGMineAreaView(Structure):
+class  tagCSGoldRushOP(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("QueryType", c_ubyte),    # 查询同步类型:0-后端主动同步;1-查看指定福地;2-查看道友福地列表;3-查看周围随机福地列表;4-退出他人福地;5-查看记录
-                  ("QueryValue", c_int),    # 查询值,类型1时-发送目标玩家ID;3时-发送是否重新随机
+                  ("OPType", c_ubyte),    # 0-接受淘金;1-刷新淘金;2-开始淘金或调整监工数;3-取消淘金
+                  ("CampID", c_ubyte),    # 营地ID
+                  ("WorkerCnt", c_ubyte),    # 派遣监工数,仅类型2有效
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xB0
-        self.SubCmd = 0x33
+        self.SubCmd = 0x36
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -13533,51 +12114,56 @@
 
     def Clear(self):
         self.Cmd = 0xB0
-        self.SubCmd = 0x33
-        self.QueryType = 0
-        self.QueryValue = 0
+        self.SubCmd = 0x36
+        self.OPType = 0
+        self.CampID = 0
+        self.WorkerCnt = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCGMineAreaView)
+        return sizeof(tagCSGoldRushOP)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B0 33 福地查看 //tagCGMineAreaView:
+        DumpString = '''// B0 36 淘金操作 //tagCSGoldRushOP:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                QueryType:%d,
-                                QueryValue:%d
+                                OPType:%d,
+                                CampID:%d,
+                                WorkerCnt:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.QueryType,
-                                self.QueryValue
+                                self.OPType,
+                                self.CampID,
+                                self.WorkerCnt
                                 )
         return DumpString
 
 
-m_NAtagCGMineAreaView=tagCGMineAreaView()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMineAreaView.Cmd,m_NAtagCGMineAreaView.SubCmd))] = m_NAtagCGMineAreaView
+m_NAtagCSGoldRushOP=tagCSGoldRushOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSGoldRushOP.Cmd,m_NAtagCSGoldRushOP.SubCmd))] = m_NAtagCSGoldRushOP
 
 
 #------------------------------------------------------
-# B0 35 福地管家免费试用 #tagCMMineHouseKeeperFreeUse
+# B0 37 淘金解锁 #tagCSGoldRushUnlock
 
-class  tagCMMineHouseKeeperFreeUse(Structure):
+class  tagCSGoldRushUnlock(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
+                  ("UnlockType", c_ubyte),    # 0-营地;1-监工
+                  ("UnlockID", c_ubyte),    # 解锁类型对应的ID
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xB0
-        self.SubCmd = 0x35
+        self.SubCmd = 0x37
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -13587,110 +12173,53 @@
 
     def Clear(self):
         self.Cmd = 0xB0
-        self.SubCmd = 0x35
+        self.SubCmd = 0x37
+        self.UnlockType = 0
+        self.UnlockID = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMMineHouseKeeperFreeUse)
+        return sizeof(tagCSGoldRushUnlock)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B0 35 福地管家免费试用 //tagCMMineHouseKeeperFreeUse:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMMineHouseKeeperFreeUse=tagCMMineHouseKeeperFreeUse()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineHouseKeeperFreeUse.Cmd,m_NAtagCMMineHouseKeeperFreeUse.SubCmd))] = m_NAtagCMMineHouseKeeperFreeUse
-
-
-#------------------------------------------------------
-# B0 30 福地物品拉 #tagCMMineItemPull
-
-class  tagCMMineItemPull(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("PlayerID", c_int),    # 福地所属玩家ID,0默认自己
-                  ("ItemIndex", c_ubyte),    # 物品所在位置索引0~n
-                  ("WorkerCount", c_ubyte),    # 上工人人数
-                  ("IsPreview", c_ubyte),    # 是否预览;0-直接拉,1-预览大概时间
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        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 = 0xB0
-        self.SubCmd = 0x30
-        self.PlayerID = 0
-        self.ItemIndex = 0
-        self.WorkerCount = 0
-        self.IsPreview = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMMineItemPull)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 30 福地物品拉 //tagCMMineItemPull:
+        DumpString = '''// B0 37 淘金解锁 //tagCSGoldRushUnlock:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                PlayerID:%d,
-                                ItemIndex:%d,
-                                WorkerCount:%d,
-                                IsPreview:%d
+                                UnlockType:%d,
+                                UnlockID:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.PlayerID,
-                                self.ItemIndex,
-                                self.WorkerCount,
-                                self.IsPreview
+                                self.UnlockType,
+                                self.UnlockID
                                 )
         return DumpString
 
 
-m_NAtagCMMineItemPull=tagCMMineItemPull()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineItemPull.Cmd,m_NAtagCMMineItemPull.SubCmd))] = m_NAtagCMMineItemPull
+m_NAtagCSGoldRushUnlock=tagCSGoldRushUnlock()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSGoldRushUnlock.Cmd,m_NAtagCSGoldRushUnlock.SubCmd))] = m_NAtagCSGoldRushUnlock
 
 
 #------------------------------------------------------
-# B0 31 福地物品刷新 #tagCMMineItemRefresh
+# B0 38 淘金仓库领奖 #tagCSGoldRushWarehouseAward
 
-class  tagCMMineItemRefresh(Structure):
+class  tagCSGoldRushWarehouseAward(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("RefreshType", c_ubyte),    # 刷新类型:0-自己物品普通刷新;1-自己物品超级刷新;2-周围福地玩家列表刷新
+                  ("AwardIndex", c_ubyte),    # 领奖位置索引,从0开始
+                  ("IsAll", c_ubyte),    # 是否领取所有
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xB0
-        self.SubCmd = 0x31
+        self.SubCmd = 0x38
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -13700,80 +12229,35 @@
 
     def Clear(self):
         self.Cmd = 0xB0
-        self.SubCmd = 0x31
-        self.RefreshType = 0
+        self.SubCmd = 0x38
+        self.AwardIndex = 0
+        self.IsAll = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMMineItemRefresh)
+        return sizeof(tagCSGoldRushWarehouseAward)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B0 31 福地物品刷新 //tagCMMineItemRefresh:
+        DumpString = '''// B0 38 淘金仓库领奖 //tagCSGoldRushWarehouseAward:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                RefreshType:%d
+                                AwardIndex:%d,
+                                IsAll:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.RefreshType
+                                self.AwardIndex,
+                                self.IsAll
                                 )
         return DumpString
 
 
-m_NAtagCMMineItemRefresh=tagCMMineItemRefresh()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineItemRefresh.Cmd,m_NAtagCMMineItemRefresh.SubCmd))] = m_NAtagCMMineItemRefresh
-
-
-#------------------------------------------------------
-# B0 32 福地工人雇佣 #tagCMMineWorkerEmploy
-
-class  tagCMMineWorkerEmploy(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xB0
-        self.SubCmd = 0x32
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xB0
-        self.SubCmd = 0x32
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMMineWorkerEmploy)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// B0 32 福地工人雇佣 //tagCMMineWorkerEmploy:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMMineWorkerEmploy=tagCMMineWorkerEmploy()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineWorkerEmploy.Cmd,m_NAtagCMMineWorkerEmploy.SubCmd))] = m_NAtagCMMineWorkerEmploy
+m_NAtagCSGoldRushWarehouseAward=tagCSGoldRushWarehouseAward()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSGoldRushWarehouseAward.Cmd,m_NAtagCSGoldRushWarehouseAward.SubCmd))] = m_NAtagCSGoldRushWarehouseAward
 
 
 #------------------------------------------------------
@@ -14170,174 +12654,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):
@@ -14391,66 +12707,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
 
 
 #------------------------------------------------------
@@ -14598,70 +12854,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):
@@ -14682,13 +12882,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
@@ -14701,216 +12901,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
 
 
 #------------------------------------------------------
@@ -15076,15 +13068,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):
@@ -15093,99 +13088,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
 
 
 #------------------------------------------------------
@@ -15305,7 +13234,6 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("HeroID", c_int),    #武将ID
-                  ("ItemIndex", c_ushort),    #关联武将物品所在武将背包索引,激活时可不用发
                   ("BookType", c_ubyte),    #图鉴激活类型: 0-初始激活;1-星级升级;2-突破等级升级
                   ]
 
@@ -15324,7 +13252,6 @@
         self.Cmd = 0xB2
         self.SubCmd = 0x37
         self.HeroID = 0
-        self.ItemIndex = 0
         self.BookType = 0
         return
 
@@ -15339,14 +13266,12 @@
                                 Cmd:%s,
                                 SubCmd:%s,
                                 HeroID:%d,
-                                ItemIndex:%d,
                                 BookType:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.HeroID,
-                                self.ItemIndex,
                                 self.BookType
                                 )
         return DumpString
@@ -15826,6 +13751,66 @@
 
 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
 
 
 #------------------------------------------------------
@@ -17310,7 +15295,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("ReqType", c_ubyte),    # 0-停止战斗回城;1-设置消耗倍值;2-挑战关卡小怪;3-挑战关卡boss;4-继续战斗;
+                  ("ReqType", c_ubyte),    # 0-停止战斗回城;1-设置消耗倍值;2-挑战关卡小怪;4-继续战斗;
                   ("ReqValue", c_int),    # 请求值,ReqType为1时发送消耗倍值
                   ]
 
@@ -17356,58 +15341,6 @@
 
 m_NAtagCSMainFightReq=tagCSMainFightReq()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSMainFightReq.Cmd,m_NAtagCSMainFightReq.SubCmd))] = m_NAtagCSMainFightReq
-
-
-#------------------------------------------------------
-# 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
 
 
 #------------------------------------------------------
@@ -17464,70 +15397,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
 
 
 #------------------------------------------------------
@@ -18391,10 +16260,10 @@
 
 class  tagCMTurnFight(Structure):
     Head = tagHead()
-    MapID = 0    #(DWORD MapID)// 自定义地图ID,可用于绑定战斗地图场景功能(如主线关卡、主线boss、爬塔、竞技场等)
+    MapID = 0    #(DWORD MapID)// 自定义地图ID,可用于绑定战斗地图场景功能(如主线boss、爬塔、竞技场等)
     FuncLineID = 0    #(DWORD FuncLineID)// MapID对应的扩展值,如具体某个关卡等
     TagType = 0    #(BYTE TagType)// 目标类型,0-NPC阵容,1-玩家
-    TagID = 0    #(DWORD TagID)// 目标类型对应的ID,如阵容ID或玩家ID
+    TagID = 0    #(DWORD TagID)// 目标类型对应的ID,如玩家ID
     ValueCount = 0    #(BYTE ValueCount)
     ValueList = list()    #(vector<DWORD> ValueList)// 附加值列表,可选,具体含义由MapID决定
     data = None

--
Gitblit v1.8.0