From 4c115be5ce3f4be8766b2e10d1982807b787f132 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 18 七月 2024 17:46:34 +0800
Subject: [PATCH] 10223 【越南】【砍树】【主干】【港台】秘境寻宝(仙匣秘境层支持配置物品数、支持消耗道具寻宝;增加本服榜;增加跨服活动榜;任务活动支持仙匣秘境寻宝x次、x层任务类型;充值购买次数礼包活动支持配置额外的活动商城类型,支持配置每日重置的购买次数奖励;)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 2851 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 2,651 insertions(+), 200 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 2922b4d..5d17e1a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -424,6 +424,190 @@
 
 
 #------------------------------------------------------
+# A0 08 玩家记录信息 #tagGCPlayerRecInfo
+
+class  tagGCPlayerRec(Structure):
+    Time = 0    #(DWORD Time)//时间
+    Value1 = 0    #(DWORD Value1)//值1
+    Value2 = 0    #(DWORD Value2)//值2
+    Value3 = 0    #(DWORD Value3)//值3
+    Value4 = 0    #(DWORD Value4)//值4
+    Value5 = 0    #(DWORD Value5)//值5
+    Value6 = 0    #(DWORD Value6)//值6
+    Value7 = 0    #(DWORD Value7)//值7
+    Value8 = 0    #(DWORD Value8)//值8
+    UserDataLen = 0    #(WORD UserDataLen)//扩展数据长度
+    UserData = ""    #(String UserData)//扩展数据
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.Time,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value4,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value5,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value6,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value7,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value8,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.UserDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.UserDataLen)
+        return _pos
+
+    def Clear(self):
+        self.Time = 0
+        self.Value1 = 0
+        self.Value2 = 0
+        self.Value3 = 0
+        self.Value4 = 0
+        self.Value5 = 0
+        self.Value6 = 0
+        self.Value7 = 0
+        self.Value8 = 0
+        self.UserDataLen = 0
+        self.UserData = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 2
+        length += len(self.UserData)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.Time)
+        data = CommFunc.WriteDWORD(data, self.Value1)
+        data = CommFunc.WriteDWORD(data, self.Value2)
+        data = CommFunc.WriteDWORD(data, self.Value3)
+        data = CommFunc.WriteDWORD(data, self.Value4)
+        data = CommFunc.WriteDWORD(data, self.Value5)
+        data = CommFunc.WriteDWORD(data, self.Value6)
+        data = CommFunc.WriteDWORD(data, self.Value7)
+        data = CommFunc.WriteDWORD(data, self.Value8)
+        data = CommFunc.WriteWORD(data, self.UserDataLen)
+        data = CommFunc.WriteString(data, self.UserDataLen, self.UserData)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Time:%d,
+                                Value1:%d,
+                                Value2:%d,
+                                Value3:%d,
+                                Value4:%d,
+                                Value5:%d,
+                                Value6:%d,
+                                Value7:%d,
+                                Value8:%d,
+                                UserDataLen:%d,
+                                UserData:%s
+                                '''\
+                                %(
+                                self.Time,
+                                self.Value1,
+                                self.Value2,
+                                self.Value3,
+                                self.Value4,
+                                self.Value5,
+                                self.Value6,
+                                self.Value7,
+                                self.Value8,
+                                self.UserDataLen,
+                                self.UserData
+                                )
+        return DumpString
+
+
+class  tagGCPlayerRecInfo(Structure):
+    Head = tagHead()
+    Type = 0    #(BYTE Type)//类型
+    Count = 0    #(WORD Count)//数量
+    PlayerRecList = list()    #(vector<tagGCPlayerRec> PlayerRecList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA0
+        self.Head.SubCmd = 0x08
+        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.Count,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        for i in range(self.Count):
+            temPlayerRecList = tagGCPlayerRec()
+            _pos = temPlayerRecList.ReadData(_lpData, _pos)
+            self.PlayerRecList.append(temPlayerRecList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA0
+        self.Head.SubCmd = 0x08
+        self.Type = 0
+        self.Count = 0
+        self.PlayerRecList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 2
+        for i in range(self.Count):
+            length += self.PlayerRecList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Type)
+        data = CommFunc.WriteWORD(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.PlayerRecList[i].GetLength(), self.PlayerRecList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Type:%d,
+                                Count:%d,
+                                PlayerRecList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Type,
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagGCPlayerRecInfo=tagGCPlayerRecInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCPlayerRecInfo.Head.Cmd,m_NAtagGCPlayerRecInfo.Head.SubCmd))] = m_NAtagGCPlayerRecInfo
+
+
+#------------------------------------------------------
 # A0 06 服务器地图线路人数状态 #tagGCPyServerMapState
 
 class  tagGCPyServerMapLineState(Structure):
@@ -4451,9 +4635,17 @@
     Type2 = 0    #(BYTE Type2)//附加类型,用来表示排序对象的类型,比如,玩家所属职业门派,宠物类型等
     Value1 = 0    #(DWORD Value1)//排序依赖的值,比如,等级
     Value2 = 0    #(DWORD Value2)//排序依赖的值,比如,战斗力
+    Value3 = 0    #(DWORD Value3)//附加值
+    Value4 = 0    #(DWORD Value4)//附加值
+    Value5 = 0    #(DWORD Value5)//附加值
+    Value6 = 0    #(DWORD Value6)//附加值
+    Value7 = 0    #(DWORD Value7)//附加值
+    Value8 = 0    #(DWORD Value8)//附加值
     CmpValue = 0    #(DWORD CmpValue)// 比较权值
     CmpValue2 = 0    #(DWORD CmpValue2)// 比较权值
     CmpValue3 = 0    #(DWORD CmpValue3)// 比较权值
+    DataLen = 0    #(WORD DataLen)
+    UserData = ""    #(String UserData)//附加
     data = None
 
     def __init__(self):
@@ -4470,9 +4662,17 @@
         self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value4,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value5,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value6,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value7,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value8,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
         return _pos
 
     def Clear(self):
@@ -4484,9 +4684,17 @@
         self.Type2 = 0
         self.Value1 = 0
         self.Value2 = 0
+        self.Value3 = 0
+        self.Value4 = 0
+        self.Value5 = 0
+        self.Value6 = 0
+        self.Value7 = 0
+        self.Value8 = 0
         self.CmpValue = 0
         self.CmpValue2 = 0
         self.CmpValue3 = 0
+        self.DataLen = 0
+        self.UserData = ""
         return
 
     def GetLength(self):
@@ -4502,6 +4710,14 @@
         length += 4
         length += 4
         length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 2
+        length += len(self.UserData)
 
         return length
 
@@ -4515,9 +4731,17 @@
         data = CommFunc.WriteBYTE(data, self.Type2)
         data = CommFunc.WriteDWORD(data, self.Value1)
         data = CommFunc.WriteDWORD(data, self.Value2)
+        data = CommFunc.WriteDWORD(data, self.Value3)
+        data = CommFunc.WriteDWORD(data, self.Value4)
+        data = CommFunc.WriteDWORD(data, self.Value5)
+        data = CommFunc.WriteDWORD(data, self.Value6)
+        data = CommFunc.WriteDWORD(data, self.Value7)
+        data = CommFunc.WriteDWORD(data, self.Value8)
         data = CommFunc.WriteDWORD(data, self.CmpValue)
         data = CommFunc.WriteDWORD(data, self.CmpValue2)
         data = CommFunc.WriteDWORD(data, self.CmpValue3)
+        data = CommFunc.WriteWORD(data, self.DataLen)
+        data = CommFunc.WriteString(data, self.DataLen, self.UserData)
         return data
 
     def OutputString(self):
@@ -4530,9 +4754,17 @@
                                 Type2:%d,
                                 Value1:%d,
                                 Value2:%d,
+                                Value3:%d,
+                                Value4:%d,
+                                Value5:%d,
+                                Value6:%d,
+                                Value7:%d,
+                                Value8:%d,
                                 CmpValue:%d,
                                 CmpValue2:%d,
-                                CmpValue3:%d
+                                CmpValue3:%d,
+                                DataLen:%d,
+                                UserData:%s
                                 '''\
                                 %(
                                 self.OrderIndex,
@@ -4543,16 +4775,24 @@
                                 self.Type2,
                                 self.Value1,
                                 self.Value2,
+                                self.Value3,
+                                self.Value4,
+                                self.Value5,
+                                self.Value6,
+                                self.Value7,
+                                self.Value8,
                                 self.CmpValue,
                                 self.CmpValue2,
-                                self.CmpValue3
+                                self.CmpValue3,
+                                self.DataLen,
+                                self.UserData
                                 )
         return DumpString
 
 
 class  tagPYBillboardData(Structure):
     Head = tagHead()
-    IsWatchSelf = 0    #(BYTE IsWatchSelf)
+    WatchID = 0    #(DWORD WatchID)//查看指定ID名次前后,如玩家ID、家族ID等
     BillboardCount = 0    #(BYTE BillboardCount)
     Type = 0    #(BYTE Type)//排行榜类型
     Billboard = list()    #(vector<tagPYBillboardInfo> Billboard)//size = BillboardCount
@@ -4567,7 +4807,7 @@
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.IsWatchSelf,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.WatchID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.BillboardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.Type,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.BillboardCount):
@@ -4581,7 +4821,7 @@
         self.Head.Clear()
         self.Head.Cmd = 0xA9
         self.Head.SubCmd = 0xA2
-        self.IsWatchSelf = 0
+        self.WatchID = 0
         self.BillboardCount = 0
         self.Type = 0
         self.Billboard = list()
@@ -4590,7 +4830,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
-        length += 1
+        length += 4
         length += 1
         length += 1
         for i in range(self.BillboardCount):
@@ -4601,7 +4841,7 @@
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.IsWatchSelf)
+        data = CommFunc.WriteDWORD(data, self.WatchID)
         data = CommFunc.WriteBYTE(data, self.BillboardCount)
         data = CommFunc.WriteBYTE(data, self.Type)
         for i in range(self.BillboardCount):
@@ -4611,14 +4851,14 @@
     def OutputString(self):
         DumpString = '''
                                 Head:%s,
-                                IsWatchSelf:%d,
+                                WatchID:%d,
                                 BillboardCount:%d,
                                 Type:%d,
                                 Billboard:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
-                                self.IsWatchSelf,
+                                self.WatchID,
                                 self.BillboardCount,
                                 self.Type,
                                 "..."
@@ -8076,6 +8316,148 @@
 
 
 #------------------------------------------------------
+# B0 35 福地记录信息 #tagGCMineAreaRecordInfo
+
+class  tagGCMineAreaRecord(Structure):
+    RecordType = 0    #(BYTE RecordType)// 记录类型;1-自己拉物品;2-物品被人抢
+    TagPlayerID = 0    #(DWORD TagPlayerID)// 目标玩家ID,等于自己玩家ID时代表拉自己的,反之为抢别人的
+    RecordTime = 0    #(DWORD RecordTime)// 记录时间戳
+    MineID = 0    #(WORD MineID)// 矿物ID,对应福地采集表中ID
+    TagPlayerName = ""    #(char TagPlayerName[33])
+    TagFace = 0    #(DWORD TagFace)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.RecordType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TagPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.RecordTime,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.MineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.TagPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,33)
+        self.TagFace,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        return _pos
+
+    def Clear(self):
+        self.RecordType = 0
+        self.TagPlayerID = 0
+        self.RecordTime = 0
+        self.MineID = 0
+        self.TagPlayerName = ""
+        self.TagFace = 0
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 1
+        length += 4
+        length += 4
+        length += 2
+        length += 33
+        length += 4
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteBYTE(data, self.RecordType)
+        data = CommFunc.WriteDWORD(data, self.TagPlayerID)
+        data = CommFunc.WriteDWORD(data, self.RecordTime)
+        data = CommFunc.WriteWORD(data, self.MineID)
+        data = CommFunc.WriteString(data, 33, self.TagPlayerName)
+        data = CommFunc.WriteDWORD(data, self.TagFace)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                RecordType:%d,
+                                TagPlayerID:%d,
+                                RecordTime:%d,
+                                MineID:%d,
+                                TagPlayerName:%s,
+                                TagFace:%d
+                                '''\
+                                %(
+                                self.RecordType,
+                                self.TagPlayerID,
+                                self.RecordTime,
+                                self.MineID,
+                                self.TagPlayerName,
+                                self.TagFace
+                                )
+        return DumpString
+
+
+class  tagGCMineAreaRecordInfo(Structure):
+    Head = tagHead()
+    RecordCount = 0    #(BYTE RecordCount)
+    AreaRecordList = list()    #(vector<tagGCMineAreaRecord> AreaRecordList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x35
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.RecordCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.RecordCount):
+            temAreaRecordList = tagGCMineAreaRecord()
+            _pos = temAreaRecordList.ReadData(_lpData, _pos)
+            self.AreaRecordList.append(temAreaRecordList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x35
+        self.RecordCount = 0
+        self.AreaRecordList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.RecordCount):
+            length += self.AreaRecordList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.RecordCount)
+        for i in range(self.RecordCount):
+            data = CommFunc.WriteString(data, self.AreaRecordList[i].GetLength(), self.AreaRecordList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                RecordCount:%d,
+                                AreaRecordList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.RecordCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagGCMineAreaRecordInfo=tagGCMineAreaRecordInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCMineAreaRecordInfo.Head.Cmd,m_NAtagGCMineAreaRecordInfo.Head.SubCmd))] = m_NAtagGCMineAreaRecordInfo
+
+
+#------------------------------------------------------
 # B0 32 福地物品拉预览结果 #tagGCMineItemPullPreviewRet
 
 class  tagGCMineItemPullPreviewRet(Structure):
@@ -8314,6 +8696,213 @@
 
 m_NAtagGCUseAssistThanksGiftPreview=tagGCUseAssistThanksGiftPreview()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCUseAssistThanksGiftPreview.Head.Cmd,m_NAtagGCUseAssistThanksGiftPreview.Head.SubCmd))] = m_NAtagGCUseAssistThanksGiftPreview
+
+
+#------------------------------------------------------
+# B0 20 膜拜信息列表 #tagGCWorshipInfoList
+
+class  tagGCWorshipInfo(Structure):
+    PlayerID = 0    #(DWORD PlayerID)// 目标玩家ID
+    WorshipType = 0    #(BYTE WorshipType)// 膜拜类型
+    WorshipValue = 0    #(DWORD WorshipValue)// 膜拜类型对应的功能值,如名次或其他,由具体膜拜类型定义对应值含义
+    InfoLen = 0    #(WORD InfoLen)
+    PlayerInfo = ""    #(String PlayerInfo)// 玩家信息{k:v, ...}
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.WorshipType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.WorshipValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.InfoLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.PlayerInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.InfoLen)
+        return _pos
+
+    def Clear(self):
+        self.PlayerID = 0
+        self.WorshipType = 0
+        self.WorshipValue = 0
+        self.InfoLen = 0
+        self.PlayerInfo = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 1
+        length += 4
+        length += 2
+        length += len(self.PlayerInfo)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.PlayerID)
+        data = CommFunc.WriteBYTE(data, self.WorshipType)
+        data = CommFunc.WriteDWORD(data, self.WorshipValue)
+        data = CommFunc.WriteWORD(data, self.InfoLen)
+        data = CommFunc.WriteString(data, self.InfoLen, self.PlayerInfo)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                PlayerID:%d,
+                                WorshipType:%d,
+                                WorshipValue:%d,
+                                InfoLen:%d,
+                                PlayerInfo:%s
+                                '''\
+                                %(
+                                self.PlayerID,
+                                self.WorshipType,
+                                self.WorshipValue,
+                                self.InfoLen,
+                                self.PlayerInfo
+                                )
+        return DumpString
+
+
+class  tagGCWorshipInfoList(Structure):
+    Head = tagHead()
+    WorshipCount = 0    #(BYTE WorshipCount)
+    WorshipInfoList = list()    #(vector<tagGCWorshipInfo> WorshipInfoList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x20
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.WorshipCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.WorshipCount):
+            temWorshipInfoList = tagGCWorshipInfo()
+            _pos = temWorshipInfoList.ReadData(_lpData, _pos)
+            self.WorshipInfoList.append(temWorshipInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB0
+        self.Head.SubCmd = 0x20
+        self.WorshipCount = 0
+        self.WorshipInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.WorshipCount):
+            length += self.WorshipInfoList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.WorshipCount)
+        for i in range(self.WorshipCount):
+            data = CommFunc.WriteString(data, self.WorshipInfoList[i].GetLength(), self.WorshipInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                WorshipCount:%d,
+                                WorshipInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.WorshipCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagGCWorshipInfoList=tagGCWorshipInfoList()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCWorshipInfoList.Head.Cmd,m_NAtagGCWorshipInfoList.Head.SubCmd))] = m_NAtagGCWorshipInfoList
+
+
+#------------------------------------------------------
+# B0 21 膜拜结果 #tagGCWorshipResult
+
+class  tagGCWorshipResult(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("PlayerID", c_int),    # 目标玩家ID
+                  ("WorshipType", c_ubyte),    # 膜拜类型
+                  ("WorshipValue", c_int),    # 膜拜类型对应的功能值,如名次或其他,由具体膜拜类型定义对应值含义
+                  ("Result", c_ubyte),    # 膜拜结果:0-成功;1-不存在该膜拜类型;2-不存在该目标膜拜;3-不能膜拜该目标;
+                  ("MoneyType", c_ubyte),    # 货币类型
+                  ("MoneyValue", c_int),    # 货币奖励
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x21
+        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 = 0x21
+        self.PlayerID = 0
+        self.WorshipType = 0
+        self.WorshipValue = 0
+        self.Result = 0
+        self.MoneyType = 0
+        self.MoneyValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagGCWorshipResult)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 21 膜拜结果 //tagGCWorshipResult:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                PlayerID:%d,
+                                WorshipType:%d,
+                                WorshipValue:%d,
+                                Result:%d,
+                                MoneyType:%d,
+                                MoneyValue:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.PlayerID,
+                                self.WorshipType,
+                                self.WorshipValue,
+                                self.Result,
+                                self.MoneyType,
+                                self.MoneyValue
+                                )
+        return DumpString
+
+
+m_NAtagGCWorshipResult=tagGCWorshipResult()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCWorshipResult.Cmd,m_NAtagGCWorshipResult.SubCmd))] = m_NAtagGCWorshipResult
 
 
 #------------------------------------------------------
@@ -14580,15 +15169,25 @@
 # C0 07 跨服排行榜信息 #tagGCCrossBillboardInfo
 
 class  tagGCCrossBillboardData(Structure):
+    OrderIndex = 0    #(WORD OrderIndex)//名次索引,0代表第一名
     ID = 0    #(DWORD ID)
+    ID2 = 0    #(DWORD ID2)
     Name1 = ""    #(char Name1[33])//名字1,用来显示排序对象名字 
     Name2 = ""    #(char Name2[33])//名字2
     Type2 = 0    #(BYTE Type2)//附加类型,用来表示排序对象的类型,比如,玩家所属职业门派,宠物类型等
     Value1 = 0    #(DWORD Value1)//自定义值1
     Value2 = 0    #(DWORD Value2)//自定义值2
+    Value3 = 0    #(DWORD Value3)//附加值
+    Value4 = 0    #(DWORD Value4)//附加值
+    Value5 = 0    #(DWORD Value5)//附加值
+    Value6 = 0    #(DWORD Value6)//附加值
+    Value7 = 0    #(DWORD Value7)//附加值
+    Value8 = 0    #(DWORD Value8)//附加值
     CmpValue = 0    #(DWORD CmpValue)// 比较权值
     CmpValue2 = 0    #(DWORD CmpValue2)// 比较权值
     CmpValue3 = 0    #(DWORD CmpValue3)// 比较权值
+    DataLen = 0    #(WORD DataLen)
+    UserData = ""    #(String UserData)//附加
     data = None
 
     def __init__(self):
@@ -14597,31 +15196,53 @@
 
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
+        self.OrderIndex,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.ID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.ID2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Name1,_pos = CommFunc.ReadString(_lpData, _pos,33)
         self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,33)
         self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.Value2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value4,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value5,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value6,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value7,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Value8,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.CmpValue3,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.DataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.UserData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
         return _pos
 
     def Clear(self):
+        self.OrderIndex = 0
         self.ID = 0
+        self.ID2 = 0
         self.Name1 = ""
         self.Name2 = ""
         self.Type2 = 0
         self.Value1 = 0
         self.Value2 = 0
+        self.Value3 = 0
+        self.Value4 = 0
+        self.Value5 = 0
+        self.Value6 = 0
+        self.Value7 = 0
+        self.Value8 = 0
         self.CmpValue = 0
         self.CmpValue2 = 0
         self.CmpValue3 = 0
+        self.DataLen = 0
+        self.UserData = ""
         return
 
     def GetLength(self):
         length = 0
+        length += 2
+        length += 4
         length += 4
         length += 33
         length += 33
@@ -14631,44 +15252,82 @@
         length += 4
         length += 4
         length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 4
+        length += 2
+        length += len(self.UserData)
 
         return length
 
     def GetBuffer(self):
         data = ''
+        data = CommFunc.WriteWORD(data, self.OrderIndex)
         data = CommFunc.WriteDWORD(data, self.ID)
+        data = CommFunc.WriteDWORD(data, self.ID2)
         data = CommFunc.WriteString(data, 33, self.Name1)
         data = CommFunc.WriteString(data, 33, self.Name2)
         data = CommFunc.WriteBYTE(data, self.Type2)
         data = CommFunc.WriteDWORD(data, self.Value1)
         data = CommFunc.WriteDWORD(data, self.Value2)
+        data = CommFunc.WriteDWORD(data, self.Value3)
+        data = CommFunc.WriteDWORD(data, self.Value4)
+        data = CommFunc.WriteDWORD(data, self.Value5)
+        data = CommFunc.WriteDWORD(data, self.Value6)
+        data = CommFunc.WriteDWORD(data, self.Value7)
+        data = CommFunc.WriteDWORD(data, self.Value8)
         data = CommFunc.WriteDWORD(data, self.CmpValue)
         data = CommFunc.WriteDWORD(data, self.CmpValue2)
         data = CommFunc.WriteDWORD(data, self.CmpValue3)
+        data = CommFunc.WriteWORD(data, self.DataLen)
+        data = CommFunc.WriteString(data, self.DataLen, self.UserData)
         return data
 
     def OutputString(self):
         DumpString = '''
+                                OrderIndex:%d,
                                 ID:%d,
+                                ID2:%d,
                                 Name1:%s,
                                 Name2:%s,
                                 Type2:%d,
                                 Value1:%d,
                                 Value2:%d,
+                                Value3:%d,
+                                Value4:%d,
+                                Value5:%d,
+                                Value6:%d,
+                                Value7:%d,
+                                Value8:%d,
                                 CmpValue:%d,
                                 CmpValue2:%d,
-                                CmpValue3:%d
+                                CmpValue3:%d,
+                                DataLen:%d,
+                                UserData:%s
                                 '''\
                                 %(
+                                self.OrderIndex,
                                 self.ID,
+                                self.ID2,
                                 self.Name1,
                                 self.Name2,
                                 self.Type2,
                                 self.Value1,
                                 self.Value2,
+                                self.Value3,
+                                self.Value4,
+                                self.Value5,
+                                self.Value6,
+                                self.Value7,
+                                self.Value8,
                                 self.CmpValue,
                                 self.CmpValue2,
-                                self.CmpValue3
+                                self.CmpValue3,
+                                self.DataLen,
+                                self.UserData
                                 )
         return DumpString
 
@@ -14678,6 +15337,7 @@
     Type = 0    #(BYTE Type)//榜单类型
     GroupValue1 = 0    #(BYTE GroupValue1)// 分组值1
     GroupValue2 = 0    #(BYTE GroupValue2)// 分组值2,与分组值1组合归为同组榜单数据
+    WatchID = 0    #(DWORD WatchID)//查看指定ID名次前后,如玩家ID、家族ID等
     BillboardCount = 0    #(BYTE BillboardCount)
     CrossBillboardDataList = list()    #(vector<tagGCCrossBillboardData> CrossBillboardDataList)
     data = None
@@ -14694,6 +15354,7 @@
         self.Type,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.GroupValue2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.WatchID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.BillboardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.BillboardCount):
             temCrossBillboardDataList = tagGCCrossBillboardData()
@@ -14709,6 +15370,7 @@
         self.Type = 0
         self.GroupValue1 = 0
         self.GroupValue2 = 0
+        self.WatchID = 0
         self.BillboardCount = 0
         self.CrossBillboardDataList = list()
         return
@@ -14719,6 +15381,7 @@
         length += 1
         length += 1
         length += 1
+        length += 4
         length += 1
         for i in range(self.BillboardCount):
             length += self.CrossBillboardDataList[i].GetLength()
@@ -14731,6 +15394,7 @@
         data = CommFunc.WriteBYTE(data, self.Type)
         data = CommFunc.WriteBYTE(data, self.GroupValue1)
         data = CommFunc.WriteBYTE(data, self.GroupValue2)
+        data = CommFunc.WriteDWORD(data, self.WatchID)
         data = CommFunc.WriteBYTE(data, self.BillboardCount)
         for i in range(self.BillboardCount):
             data = CommFunc.WriteString(data, self.CrossBillboardDataList[i].GetLength(), self.CrossBillboardDataList[i].GetBuffer())
@@ -14742,6 +15406,7 @@
                                 Type:%d,
                                 GroupValue1:%d,
                                 GroupValue2:%d,
+                                WatchID:%d,
                                 BillboardCount:%d,
                                 CrossBillboardDataList:%s
                                 '''\
@@ -14750,6 +15415,7 @@
                                 self.Type,
                                 self.GroupValue1,
                                 self.GroupValue2,
+                                self.WatchID,
                                 self.BillboardCount,
                                 "..."
                                 )
@@ -16747,6 +17413,7 @@
                   ("TotalPayCount", c_int),    # 累计总购买次数
                   ("WeekPayCount", c_ushort),    # 周总购买次数
                   ("MonthPayCount", c_ushort),    # 月总购买次数
+                  ("SelectItemValue", c_int),    # 自选物品索引值,每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
                   ]
 
     def __init__(self):
@@ -16764,6 +17431,7 @@
         self.TotalPayCount = 0
         self.WeekPayCount = 0
         self.MonthPayCount = 0
+        self.SelectItemValue = 0
         return
 
     def GetLength(self):
@@ -16778,14 +17446,16 @@
                                 TodayPayCount:%d,
                                 TotalPayCount:%d,
                                 WeekPayCount:%d,
-                                MonthPayCount:%d
+                                MonthPayCount:%d,
+                                SelectItemValue:%d
                                 '''\
                                 %(
                                 self.RecordID,
                                 self.TodayPayCount,
                                 self.TotalPayCount,
                                 self.WeekPayCount,
-                                self.MonthPayCount
+                                self.MonthPayCount,
+                                self.SelectItemValue
                                 )
         return DumpString
 
@@ -18213,6 +18883,114 @@
 
 m_NAtagMCAttackMode=tagMCAttackMode()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCAttackMode.Cmd,m_NAtagMCAttackMode.SubCmd))] = m_NAtagMCAttackMode
+
+
+#------------------------------------------------------
+# A2 06 自动转化为对应物品ID个数刷新 #tagMCAutoItemCountRefresh
+
+class  tagMCAutoItemCount(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("ItemCount", c_int),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.ItemCount = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCAutoItemCount)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A2 06 自动转化为对应物品ID个数刷新 //tagMCAutoItemCountRefresh:
+                                ItemID:%d,
+                                ItemCount:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.ItemCount
+                                )
+        return DumpString
+
+
+class  tagMCAutoItemCountRefresh(Structure):
+    Head = tagHead()
+    Count = 0    #(WORD Count)// 刷新个数
+    ItemCountList = list()    #(vector<tagMCAutoItemCount> ItemCountList)// 物品信息列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA2
+        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.ReadWORD(_lpData, _pos)
+        for i in range(self.Count):
+            temItemCountList = tagMCAutoItemCount()
+            _pos = temItemCountList.ReadData(_lpData, _pos)
+            self.ItemCountList.append(temItemCountList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA2
+        self.Head.SubCmd = 0x06
+        self.Count = 0
+        self.ItemCountList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 2
+        for i in range(self.Count):
+            length += self.ItemCountList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteWORD(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.ItemCountList[i].GetLength(), self.ItemCountList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                ItemCountList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCAutoItemCountRefresh=tagMCAutoItemCountRefresh()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCAutoItemCountRefresh.Head.Cmd,m_NAtagMCAutoItemCountRefresh.Head.SubCmd))] = m_NAtagMCAutoItemCountRefresh
 
 
 #------------------------------------------------------
@@ -21539,6 +22317,181 @@
 
 
 #------------------------------------------------------
+# A3 61 新聚魂孔信息 #tagMCGatherTheSoulHoleInfo
+
+class  tagMCGatherTheSoulHoleInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)// 孔数
+    HoleSoulList = list()    #(vector<DWORD> HoleSoulList)// 孔聚魂ID列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0x61
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+            self.HoleSoulList.append(value)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0x61
+        self.Count = 0
+        self.HoleSoulList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 4 * self.Count
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteDWORD(data, self.HoleSoulList[i])
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                HoleSoulList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCGatherTheSoulHoleInfo=tagMCGatherTheSoulHoleInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGatherTheSoulHoleInfo.Head.Cmd,m_NAtagMCGatherTheSoulHoleInfo.Head.SubCmd))] = m_NAtagMCGatherTheSoulHoleInfo
+
+
+#------------------------------------------------------
+# A3 60 新聚魂信息 #tagMCGatherTheSoulInfo
+
+class  tagMCGatherTheSoul(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("SoulID", c_int),    
+                  ("LV", c_ushort),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.SoulID = 0
+        self.LV = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGatherTheSoul)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A3 60 新聚魂信息 //tagMCGatherTheSoulInfo:
+                                SoulID:%d,
+                                LV:%d
+                                '''\
+                                %(
+                                self.SoulID,
+                                self.LV
+                                )
+        return DumpString
+
+
+class  tagMCGatherTheSoulInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)// 信息个数
+    SoulList = list()    #(vector<tagMCGatherTheSoul> SoulList)// 信息列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0x60
+        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):
+            temSoulList = tagMCGatherTheSoul()
+            _pos = temSoulList.ReadData(_lpData, _pos)
+            self.SoulList.append(temSoulList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0x60
+        self.Count = 0
+        self.SoulList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.SoulList[i].GetLength()
+
+        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.WriteString(data, self.SoulList[i].GetLength(), self.SoulList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                SoulList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCGatherTheSoulInfo=tagMCGatherTheSoulInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGatherTheSoulInfo.Head.Cmd,m_NAtagMCGatherTheSoulInfo.Head.SubCmd))] = m_NAtagMCGatherTheSoulInfo
+
+
+#------------------------------------------------------
 # A3 1D 神兵等级信息 #tagMCGodWeaponLVList
 
 class  tagMCGodWeaponLVInfo(Structure):
@@ -22161,6 +23114,114 @@
 
 m_NAtagMCGubaoPieceInfo=tagMCGubaoPieceInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGubaoPieceInfo.Head.Cmd,m_NAtagMCGubaoPieceInfo.Head.SubCmd))] = m_NAtagMCGubaoPieceInfo
+
+
+#------------------------------------------------------
+# A3 CF 古宝共鸣信息 #tagMCGubaoResonanceInfo
+
+class  tagMCGubaoResonance(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ResonanceID", c_ushort),    # 共鸣ID
+                  ("ResonanceStar", c_ubyte),    # 已激活共鸣星级
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ResonanceID = 0
+        self.ResonanceStar = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGubaoResonance)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A3 CF 古宝共鸣信息 //tagMCGubaoResonanceInfo:
+                                ResonanceID:%d,
+                                ResonanceStar:%d
+                                '''\
+                                %(
+                                self.ResonanceID,
+                                self.ResonanceStar
+                                )
+        return DumpString
+
+
+class  tagMCGubaoResonanceInfo(Structure):
+    Head = tagHead()
+    Count = 0    #(BYTE Count)
+    ResonanceInfoList = list()    #(vector<tagMCGubaoResonance> ResonanceInfoList)
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0xCF
+        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):
+            temResonanceInfoList = tagMCGubaoResonance()
+            _pos = temResonanceInfoList.ReadData(_lpData, _pos)
+            self.ResonanceInfoList.append(temResonanceInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA3
+        self.Head.SubCmd = 0xCF
+        self.Count = 0
+        self.ResonanceInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        for i in range(self.Count):
+            length += self.ResonanceInfoList[i].GetLength()
+
+        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.WriteString(data, self.ResonanceInfoList[i].GetLength(), self.ResonanceInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                Count:%d,
+                                ResonanceInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCGubaoResonanceInfo=tagMCGubaoResonanceInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGubaoResonanceInfo.Head.Cmd,m_NAtagMCGubaoResonanceInfo.Head.SubCmd))] = m_NAtagMCGubaoResonanceInfo
 
 
 #------------------------------------------------------
@@ -23705,6 +24766,7 @@
     PassGradeCnt = 0    #(BYTE PassGradeCnt)//星级值对应个数, 每个key存9个lineID
     PassGrade = list()    #(vector<DWORD> PassGrade)//副本线路对应星级值列表
     EnterCntTotal = 0    #(DWORD EnterCntTotal)//累计进入次数
+    PassLineID = 0    #(DWORD PassLineID)//已过关到的lineID
     data = None
 
     def __init__(self):
@@ -23722,6 +24784,7 @@
             value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
             self.PassGrade.append(value)
         self.EnterCntTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.PassLineID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -23732,6 +24795,7 @@
         self.PassGradeCnt = 0
         self.PassGrade = list()
         self.EnterCntTotal = 0
+        self.PassLineID = 0
         return
 
     def GetLength(self):
@@ -23742,6 +24806,7 @@
         length += 2
         length += 1
         length += 4 * self.PassGradeCnt
+        length += 4
         length += 4
 
         return length
@@ -23756,6 +24821,7 @@
         for i in range(self.PassGradeCnt):
             data = CommFunc.WriteDWORD(data, self.PassGrade[i])
         data = CommFunc.WriteDWORD(data, self.EnterCntTotal)
+        data = CommFunc.WriteDWORD(data, self.PassLineID)
         return data
 
     def OutputString(self):
@@ -23766,7 +24832,8 @@
                                 ItemAddCnt:%d,
                                 PassGradeCnt:%d,
                                 PassGrade:%s,
-                                EnterCntTotal:%d
+                                EnterCntTotal:%d,
+                                PassLineID:%d
                                 '''\
                                 %(
                                 self.FBID,
@@ -23775,7 +24842,8 @@
                                 self.ItemAddCnt,
                                 self.PassGradeCnt,
                                 "...",
-                                self.EnterCntTotal
+                                self.EnterCntTotal,
+                                self.PassLineID
                                 )
         return DumpString
 
@@ -26193,63 +27261,48 @@
 # A3 51 寻宝功能信息 #tagMCTreasureInfo
 
 class  tagMCTreasureTypeInfo(Structure):
-    TreasureType = 0    #(BYTE TreasureType)//寻宝类型
-    LuckValue = 0    #(WORD LuckValue)//当前幸运值
-    IndexCount = 0    #(BYTE IndexCount)//索引个数
-    FreeCountTime = list()    #(vector<DWORD> FreeCountTime)// 模式对应开始计算免费次数时间time值
-    data = None
+    _pack_ = 1
+    _fields_ = [
+                  ("TreasureType", c_ubyte),    #寻宝类型
+                  ("LuckValue", c_ushort),    #当前幸运值
+                  ("TreasureCount", c_int),    #已寻宝总次数
+                  ("FreeCountToday", c_ushort),    #今日已免费寻宝次数
+                  ]
 
     def __init__(self):
         self.Clear()
         return
 
-    def ReadData(self, _lpData, _pos=0, _Len=0):
+    def ReadData(self, stringData, _pos=0, _len=0):
         self.Clear()
-        self.TreasureType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.LuckValue,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.IndexCount):
-            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
-            self.FreeCountTime.append(value)
-        return _pos
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
 
     def Clear(self):
         self.TreasureType = 0
         self.LuckValue = 0
-        self.IndexCount = 0
-        self.FreeCountTime = list()
+        self.TreasureCount = 0
+        self.FreeCountToday = 0
         return
 
     def GetLength(self):
-        length = 0
-        length += 1
-        length += 2
-        length += 1
-        length += 4 * self.IndexCount
-
-        return length
+        return sizeof(tagMCTreasureTypeInfo)
 
     def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteBYTE(data, self.TreasureType)
-        data = CommFunc.WriteWORD(data, self.LuckValue)
-        data = CommFunc.WriteBYTE(data, self.IndexCount)
-        for i in range(self.IndexCount):
-            data = CommFunc.WriteDWORD(data, self.FreeCountTime[i])
-        return data
+        return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''
+        DumpString = '''// A3 51 寻宝功能信息 //tagMCTreasureInfo:
                                 TreasureType:%d,
                                 LuckValue:%d,
-                                IndexCount:%d,
-                                FreeCountTime:%s
+                                TreasureCount:%d,
+                                FreeCountToday:%d
                                 '''\
                                 %(
                                 self.TreasureType,
                                 self.LuckValue,
-                                self.IndexCount,
-                                "..."
+                                self.TreasureCount,
+                                self.FreeCountToday
                                 )
         return DumpString
 
@@ -26325,7 +27378,8 @@
 
 class  tagMCTreasureResult(Structure):
     Head = tagHead()
-    AddTreasureScore = 0    #(WORD AddTreasureScore)// 本次寻宝增加的寻宝积分
+    AddMoneyType = 0    #(BYTE AddMoneyType)// 本次寻宝增加的积分货币类型,可能为0
+    AddMoneyValue = 0    #(WORD AddMoneyValue)// 本次寻宝增加的积分货币值,可能为0
     AddTreasureLuck = 0    #(WORD AddTreasureLuck)// 本次寻宝增加的幸运值
     TreasureResultLen = 0    #(WORD TreasureResultLen)
     TreasureResult = ""    #(String TreasureResult)//  获得物品结果[[格子编号, 物品ID,个数,是否绑定], ...]
@@ -26340,7 +27394,8 @@
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.AddTreasureScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.AddMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AddMoneyValue,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.AddTreasureLuck,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.TreasureResultLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.TreasureResult,_pos = CommFunc.ReadString(_lpData, _pos,self.TreasureResultLen)
@@ -26351,7 +27406,8 @@
         self.Head.Clear()
         self.Head.Cmd = 0xA3
         self.Head.SubCmd = 0x50
-        self.AddTreasureScore = 0
+        self.AddMoneyType = 0
+        self.AddMoneyValue = 0
         self.AddTreasureLuck = 0
         self.TreasureResultLen = 0
         self.TreasureResult = ""
@@ -26360,6 +27416,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
+        length += 1
         length += 2
         length += 2
         length += 2
@@ -26370,7 +27427,8 @@
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteWORD(data, self.AddTreasureScore)
+        data = CommFunc.WriteBYTE(data, self.AddMoneyType)
+        data = CommFunc.WriteWORD(data, self.AddMoneyValue)
         data = CommFunc.WriteWORD(data, self.AddTreasureLuck)
         data = CommFunc.WriteWORD(data, self.TreasureResultLen)
         data = CommFunc.WriteString(data, self.TreasureResultLen, self.TreasureResult)
@@ -26379,14 +27437,16 @@
     def OutputString(self):
         DumpString = '''
                                 Head:%s,
-                                AddTreasureScore:%d,
+                                AddMoneyType:%d,
+                                AddMoneyValue:%d,
                                 AddTreasureLuck:%d,
                                 TreasureResultLen:%d,
                                 TreasureResult:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
-                                self.AddTreasureScore,
+                                self.AddMoneyType,
+                                self.AddMoneyValue,
                                 self.AddTreasureLuck,
                                 self.TreasureResultLen,
                                 self.TreasureResult
@@ -29939,7 +30999,7 @@
 class  tagRefreshType(Structure):
     _pack_ = 1
     _fields_ = [
-                  ("RefreshType", c_ubyte),    
+                  ("RefreshType", c_ushort),    
                   ("Value", c_int),    
                   ("ValueEx", c_int),    
                   ]
@@ -31120,7 +32180,9 @@
 class  tagMCActBossTrialBillard(Structure):
     Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
     Count = 0    #(BYTE Count)// 奖励物品数
-    AwardItemList = list()    #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表
+    AwardItemList = list()    #(vector<tagMCActBossTrialItem> AwardItemList)// 奖励物品列表,当仙盟榜时,如果有该奖励则代表盟主奖励,否则默认均为成员奖励
+    MemCount = 0    #(BYTE MemCount)// 成员奖励物品数
+    MemAwardItemList = list()    #(vector<tagMCActBossTrialItem> MemAwardItemList)// 成员奖励物品列表,仅仙盟榜时有效
     data = None
 
     def __init__(self):
@@ -31135,12 +32197,19 @@
             temAwardItemList = tagMCActBossTrialItem()
             _pos = temAwardItemList.ReadData(_lpData, _pos)
             self.AwardItemList.append(temAwardItemList)
+        self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.MemCount):
+            temMemAwardItemList = tagMCActBossTrialItem()
+            _pos = temMemAwardItemList.ReadData(_lpData, _pos)
+            self.MemAwardItemList.append(temMemAwardItemList)
         return _pos
 
     def Clear(self):
         self.Rank = 0
         self.Count = 0
         self.AwardItemList = list()
+        self.MemCount = 0
+        self.MemAwardItemList = list()
         return
 
     def GetLength(self):
@@ -31149,6 +32218,9 @@
         length += 1
         for i in range(self.Count):
             length += self.AwardItemList[i].GetLength()
+        length += 1
+        for i in range(self.MemCount):
+            length += self.MemAwardItemList[i].GetLength()
 
         return length
 
@@ -31158,17 +32230,24 @@
         data = CommFunc.WriteBYTE(data, self.Count)
         for i in range(self.Count):
             data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.MemCount)
+        for i in range(self.MemCount):
+            data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
         return data
 
     def OutputString(self):
         DumpString = '''
                                 Rank:%d,
                                 Count:%d,
-                                AwardItemList:%s
+                                AwardItemList:%s,
+                                MemCount:%d,
+                                MemAwardItemList:%s
                                 '''\
                                 %(
                                 self.Rank,
                                 self.Count,
+                                "...",
+                                self.MemCount,
                                 "..."
                                 )
         return DumpString
@@ -31243,13 +32322,19 @@
     ActNum = 0    #(BYTE ActNum)// 活动编号
     StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
     EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
+    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
     IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
     ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
     LimitLV = 0    #(WORD LimitLV)// 限制等级
+    ShopType = 0    #(WORD ShopType)// 开放商店类型,可能为0不开放
+    SubResetType = 0    #(BYTE SubResetType)// 提交凭证奖励重置类型,0-跟随活动; 1-0点重置;2-5点重置
     SubmitCount = 0    #(BYTE SubmitCount)
     SubmitInfoList = list()    #(vector<tagMCActBossTrialSubmitInfo> SubmitInfoList)// 提交凭证信息列表
-    BillardCount = 0    #(BYTE BillardCount)
-    BillboardInfoList = list()    #(vector<tagMCActBossTrialBillard> BillboardInfoList)// 榜单信息列表
+    PersonalBillCount = 0    #(BYTE PersonalBillCount)
+    PersonalBillboardInfoList = list()    #(vector<tagMCActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
+    FamilyBillCount = 0    #(BYTE FamilyBillCount)
+    FamilyBillboardInfoList = list()    #(vector<tagMCActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
     data = None
 
     def __init__(self):
@@ -31264,19 +32349,28 @@
         self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
         self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.SubResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.SubmitCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.SubmitCount):
             temSubmitInfoList = tagMCActBossTrialSubmitInfo()
             _pos = temSubmitInfoList.ReadData(_lpData, _pos)
             self.SubmitInfoList.append(temSubmitInfoList)
-        self.BillardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.BillardCount):
-            temBillboardInfoList = tagMCActBossTrialBillard()
-            _pos = temBillboardInfoList.ReadData(_lpData, _pos)
-            self.BillboardInfoList.append(temBillboardInfoList)
+        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.PersonalBillCount):
+            temPersonalBillboardInfoList = tagMCActBossTrialBillard()
+            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+        self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.FamilyBillCount):
+            temFamilyBillboardInfoList = tagMCActBossTrialBillard()
+            _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
+            self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
         return _pos
 
     def Clear(self):
@@ -31287,13 +32381,19 @@
         self.ActNum = 0
         self.StartDate = ""
         self.EndtDate = ""
+        self.JoinStartTime = ""
+        self.JoinEndTime = ""
         self.IsDayReset = 0
         self.ResetType = 0
         self.LimitLV = 0
+        self.ShopType = 0
+        self.SubResetType = 0
         self.SubmitCount = 0
         self.SubmitInfoList = list()
-        self.BillardCount = 0
-        self.BillboardInfoList = list()
+        self.PersonalBillCount = 0
+        self.PersonalBillboardInfoList = list()
+        self.FamilyBillCount = 0
+        self.FamilyBillboardInfoList = list()
         return
 
     def GetLength(self):
@@ -31302,15 +32402,22 @@
         length += 1
         length += 10
         length += 10
+        length += 5
+        length += 5
         length += 1
         length += 1
         length += 2
+        length += 2
+        length += 1
         length += 1
         for i in range(self.SubmitCount):
             length += self.SubmitInfoList[i].GetLength()
         length += 1
-        for i in range(self.BillardCount):
-            length += self.BillboardInfoList[i].GetLength()
+        for i in range(self.PersonalBillCount):
+            length += self.PersonalBillboardInfoList[i].GetLength()
+        length += 1
+        for i in range(self.FamilyBillCount):
+            length += self.FamilyBillboardInfoList[i].GetLength()
 
         return length
 
@@ -31320,15 +32427,22 @@
         data = CommFunc.WriteBYTE(data, self.ActNum)
         data = CommFunc.WriteString(data, 10, self.StartDate)
         data = CommFunc.WriteString(data, 10, self.EndtDate)
+        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
         data = CommFunc.WriteBYTE(data, self.IsDayReset)
         data = CommFunc.WriteBYTE(data, self.ResetType)
         data = CommFunc.WriteWORD(data, self.LimitLV)
+        data = CommFunc.WriteWORD(data, self.ShopType)
+        data = CommFunc.WriteBYTE(data, self.SubResetType)
         data = CommFunc.WriteBYTE(data, self.SubmitCount)
         for i in range(self.SubmitCount):
             data = CommFunc.WriteString(data, self.SubmitInfoList[i].GetLength(), self.SubmitInfoList[i].GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.BillardCount)
-        for i in range(self.BillardCount):
-            data = CommFunc.WriteString(data, self.BillboardInfoList[i].GetLength(), self.BillboardInfoList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+        for i in range(self.PersonalBillCount):
+            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
+        for i in range(self.FamilyBillCount):
+            data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
         return data
 
     def OutputString(self):
@@ -31337,25 +32451,37 @@
                                 ActNum:%d,
                                 StartDate:%s,
                                 EndtDate:%s,
+                                JoinStartTime:%s,
+                                JoinEndTime:%s,
                                 IsDayReset:%d,
                                 ResetType:%d,
                                 LimitLV:%d,
+                                ShopType:%d,
+                                SubResetType:%d,
                                 SubmitCount:%d,
                                 SubmitInfoList:%s,
-                                BillardCount:%d,
-                                BillboardInfoList:%s
+                                PersonalBillCount:%d,
+                                PersonalBillboardInfoList:%s,
+                                FamilyBillCount:%d,
+                                FamilyBillboardInfoList:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
                                 self.ActNum,
                                 self.StartDate,
                                 self.EndtDate,
+                                self.JoinStartTime,
+                                self.JoinEndTime,
                                 self.IsDayReset,
                                 self.ResetType,
                                 self.LimitLV,
+                                self.ShopType,
+                                self.SubResetType,
                                 self.SubmitCount,
                                 "...",
-                                self.BillardCount,
+                                self.PersonalBillCount,
+                                "...",
+                                self.FamilyBillCount,
                                 "..."
                                 )
         return DumpString
@@ -31374,8 +32500,9 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("ActNum", c_ubyte),    # 活动编号
-                  ("SubmitCount", c_ushort),    # 已提交凭证个数
-                  ("SubmitCountAward", c_int),    # 提交凭证奖励领奖状态
+                  ("SubmitCount", c_int),    # 已提交凭证个数,总个数
+                  ("SubmitAwardCount", c_int),    # 已提交凭证个数,关联提交奖励的个数,领奖使用该个数判断
+                  ("SubmitAwardState", c_int),    # 提交凭证奖励领奖状态
                   ]
 
     def __init__(self):
@@ -31394,7 +32521,8 @@
         self.SubCmd = 0x68
         self.ActNum = 0
         self.SubmitCount = 0
-        self.SubmitCountAward = 0
+        self.SubmitAwardCount = 0
+        self.SubmitAwardState = 0
         return
 
     def GetLength(self):
@@ -31409,14 +32537,16 @@
                                 SubCmd:%s,
                                 ActNum:%d,
                                 SubmitCount:%d,
-                                SubmitCountAward:%d
+                                SubmitAwardCount:%d,
+                                SubmitAwardState:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.ActNum,
                                 self.SubmitCount,
-                                self.SubmitCountAward
+                                self.SubmitAwardCount,
+                                self.SubmitAwardState
                                 )
         return DumpString
 
@@ -31528,45 +32658,6 @@
         return DumpString
 
 
-class  tagMCActBuyCountCTGID(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("CTGID", c_ushort),    # 充值表ID
-                  ("Discount", c_ushort),    # 折扣力度百分比
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.CTGID = 0
-        self.Discount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCActBuyCountCTGID)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AA 74 购买次数礼包活动信息 //tagMCActBuyCountGiftInfo:
-                                CTGID:%d,
-                                Discount:%d
-                                '''\
-                                %(
-                                self.CTGID,
-                                self.Discount
-                                )
-        return DumpString
-
-
 class  tagMCActBuyCountGiftInfo(Structure):
     Head = tagHead()
     ActNum = 0    #(BYTE ActNum)// 活动编号
@@ -31576,9 +32667,10 @@
     ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
     LimitLV = 0    #(WORD LimitLV)// 限制等级
     CTGIDCount = 0    #(BYTE CTGIDCount)
-    CTGIDInfoList = list()    #(vector<tagMCActBuyCountCTGID> CTGIDInfoList)// CTGID信息列表;总购买次数前端自己统计,直接取CTGID对应的累计购买次数累加
+    CTGIDList = list()    #(vector<WORD> CTGIDList)// CTGID列表;总购买次数前端自己统计,直接取CTGID对应的累计购买次数累加
     GiftCount = 0    #(BYTE GiftCount)
     BuyCountGiftList = list()    #(vector<tagMCActBuyCountGift> BuyCountGiftList)// 购买次数礼包列表
+    ShopType = 0    #(WORD ShopType)// 开放商店类型,可能为0不开放
     data = None
 
     def __init__(self):
@@ -31598,14 +32690,14 @@
         self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.CTGIDCount):
-            temCTGIDInfoList = tagMCActBuyCountCTGID()
-            _pos = temCTGIDInfoList.ReadData(_lpData, _pos)
-            self.CTGIDInfoList.append(temCTGIDInfoList)
+            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+            self.CTGIDList.append(value)
         self.GiftCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.GiftCount):
             temBuyCountGiftList = tagMCActBuyCountGift()
             _pos = temBuyCountGiftList.ReadData(_lpData, _pos)
             self.BuyCountGiftList.append(temBuyCountGiftList)
+        self.ShopType,_pos = CommFunc.ReadWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -31620,9 +32712,10 @@
         self.ResetType = 0
         self.LimitLV = 0
         self.CTGIDCount = 0
-        self.CTGIDInfoList = list()
+        self.CTGIDList = list()
         self.GiftCount = 0
         self.BuyCountGiftList = list()
+        self.ShopType = 0
         return
 
     def GetLength(self):
@@ -31635,11 +32728,11 @@
         length += 1
         length += 2
         length += 1
-        for i in range(self.CTGIDCount):
-            length += self.CTGIDInfoList[i].GetLength()
+        length += 2 * self.CTGIDCount
         length += 1
         for i in range(self.GiftCount):
             length += self.BuyCountGiftList[i].GetLength()
+        length += 2
 
         return length
 
@@ -31654,10 +32747,11 @@
         data = CommFunc.WriteWORD(data, self.LimitLV)
         data = CommFunc.WriteBYTE(data, self.CTGIDCount)
         for i in range(self.CTGIDCount):
-            data = CommFunc.WriteString(data, self.CTGIDInfoList[i].GetLength(), self.CTGIDInfoList[i].GetBuffer())
+            data = CommFunc.WriteWORD(data, self.CTGIDList[i])
         data = CommFunc.WriteBYTE(data, self.GiftCount)
         for i in range(self.GiftCount):
             data = CommFunc.WriteString(data, self.BuyCountGiftList[i].GetLength(), self.BuyCountGiftList[i].GetBuffer())
+        data = CommFunc.WriteWORD(data, self.ShopType)
         return data
 
     def OutputString(self):
@@ -31670,9 +32764,10 @@
                                 ResetType:%d,
                                 LimitLV:%d,
                                 CTGIDCount:%d,
-                                CTGIDInfoList:%s,
+                                CTGIDList:%s,
                                 GiftCount:%d,
-                                BuyCountGiftList:%s
+                                BuyCountGiftList:%s,
+                                ShopType:%d
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -31685,7 +32780,8 @@
                                 self.CTGIDCount,
                                 "...",
                                 self.GiftCount,
-                                "..."
+                                "...",
+                                self.ShopType
                                 )
         return DumpString
 
@@ -32437,6 +33533,273 @@
 
 m_NAtagMCActCollectWordsPlayerInfo=tagMCActCollectWordsPlayerInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActCollectWordsPlayerInfo.Head.Cmd,m_NAtagMCActCollectWordsPlayerInfo.Head.SubCmd))] = m_NAtagMCActCollectWordsPlayerInfo
+
+
+#------------------------------------------------------
+# AA 77 仙盟充值互助活动信息 #tagMCActFamilyCTGAssistInfo
+
+class  tagMCActFamilyCTGAssistItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("ItemCount", c_ushort),    
+                  ("IsBind", c_ubyte),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.ItemCount = 0
+        self.IsBind = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCActFamilyCTGAssistItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 77 仙盟充值互助活动信息 //tagMCActFamilyCTGAssistInfo:
+                                ItemID:%d,
+                                ItemCount:%d,
+                                IsBind:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.ItemCount,
+                                self.IsBind
+                                )
+        return DumpString
+
+
+class  tagMCActFamilyCTGAssistAward(Structure):
+    NeedCTGPlayers = 0    #(BYTE NeedCTGPlayers)//所需充值人数
+    RecordIndex = 0    #(BYTE RecordIndex)//对应领奖记录索引
+    Count = 0    #(BYTE Count)
+    AwardItemList = list()    #(vector<tagMCActFamilyCTGAssistItem> AwardItemList)// 奖励物品列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.NeedCTGPlayers,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.RecordIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temAwardItemList = tagMCActFamilyCTGAssistItem()
+            _pos = temAwardItemList.ReadData(_lpData, _pos)
+            self.AwardItemList.append(temAwardItemList)
+        return _pos
+
+    def Clear(self):
+        self.NeedCTGPlayers = 0
+        self.RecordIndex = 0
+        self.Count = 0
+        self.AwardItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 1
+        length += 1
+        length += 1
+        for i in range(self.Count):
+            length += self.AwardItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteBYTE(data, self.NeedCTGPlayers)
+        data = CommFunc.WriteBYTE(data, self.RecordIndex)
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                NeedCTGPlayers:%d,
+                                RecordIndex:%d,
+                                Count:%d,
+                                AwardItemList:%s
+                                '''\
+                                %(
+                                self.NeedCTGPlayers,
+                                self.RecordIndex,
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+class  tagMCActFamilyCTGAssistInfo(Structure):
+    Head = tagHead()
+    ActNum = 0    #(BYTE ActNum)//活动编号
+    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
+    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
+    IsDayReset = 0    #(BYTE IsDayReset)//是否每天重置
+    LimitLV = 0    #(WORD LimitLV)// 限制等级
+    AwardCount = 0    #(BYTE AwardCount)
+    AwardInfoList = list()    #(vector<tagMCActFamilyCTGAssistAward> AwardInfoList)// 互助奖励列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x77
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.AwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.AwardCount):
+            temAwardInfoList = tagMCActFamilyCTGAssistAward()
+            _pos = temAwardInfoList.ReadData(_lpData, _pos)
+            self.AwardInfoList.append(temAwardInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x77
+        self.ActNum = 0
+        self.StartDate = ""
+        self.EndtDate = ""
+        self.IsDayReset = 0
+        self.LimitLV = 0
+        self.AwardCount = 0
+        self.AwardInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 10
+        length += 10
+        length += 1
+        length += 2
+        length += 1
+        for i in range(self.AwardCount):
+            length += self.AwardInfoList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ActNum)
+        data = CommFunc.WriteString(data, 10, self.StartDate)
+        data = CommFunc.WriteString(data, 10, self.EndtDate)
+        data = CommFunc.WriteBYTE(data, self.IsDayReset)
+        data = CommFunc.WriteWORD(data, self.LimitLV)
+        data = CommFunc.WriteBYTE(data, self.AwardCount)
+        for i in range(self.AwardCount):
+            data = CommFunc.WriteString(data, self.AwardInfoList[i].GetLength(), self.AwardInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                ActNum:%d,
+                                StartDate:%s,
+                                EndtDate:%s,
+                                IsDayReset:%d,
+                                LimitLV:%d,
+                                AwardCount:%d,
+                                AwardInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.ActNum,
+                                self.StartDate,
+                                self.EndtDate,
+                                self.IsDayReset,
+                                self.LimitLV,
+                                self.AwardCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCActFamilyCTGAssistInfo=tagMCActFamilyCTGAssistInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActFamilyCTGAssistInfo.Head.Cmd,m_NAtagMCActFamilyCTGAssistInfo.Head.SubCmd))] = m_NAtagMCActFamilyCTGAssistInfo
+
+
+#------------------------------------------------------
+# AA 78 仙盟充值互助活动玩家信息 #tagMCActFamilyCTGAssistPlayerInfo
+
+class  tagMCActFamilyCTGAssistPlayerInfo(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("ActNum", c_ubyte),    # 活动编号
+                  ("AwardRecord", c_int),    # 奖励记录,按奖励记录索引位运算判断是否已领取
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xAA
+        self.SubCmd = 0x78
+        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 = 0x78
+        self.ActNum = 0
+        self.AwardRecord = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCActFamilyCTGAssistPlayerInfo)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 78 仙盟充值互助活动玩家信息 //tagMCActFamilyCTGAssistPlayerInfo:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                ActNum:%d,
+                                AwardRecord:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.ActNum,
+                                self.AwardRecord
+                                )
+        return DumpString
+
+
+m_NAtagMCActFamilyCTGAssistPlayerInfo=tagMCActFamilyCTGAssistPlayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActFamilyCTGAssistPlayerInfo.Cmd,m_NAtagMCActFamilyCTGAssistPlayerInfo.SubCmd))] = m_NAtagMCActFamilyCTGAssistPlayerInfo
 
 
 #------------------------------------------------------
@@ -36996,6 +38359,7 @@
                   ("ItemCount", c_ushort),    
                   ("PosNum", c_ubyte),    # 被抽中时的位置编号,1~99,前端自定义展示位置编号,0代表未被抽中;
                   ("TotalTimesNow", c_ubyte),    #当前已产出次数,不限制次数时不记录,即同样为0
+                  ("LotteryScore", c_int),    #当前抽奖积分
                   ]
 
     def __init__(self):
@@ -37018,6 +38382,7 @@
         self.ItemCount = 0
         self.PosNum = 0
         self.TotalTimesNow = 0
+        self.LotteryScore = 0
         return
 
     def GetLength(self):
@@ -37035,7 +38400,8 @@
                                 ItemID:%d,
                                 ItemCount:%d,
                                 PosNum:%d,
-                                TotalTimesNow:%d
+                                TotalTimesNow:%d,
+                                LotteryScore:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -37045,7 +38411,8 @@
                                 self.ItemID,
                                 self.ItemCount,
                                 self.PosNum,
-                                self.TotalTimesNow
+                                self.TotalTimesNow,
+                                self.LotteryScore
                                 )
         return DumpString
 
@@ -37057,7 +38424,260 @@
 #------------------------------------------------------
 # AA 58 仙匣秘境活动信息 #tagMCActXianXiaMJInfo
 
-class  tagMCActXianXiaMJAwardItem(Structure):
+class  tagMCActXianXiaMJItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("ItemCount", c_ushort),    
+                  ("IsBind", c_ubyte),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.ItemCount = 0
+        self.IsBind = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCActXianXiaMJItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 58 仙匣秘境活动信息 //tagMCActXianXiaMJInfo:
+                                ItemID:%d,
+                                ItemCount:%d,
+                                IsBind:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.ItemCount,
+                                self.IsBind
+                                )
+        return DumpString
+
+
+class  tagMCActXianXiaMJBillard(Structure):
+    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
+    Count = 0    #(BYTE Count)// 奖励物品数
+    AwardItemList = list()    #(vector<tagMCActXianXiaMJItem> AwardItemList)// 奖励物品列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temAwardItemList = tagMCActXianXiaMJItem()
+            _pos = temAwardItemList.ReadData(_lpData, _pos)
+            self.AwardItemList.append(temAwardItemList)
+        return _pos
+
+    def Clear(self):
+        self.Rank = 0
+        self.Count = 0
+        self.AwardItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 1
+        for i in range(self.Count):
+            length += self.AwardItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.Rank)
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Rank:%d,
+                                Count:%d,
+                                AwardItemList:%s
+                                '''\
+                                %(
+                                self.Rank,
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+class  tagMCActXianXiaMJInfo(Structure):
+    Head = tagHead()
+    ActNum = 0    #(BYTE ActNum)// 活动编号
+    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
+    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
+    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
+    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
+    LimitLV = 0    #(WORD LimitLV)// 限制等级
+    UseItemID = 0    #(DWORD UseItemID)//消耗物品ID,默认1个;消耗物品或货币二选一即可,或都配则先消耗道具,不足则消耗货币
+    MoneyType = 0    #(BYTE MoneyType)//消耗货币类型
+    MoneyValue = 0    #(WORD MoneyValue)//消耗货币值
+    LotteryAddScore = 0    #(WORD LotteryAddScore)//每次抽奖加积分
+    LayerAddScore = 0    #(WORD LayerAddScore)//每次跨层加积分
+    PersonalBillCount = 0    #(BYTE PersonalBillCount)
+    PersonalBillboardInfoList = list()    #(vector<tagMCActXianXiaMJBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x58
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.UseItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.MoneyValue,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.LotteryAddScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.LayerAddScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.PersonalBillCount):
+            temPersonalBillboardInfoList = tagMCActXianXiaMJBillard()
+            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x58
+        self.ActNum = 0
+        self.StartDate = ""
+        self.EndtDate = ""
+        self.JoinStartTime = ""
+        self.JoinEndTime = ""
+        self.IsDayReset = 0
+        self.LimitLV = 0
+        self.UseItemID = 0
+        self.MoneyType = 0
+        self.MoneyValue = 0
+        self.LotteryAddScore = 0
+        self.LayerAddScore = 0
+        self.PersonalBillCount = 0
+        self.PersonalBillboardInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 10
+        length += 10
+        length += 5
+        length += 5
+        length += 1
+        length += 2
+        length += 4
+        length += 1
+        length += 2
+        length += 2
+        length += 2
+        length += 1
+        for i in range(self.PersonalBillCount):
+            length += self.PersonalBillboardInfoList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ActNum)
+        data = CommFunc.WriteString(data, 10, self.StartDate)
+        data = CommFunc.WriteString(data, 10, self.EndtDate)
+        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
+        data = CommFunc.WriteBYTE(data, self.IsDayReset)
+        data = CommFunc.WriteWORD(data, self.LimitLV)
+        data = CommFunc.WriteDWORD(data, self.UseItemID)
+        data = CommFunc.WriteBYTE(data, self.MoneyType)
+        data = CommFunc.WriteWORD(data, self.MoneyValue)
+        data = CommFunc.WriteWORD(data, self.LotteryAddScore)
+        data = CommFunc.WriteWORD(data, self.LayerAddScore)
+        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+        for i in range(self.PersonalBillCount):
+            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                ActNum:%d,
+                                StartDate:%s,
+                                EndtDate:%s,
+                                JoinStartTime:%s,
+                                JoinEndTime:%s,
+                                IsDayReset:%d,
+                                LimitLV:%d,
+                                UseItemID:%d,
+                                MoneyType:%d,
+                                MoneyValue:%d,
+                                LotteryAddScore:%d,
+                                LayerAddScore:%d,
+                                PersonalBillCount:%d,
+                                PersonalBillboardInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.ActNum,
+                                self.StartDate,
+                                self.EndtDate,
+                                self.JoinStartTime,
+                                self.JoinEndTime,
+                                self.IsDayReset,
+                                self.LimitLV,
+                                self.UseItemID,
+                                self.MoneyType,
+                                self.MoneyValue,
+                                self.LotteryAddScore,
+                                self.LayerAddScore,
+                                self.PersonalBillCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCActXianXiaMJInfo=tagMCActXianXiaMJInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJInfo.Head.Cmd,m_NAtagMCActXianXiaMJInfo.Head.SubCmd))] = m_NAtagMCActXianXiaMJInfo
+
+
+#------------------------------------------------------
+# AA 79 仙匣秘境层信息 #tagMCActXianXiaMJLayerInfo
+
+class  tagMCActXianXiaMJLayerItem(Structure):
     _pack_ = 1
     _fields_ = [
                   ("ItemLibType", c_ubyte),    #物品库类型;9-固定为大奖库,非9-策划自定义库
@@ -37089,13 +38709,13 @@
         return
 
     def GetLength(self):
-        return sizeof(tagMCActXianXiaMJAwardItem)
+        return sizeof(tagMCActXianXiaMJLayerItem)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// AA 58 仙匣秘境活动信息 //tagMCActXianXiaMJInfo:
+        DumpString = '''// AA 79 仙匣秘境层信息 //tagMCActXianXiaMJLayerInfo:
                                 ItemLibType:%d,
                                 ItemID:%d,
                                 ItemCount:%d,
@@ -37116,48 +38736,38 @@
         return DumpString
 
 
-class  tagMCActXianXiaMJInfo(Structure):
+class  tagMCActXianXiaMJLayerInfo(Structure):
     Head = tagHead()
     ActNum = 0    #(BYTE ActNum)// 活动编号
-    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
-    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
-    LimitLV = 0    #(WORD LimitLV)// 限制等级
-    ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点开,5点重置;2-5点开,0点重置
-    MoneyType = 0    #(BYTE MoneyType)//消耗货币类型
-    MoneyValue = 0    #(WORD MoneyValue)//消耗货币值
-    LayerNum = 0    #(BYTE LayerNum)//当前奖池第几层
+    LayerNum = 0    #(WORD LayerNum)//当前奖池第几层
+    LotteryScore = 0    #(DWORD LotteryScore)//当前抽奖积分
     AwardItemCount = 0    #(BYTE AwardItemCount)
-    AwardItemList = list()    #(vector<tagMCActXianXiaMJAwardItem> AwardItemList)// 奖池物品列表,已生成的,包含已选择的大奖物品
+    AwardItemList = list()    #(vector<tagMCActXianXiaMJLayerItem> AwardItemList)// 奖池物品列表,已生成的,包含已选择的大奖物品
     SuperItemCount = 0    #(BYTE SuperItemCount)
-    SuperItemList = list()    #(vector<tagMCActXianXiaMJAwardItem> SuperItemList)// 大奖物品待选择库,由玩家从库中选择放入奖池的物品;
+    SuperItemList = list()    #(vector<tagMCActXianXiaMJLayerItem> SuperItemList)// 大奖物品待选择库,由玩家从库中选择放入奖池的物品;
     SuperItemCanChooseCount = 0    #(BYTE SuperItemCanChooseCount)// 大奖物品可选择个数
     data = None
 
     def __init__(self):
         self.Clear()
         self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x58
+        self.Head.SubCmd = 0x79
         return
 
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
         self.ActNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
-        self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.MoneyValue,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.LayerNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.LayerNum,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.LotteryScore,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.AwardItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.AwardItemCount):
-            temAwardItemList = tagMCActXianXiaMJAwardItem()
+            temAwardItemList = tagMCActXianXiaMJLayerItem()
             _pos = temAwardItemList.ReadData(_lpData, _pos)
             self.AwardItemList.append(temAwardItemList)
         self.SuperItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.SuperItemCount):
-            temSuperItemList = tagMCActXianXiaMJAwardItem()
+            temSuperItemList = tagMCActXianXiaMJLayerItem()
             _pos = temSuperItemList.ReadData(_lpData, _pos)
             self.SuperItemList.append(temSuperItemList)
         self.SuperItemCanChooseCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
@@ -37167,15 +38777,10 @@
         self.Head = tagHead()
         self.Head.Clear()
         self.Head.Cmd = 0xAA
-        self.Head.SubCmd = 0x58
+        self.Head.SubCmd = 0x79
         self.ActNum = 0
-        self.StartDate = ""
-        self.EndtDate = ""
-        self.LimitLV = 0
-        self.ResetType = 0
-        self.MoneyType = 0
-        self.MoneyValue = 0
         self.LayerNum = 0
+        self.LotteryScore = 0
         self.AwardItemCount = 0
         self.AwardItemList = list()
         self.SuperItemCount = 0
@@ -37187,13 +38792,8 @@
         length = 0
         length += self.Head.GetLength()
         length += 1
-        length += 10
-        length += 10
         length += 2
-        length += 1
-        length += 1
-        length += 2
-        length += 1
+        length += 4
         length += 1
         for i in range(self.AwardItemCount):
             length += self.AwardItemList[i].GetLength()
@@ -37208,13 +38808,8 @@
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
         data = CommFunc.WriteBYTE(data, self.ActNum)
-        data = CommFunc.WriteString(data, 10, self.StartDate)
-        data = CommFunc.WriteString(data, 10, self.EndtDate)
-        data = CommFunc.WriteWORD(data, self.LimitLV)
-        data = CommFunc.WriteBYTE(data, self.ResetType)
-        data = CommFunc.WriteBYTE(data, self.MoneyType)
-        data = CommFunc.WriteWORD(data, self.MoneyValue)
-        data = CommFunc.WriteBYTE(data, self.LayerNum)
+        data = CommFunc.WriteWORD(data, self.LayerNum)
+        data = CommFunc.WriteDWORD(data, self.LotteryScore)
         data = CommFunc.WriteBYTE(data, self.AwardItemCount)
         for i in range(self.AwardItemCount):
             data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
@@ -37228,13 +38823,8 @@
         DumpString = '''
                                 Head:%s,
                                 ActNum:%d,
-                                StartDate:%s,
-                                EndtDate:%s,
-                                LimitLV:%d,
-                                ResetType:%d,
-                                MoneyType:%d,
-                                MoneyValue:%d,
                                 LayerNum:%d,
+                                LotteryScore:%d,
                                 AwardItemCount:%d,
                                 AwardItemList:%s,
                                 SuperItemCount:%d,
@@ -37244,13 +38834,8 @@
                                 %(
                                 self.Head.OutputString(),
                                 self.ActNum,
-                                self.StartDate,
-                                self.EndtDate,
-                                self.LimitLV,
-                                self.ResetType,
-                                self.MoneyType,
-                                self.MoneyValue,
                                 self.LayerNum,
+                                self.LotteryScore,
                                 self.AwardItemCount,
                                 "...",
                                 self.SuperItemCount,
@@ -37260,8 +38845,8 @@
         return DumpString
 
 
-m_NAtagMCActXianXiaMJInfo=tagMCActXianXiaMJInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJInfo.Head.Cmd,m_NAtagMCActXianXiaMJInfo.Head.SubCmd))] = m_NAtagMCActXianXiaMJInfo
+m_NAtagMCActXianXiaMJLayerInfo=tagMCActXianXiaMJLayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCActXianXiaMJLayerInfo.Head.Cmd,m_NAtagMCActXianXiaMJLayerInfo.Head.SubCmd))] = m_NAtagMCActXianXiaMJLayerInfo
 
 
 #------------------------------------------------------
@@ -38185,6 +39770,522 @@
 
 
 #------------------------------------------------------
+# AA 76 Boss历练跨服活动信息 #tagMCCrossActBossTrialInfo
+
+class  tagMCCrossActBossTrialItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("ItemCount", c_ushort),    
+                  ("IsBind", c_ubyte),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.ItemCount = 0
+        self.IsBind = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCCrossActBossTrialItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 76 Boss历练跨服活动信息 //tagMCCrossActBossTrialInfo:
+                                ItemID:%d,
+                                ItemCount:%d,
+                                IsBind:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.ItemCount,
+                                self.IsBind
+                                )
+        return DumpString
+
+
+class  tagMCCrossActBossTrialBillard(Structure):
+    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
+    Count = 0    #(BYTE Count)// 奖励物品数
+    AwardItemList = list()    #(vector<tagMCCrossActBossTrialItem> AwardItemList)// 奖励物品列表,当仙盟榜时,如果有该奖励则代表盟主奖励,否则默认均为成员奖励
+    MemCount = 0    #(BYTE MemCount)// 成员奖励物品数
+    MemAwardItemList = list()    #(vector<tagMCCrossActBossTrialItem> MemAwardItemList)// 成员奖励物品列表,仅仙盟榜时有效
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temAwardItemList = tagMCCrossActBossTrialItem()
+            _pos = temAwardItemList.ReadData(_lpData, _pos)
+            self.AwardItemList.append(temAwardItemList)
+        self.MemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.MemCount):
+            temMemAwardItemList = tagMCCrossActBossTrialItem()
+            _pos = temMemAwardItemList.ReadData(_lpData, _pos)
+            self.MemAwardItemList.append(temMemAwardItemList)
+        return _pos
+
+    def Clear(self):
+        self.Rank = 0
+        self.Count = 0
+        self.AwardItemList = list()
+        self.MemCount = 0
+        self.MemAwardItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 1
+        for i in range(self.Count):
+            length += self.AwardItemList[i].GetLength()
+        length += 1
+        for i in range(self.MemCount):
+            length += self.MemAwardItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.Rank)
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.MemCount)
+        for i in range(self.MemCount):
+            data = CommFunc.WriteString(data, self.MemAwardItemList[i].GetLength(), self.MemAwardItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Rank:%d,
+                                Count:%d,
+                                AwardItemList:%s,
+                                MemCount:%d,
+                                MemAwardItemList:%s
+                                '''\
+                                %(
+                                self.Rank,
+                                self.Count,
+                                "...",
+                                self.MemCount,
+                                "..."
+                                )
+        return DumpString
+
+
+class  tagMCCrossActBossTrialInfo(Structure):
+    Head = tagHead()
+    ServerInfoLen = 0    #(BYTE ServerInfoLen)
+    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
+    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
+    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
+    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
+    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
+    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
+    ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
+    RankLimitPersonal = 0    #(WORD RankLimitPersonal)// 个人榜上榜个数保底限制;
+    RankLimitFamily = 0    #(WORD RankLimitFamily)// 仙盟榜上榜个数保底限制;
+    PersonalBillCount = 0    #(BYTE PersonalBillCount)
+    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActBossTrialBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
+    FamilyBillCount = 0    #(BYTE FamilyBillCount)
+    FamilyBillboardInfoList = list()    #(vector<tagMCCrossActBossTrialBillard> FamilyBillboardInfoList)// 仙盟榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x76
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
+        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.ResetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.RankLimitPersonal,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.RankLimitFamily,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.PersonalBillCount):
+            temPersonalBillboardInfoList = tagMCCrossActBossTrialBillard()
+            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+        self.FamilyBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.FamilyBillCount):
+            temFamilyBillboardInfoList = tagMCCrossActBossTrialBillard()
+            _pos = temFamilyBillboardInfoList.ReadData(_lpData, _pos)
+            self.FamilyBillboardInfoList.append(temFamilyBillboardInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x76
+        self.ServerInfoLen = 0
+        self.ServerIDRangeInfo = ""
+        self.GroupValue1 = 0
+        self.StartDate = ""
+        self.EndtDate = ""
+        self.JoinStartTime = ""
+        self.JoinEndTime = ""
+        self.IsDayReset = 0
+        self.ResetType = 0
+        self.RankLimitPersonal = 0
+        self.RankLimitFamily = 0
+        self.PersonalBillCount = 0
+        self.PersonalBillboardInfoList = list()
+        self.FamilyBillCount = 0
+        self.FamilyBillboardInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += len(self.ServerIDRangeInfo)
+        length += 1
+        length += 10
+        length += 10
+        length += 5
+        length += 5
+        length += 1
+        length += 1
+        length += 2
+        length += 2
+        length += 1
+        for i in range(self.PersonalBillCount):
+            length += self.PersonalBillboardInfoList[i].GetLength()
+        length += 1
+        for i in range(self.FamilyBillCount):
+            length += self.FamilyBillboardInfoList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
+        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
+        data = CommFunc.WriteBYTE(data, self.GroupValue1)
+        data = CommFunc.WriteString(data, 10, self.StartDate)
+        data = CommFunc.WriteString(data, 10, self.EndtDate)
+        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
+        data = CommFunc.WriteBYTE(data, self.IsDayReset)
+        data = CommFunc.WriteBYTE(data, self.ResetType)
+        data = CommFunc.WriteWORD(data, self.RankLimitPersonal)
+        data = CommFunc.WriteWORD(data, self.RankLimitFamily)
+        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+        for i in range(self.PersonalBillCount):
+            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.FamilyBillCount)
+        for i in range(self.FamilyBillCount):
+            data = CommFunc.WriteString(data, self.FamilyBillboardInfoList[i].GetLength(), self.FamilyBillboardInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                ServerInfoLen:%d,
+                                ServerIDRangeInfo:%s,
+                                GroupValue1:%d,
+                                StartDate:%s,
+                                EndtDate:%s,
+                                JoinStartTime:%s,
+                                JoinEndTime:%s,
+                                IsDayReset:%d,
+                                ResetType:%d,
+                                RankLimitPersonal:%d,
+                                RankLimitFamily:%d,
+                                PersonalBillCount:%d,
+                                PersonalBillboardInfoList:%s,
+                                FamilyBillCount:%d,
+                                FamilyBillboardInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.ServerInfoLen,
+                                self.ServerIDRangeInfo,
+                                self.GroupValue1,
+                                self.StartDate,
+                                self.EndtDate,
+                                self.JoinStartTime,
+                                self.JoinEndTime,
+                                self.IsDayReset,
+                                self.ResetType,
+                                self.RankLimitPersonal,
+                                self.RankLimitFamily,
+                                self.PersonalBillCount,
+                                "...",
+                                self.FamilyBillCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCCrossActBossTrialInfo=tagMCCrossActBossTrialInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActBossTrialInfo.Head.Cmd,m_NAtagMCCrossActBossTrialInfo.Head.SubCmd))] = m_NAtagMCCrossActBossTrialInfo
+
+
+#------------------------------------------------------
+# AA 80 仙匣秘境跨服活动信息 #tagMCCrossActXianXiaMJInfo
+
+class  tagMCCrossActXianXiaMJItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("ItemCount", c_ushort),    
+                  ("IsBind", c_ubyte),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.ItemCount = 0
+        self.IsBind = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCCrossActXianXiaMJItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 80 仙匣秘境跨服活动信息 //tagMCCrossActXianXiaMJInfo:
+                                ItemID:%d,
+                                ItemCount:%d,
+                                IsBind:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.ItemCount,
+                                self.IsBind
+                                )
+        return DumpString
+
+
+class  tagMCCrossActXianXiaMJBillard(Structure):
+    Rank = 0    #(DWORD Rank)// 名次,1-代表第一名;支持夸段,如1,3 代表第1名,第2~3名
+    Count = 0    #(BYTE Count)// 奖励物品数
+    AwardItemList = list()    #(vector<tagMCCrossActXianXiaMJItem> AwardItemList)// 奖励物品列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        self.Rank,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.Count):
+            temAwardItemList = tagMCCrossActXianXiaMJItem()
+            _pos = temAwardItemList.ReadData(_lpData, _pos)
+            self.AwardItemList.append(temAwardItemList)
+        return _pos
+
+    def Clear(self):
+        self.Rank = 0
+        self.Count = 0
+        self.AwardItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += 4
+        length += 1
+        for i in range(self.Count):
+            length += self.AwardItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteDWORD(data, self.Rank)
+        data = CommFunc.WriteBYTE(data, self.Count)
+        for i in range(self.Count):
+            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Rank:%d,
+                                Count:%d,
+                                AwardItemList:%s
+                                '''\
+                                %(
+                                self.Rank,
+                                self.Count,
+                                "..."
+                                )
+        return DumpString
+
+
+class  tagMCCrossActXianXiaMJInfo(Structure):
+    Head = tagHead()
+    ServerInfoLen = 0    #(BYTE ServerInfoLen)
+    ServerIDRangeInfo = ""    #(String ServerIDRangeInfo)//开放该活动的服务器ID范围列表,json格式 [[IDA, IDB], ...], [] 为全服
+    GroupValue1 = 0    #(BYTE GroupValue1)// 活动榜单分组值1,用于查询对应榜单
+    StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
+    EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
+    JoinStartTime = ""    #(char JoinStartTime[5])// 参与开始时间点 mm:ss
+    JoinEndTime = ""    #(char JoinEndTime[5])// 参与结束时间点 mm:ss
+    IsDayReset = 0    #(BYTE IsDayReset)// 是否每天重置
+    RankLimitPersonal = 0    #(WORD RankLimitPersonal)// 个人榜上榜积分保底限制;
+    PersonalBillCount = 0    #(BYTE PersonalBillCount)
+    PersonalBillboardInfoList = list()    #(vector<tagMCCrossActXianXiaMJBillard> PersonalBillboardInfoList)// 个人榜单奖励信息列表,如果没有代表本次活动没有该榜奖励
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x80
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.ServerInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.ServerIDRangeInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.ServerInfoLen)
+        self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+        self.JoinStartTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.JoinEndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+        self.IsDayReset,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.RankLimitPersonal,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.PersonalBillCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.PersonalBillCount):
+            temPersonalBillboardInfoList = tagMCCrossActXianXiaMJBillard()
+            _pos = temPersonalBillboardInfoList.ReadData(_lpData, _pos)
+            self.PersonalBillboardInfoList.append(temPersonalBillboardInfoList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xAA
+        self.Head.SubCmd = 0x80
+        self.ServerInfoLen = 0
+        self.ServerIDRangeInfo = ""
+        self.GroupValue1 = 0
+        self.StartDate = ""
+        self.EndtDate = ""
+        self.JoinStartTime = ""
+        self.JoinEndTime = ""
+        self.IsDayReset = 0
+        self.RankLimitPersonal = 0
+        self.PersonalBillCount = 0
+        self.PersonalBillboardInfoList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += len(self.ServerIDRangeInfo)
+        length += 1
+        length += 10
+        length += 10
+        length += 5
+        length += 5
+        length += 1
+        length += 2
+        length += 1
+        for i in range(self.PersonalBillCount):
+            length += self.PersonalBillboardInfoList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ServerInfoLen)
+        data = CommFunc.WriteString(data, self.ServerInfoLen, self.ServerIDRangeInfo)
+        data = CommFunc.WriteBYTE(data, self.GroupValue1)
+        data = CommFunc.WriteString(data, 10, self.StartDate)
+        data = CommFunc.WriteString(data, 10, self.EndtDate)
+        data = CommFunc.WriteString(data, 5, self.JoinStartTime)
+        data = CommFunc.WriteString(data, 5, self.JoinEndTime)
+        data = CommFunc.WriteBYTE(data, self.IsDayReset)
+        data = CommFunc.WriteWORD(data, self.RankLimitPersonal)
+        data = CommFunc.WriteBYTE(data, self.PersonalBillCount)
+        for i in range(self.PersonalBillCount):
+            data = CommFunc.WriteString(data, self.PersonalBillboardInfoList[i].GetLength(), self.PersonalBillboardInfoList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                ServerInfoLen:%d,
+                                ServerIDRangeInfo:%s,
+                                GroupValue1:%d,
+                                StartDate:%s,
+                                EndtDate:%s,
+                                JoinStartTime:%s,
+                                JoinEndTime:%s,
+                                IsDayReset:%d,
+                                RankLimitPersonal:%d,
+                                PersonalBillCount:%d,
+                                PersonalBillboardInfoList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.ServerInfoLen,
+                                self.ServerIDRangeInfo,
+                                self.GroupValue1,
+                                self.StartDate,
+                                self.EndtDate,
+                                self.JoinStartTime,
+                                self.JoinEndTime,
+                                self.IsDayReset,
+                                self.RankLimitPersonal,
+                                self.PersonalBillCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCCrossActXianXiaMJInfo=tagMCCrossActXianXiaMJInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossActXianXiaMJInfo.Head.Cmd,m_NAtagMCCrossActXianXiaMJInfo.Head.SubCmd))] = m_NAtagMCCrossActXianXiaMJInfo
+
+
+#------------------------------------------------------
 # AA 25 每日礼包活动信息 #tagMCDailyGiftbagInfo
 
 class  tagMCDailyGiftbagItem(Structure):
@@ -38234,6 +40335,7 @@
     RMB = 0    #(DWORD RMB)//所需RMB,元
     GiftItemCount = 0    #(BYTE GiftItemCount)// 礼包物品数
     ItemInfo = list()    #(vector<tagMCDailyGiftbagItem> ItemInfo)// 物品信息
+    Discount = 0    #(WORD Discount)// 折扣力度百分比
     data = None
 
     def __init__(self):
@@ -38252,6 +40354,7 @@
             temItemInfo = tagMCDailyGiftbagItem()
             _pos = temItemInfo.ReadData(_lpData, _pos)
             self.ItemInfo.append(temItemInfo)
+        self.Discount,_pos = CommFunc.ReadWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -38262,6 +40365,7 @@
         self.RMB = 0
         self.GiftItemCount = 0
         self.ItemInfo = list()
+        self.Discount = 0
         return
 
     def GetLength(self):
@@ -38274,6 +40378,7 @@
         length += 1
         for i in range(self.GiftItemCount):
             length += self.ItemInfo[i].GetLength()
+        length += 2
 
         return length
 
@@ -38287,6 +40392,7 @@
         data = CommFunc.WriteBYTE(data, self.GiftItemCount)
         for i in range(self.GiftItemCount):
             data = CommFunc.WriteString(data, self.ItemInfo[i].GetLength(), self.ItemInfo[i].GetBuffer())
+        data = CommFunc.WriteWORD(data, self.Discount)
         return data
 
     def OutputString(self):
@@ -38297,7 +40403,8 @@
                                 BuyCountLimit:%d,
                                 RMB:%d,
                                 GiftItemCount:%d,
-                                ItemInfo:%s
+                                ItemInfo:%s,
+                                Discount:%d
                                 '''\
                                 %(
                                 self.GiftID,
@@ -38306,7 +40413,8 @@
                                 self.BuyCountLimit,
                                 self.RMB,
                                 self.GiftItemCount,
-                                "..."
+                                "...",
+                                self.Discount
                                 )
         return DumpString
 
@@ -44440,6 +46548,7 @@
     TreasureState = list()    #(vector<BYTE> TreasureState)// 聚宝盆是否已激活列表,[类型0是否已激活, ...]
     TreasureAward = list()    #(vector<BYTE> TreasureAward)// 聚宝盆奖励是否已领取列表,[类型0是否已领取, ...]
     TreasureProgress = list()    #(vector<BYTE> TreasureProgress)// 聚宝盆进度值列表,[类型0进度值, ...],满进度100
+    HelpAwardCount = 0    #(BYTE HelpAwardCount)// 今日已帮助别人奖励次数
     data = None
 
     def __init__(self):
@@ -44465,6 +46574,7 @@
         for i in range(self.TreasureCount):
             value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
             self.TreasureProgress.append(value)
+        self.HelpAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -44480,6 +46590,7 @@
         self.TreasureState = list()
         self.TreasureAward = list()
         self.TreasureProgress = list()
+        self.HelpAwardCount = 0
         return
 
     def GetLength(self):
@@ -44493,6 +46604,7 @@
         length += 1 * self.TreasureCount
         length += 1 * self.TreasureCount
         length += 1 * self.TreasureCount
+        length += 1
 
         return length
 
@@ -44510,6 +46622,7 @@
             data = CommFunc.WriteBYTE(data, self.TreasureAward[i])
         for i in range(self.TreasureCount):
             data = CommFunc.WriteBYTE(data, self.TreasureProgress[i])
+        data = CommFunc.WriteBYTE(data, self.HelpAwardCount)
         return data
 
     def OutputString(self):
@@ -44522,7 +46635,8 @@
                                 TreasureCount:%d,
                                 TreasureState:%s,
                                 TreasureAward:%s,
-                                TreasureProgress:%s
+                                TreasureProgress:%s,
+                                HelpAwardCount:%d
                                 '''\
                                 %(
                                 self.Head.OutputString(),
@@ -44533,7 +46647,8 @@
                                 self.TreasureCount,
                                 "...",
                                 "...",
-                                "..."
+                                "...",
+                                self.HelpAwardCount
                                 )
         return DumpString
 
@@ -44830,6 +46945,207 @@
 
 m_NAtagMCFuncSysPrivilegeInfoList=tagMCFuncSysPrivilegeInfoList()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFuncSysPrivilegeInfoList.Head.Cmd,m_NAtagMCFuncSysPrivilegeInfoList.Head.SubCmd))] = m_NAtagMCFuncSysPrivilegeInfoList
+
+
+#------------------------------------------------------
+# B1 09 玩家挂机系统信息 #tagMCGuajiInfo
+
+class  tagMCGuajiMoney(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("MoneyType", c_ubyte),    
+                  ("MoneyValue", c_int),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.MoneyType = 0
+        self.MoneyValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGuajiMoney)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+                                MoneyType:%d,
+                                MoneyValue:%d
+                                '''\
+                                %(
+                                self.MoneyType,
+                                self.MoneyValue
+                                )
+        return DumpString
+
+
+class  tagMCGuajiItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("Count", c_ushort),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.Count = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGuajiItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+                                ItemID:%d,
+                                Count:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.Count
+                                )
+        return DumpString
+
+
+class  tagMCGuajiInfo(Structure):
+    Head = tagHead()
+    QuickAwardCount = 0    #(BYTE QuickAwardCount)// 今日已快速挂机收益次数
+    AwardType = 0    #(BYTE AwardType)// 收益类型: 0-已累计预览;1-领取结算结果(包含常规领取跟快速领取)
+    AwardSeconds = 0    #(DWORD AwardSeconds)// 已累计收益时长,秒
+    Exp = 0    #(DWORD Exp)// 已累计经验,求余亿部分
+    ExpPoint = 0    #(DWORD ExpPoint)// 已累计经验,整除亿部分
+    MoneyLen = 0    #(BYTE MoneyLen)
+    MoneyList = list()    #(vector<tagMCGuajiMoney> MoneyList)// 已累计货币
+    ItemLen = 0    #(BYTE ItemLen)
+    ItemList = list()    #(vector<tagMCGuajiItem> ItemList)// 已累计物品
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x09
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.QuickAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AwardType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AwardSeconds,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Exp,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.ExpPoint,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.MoneyLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.MoneyLen):
+            temMoneyList = tagMCGuajiMoney()
+            _pos = temMoneyList.ReadData(_lpData, _pos)
+            self.MoneyList.append(temMoneyList)
+        self.ItemLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.ItemLen):
+            temItemList = tagMCGuajiItem()
+            _pos = temItemList.ReadData(_lpData, _pos)
+            self.ItemList.append(temItemList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x09
+        self.QuickAwardCount = 0
+        self.AwardType = 0
+        self.AwardSeconds = 0
+        self.Exp = 0
+        self.ExpPoint = 0
+        self.MoneyLen = 0
+        self.MoneyList = list()
+        self.ItemLen = 0
+        self.ItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        length += 4
+        length += 4
+        length += 4
+        length += 1
+        for i in range(self.MoneyLen):
+            length += self.MoneyList[i].GetLength()
+        length += 1
+        for i in range(self.ItemLen):
+            length += self.ItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.QuickAwardCount)
+        data = CommFunc.WriteBYTE(data, self.AwardType)
+        data = CommFunc.WriteDWORD(data, self.AwardSeconds)
+        data = CommFunc.WriteDWORD(data, self.Exp)
+        data = CommFunc.WriteDWORD(data, self.ExpPoint)
+        data = CommFunc.WriteBYTE(data, self.MoneyLen)
+        for i in range(self.MoneyLen):
+            data = CommFunc.WriteString(data, self.MoneyList[i].GetLength(), self.MoneyList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ItemLen)
+        for i in range(self.ItemLen):
+            data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                QuickAwardCount:%d,
+                                AwardType:%d,
+                                AwardSeconds:%d,
+                                Exp:%d,
+                                ExpPoint:%d,
+                                MoneyLen:%d,
+                                MoneyList:%s,
+                                ItemLen:%d,
+                                ItemList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.QuickAwardCount,
+                                self.AwardType,
+                                self.AwardSeconds,
+                                self.Exp,
+                                self.ExpPoint,
+                                self.MoneyLen,
+                                "...",
+                                self.ItemLen,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCGuajiInfo=tagMCGuajiInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGuajiInfo.Head.Cmd,m_NAtagMCGuajiInfo.Head.SubCmd))] = m_NAtagMCGuajiInfo
 
 
 #------------------------------------------------------
@@ -45370,8 +47686,9 @@
     _pack_ = 1
     _fields_ = [
                   ("NeedValue", c_int),    # 奖励所需值
-                  ("FreeRewardState", c_ubyte),    # 免费奖励是否已领取
-                  ("ZLRewardState", c_ubyte),    # 战令奖励是否已领取
+                  ("FreeRewardState", c_ubyte),    # 免费战令奖励是否已领取
+                  ("ZLRewardState", c_ubyte),    # 普通战令奖励是否已领取
+                  ("ZLRewardStateH", c_ubyte),    # 高级战令奖励是否已领取
                   ]
 
     def __init__(self):
@@ -45387,6 +47704,7 @@
         self.NeedValue = 0
         self.FreeRewardState = 0
         self.ZLRewardState = 0
+        self.ZLRewardStateH = 0
         return
 
     def GetLength(self):
@@ -45399,12 +47717,14 @@
         DumpString = '''// B1 20 战令信息 //tagMCZhanlingInfo:
                                 NeedValue:%d,
                                 FreeRewardState:%d,
-                                ZLRewardState:%d
+                                ZLRewardState:%d,
+                                ZLRewardStateH:%d
                                 '''\
                                 %(
                                 self.NeedValue,
                                 self.FreeRewardState,
-                                self.ZLRewardState
+                                self.ZLRewardState,
+                                self.ZLRewardStateH
                                 )
         return DumpString
 
@@ -45412,7 +47732,9 @@
 class  tagMCZhanlingInfo(Structure):
     Head = tagHead()
     ZhanlingType = 0    #(BYTE ZhanlingType)// 战令类型
-    IsActivite = 0    #(BYTE IsActivite)// 是否已激活
+    IsActivite = 0    #(BYTE IsActivite)// 普通战令是否已激活
+    IsActiviteH = 0    #(BYTE IsActiviteH)// 高级战令是否已激活
+    Value1 = 0    #(DWORD Value1)// 战令对应的自定义值,可选,如登录战令代表开始计算日期时间戳
     RewardCount = 0    #(WORD RewardCount)
     RewardList = list()    #(vector<tagMCZhanling> RewardList)
     data = None
@@ -45428,6 +47750,8 @@
         _pos = self.Head.ReadData(_lpData, _pos)
         self.ZhanlingType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.IsActivite,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.IsActiviteH,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Value1,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.RewardCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
         for i in range(self.RewardCount):
             temRewardList = tagMCZhanling()
@@ -45442,6 +47766,8 @@
         self.Head.SubCmd = 0x20
         self.ZhanlingType = 0
         self.IsActivite = 0
+        self.IsActiviteH = 0
+        self.Value1 = 0
         self.RewardCount = 0
         self.RewardList = list()
         return
@@ -45451,6 +47777,8 @@
         length += self.Head.GetLength()
         length += 1
         length += 1
+        length += 1
+        length += 4
         length += 2
         for i in range(self.RewardCount):
             length += self.RewardList[i].GetLength()
@@ -45462,6 +47790,8 @@
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
         data = CommFunc.WriteBYTE(data, self.ZhanlingType)
         data = CommFunc.WriteBYTE(data, self.IsActivite)
+        data = CommFunc.WriteBYTE(data, self.IsActiviteH)
+        data = CommFunc.WriteDWORD(data, self.Value1)
         data = CommFunc.WriteWORD(data, self.RewardCount)
         for i in range(self.RewardCount):
             data = CommFunc.WriteString(data, self.RewardList[i].GetLength(), self.RewardList[i].GetBuffer())
@@ -45472,6 +47802,8 @@
                                 Head:%s,
                                 ZhanlingType:%d,
                                 IsActivite:%d,
+                                IsActiviteH:%d,
+                                Value1:%d,
                                 RewardCount:%d,
                                 RewardList:%s
                                 '''\
@@ -45479,6 +47811,8 @@
                                 self.Head.OutputString(),
                                 self.ZhanlingType,
                                 self.IsActivite,
+                                self.IsActiviteH,
+                                self.Value1,
                                 self.RewardCount,
                                 "..."
                                 )
@@ -48788,6 +51122,119 @@
 
 
 #------------------------------------------------------
+# B4 20 回合制战斗状态 #tagMCTurnFightState
+
+class  tagMCTurnFightState(Structure):
+    Head = tagHead()
+    MapID = 0    #(DWORD MapID)// 自定义地图ID,可用于绑定战斗场景功能(如野外关卡,爬塔功能,竞技场等)
+    FuncLineID = 0    #(WORD FuncLineID)
+    TagType = 0    #(BYTE TagType)// 战斗目标类型,0-NPC,1-玩家,2-队伍
+    TagID = 0    #(DWORD TagID)// 战斗目标类型对应的ID
+    State = 0    #(BYTE State)// 0-起始状态标记;1-准备完毕;2-战斗中;3-战斗结束;4-结算奖励;5-结束状态标记
+    TurnNum = 0    #(BYTE TurnNum)// 当前轮次
+    TurnMax = 0    #(BYTE TurnMax)// 最大轮次
+    Len = 0    #(WORD Len)
+    Msg = ""    #(String Msg)//size = Len
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB4
+        self.Head.SubCmd = 0x20
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FuncLineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.TagType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TagID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.State,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TurnNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TurnMax,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.Len,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.Msg,_pos = CommFunc.ReadString(_lpData, _pos,self.Len)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB4
+        self.Head.SubCmd = 0x20
+        self.MapID = 0
+        self.FuncLineID = 0
+        self.TagType = 0
+        self.TagID = 0
+        self.State = 0
+        self.TurnNum = 0
+        self.TurnMax = 0
+        self.Len = 0
+        self.Msg = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 4
+        length += 2
+        length += 1
+        length += 4
+        length += 1
+        length += 1
+        length += 1
+        length += 2
+        length += len(self.Msg)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteDWORD(data, self.MapID)
+        data = CommFunc.WriteWORD(data, self.FuncLineID)
+        data = CommFunc.WriteBYTE(data, self.TagType)
+        data = CommFunc.WriteDWORD(data, self.TagID)
+        data = CommFunc.WriteBYTE(data, self.State)
+        data = CommFunc.WriteBYTE(data, self.TurnNum)
+        data = CommFunc.WriteBYTE(data, self.TurnMax)
+        data = CommFunc.WriteWORD(data, self.Len)
+        data = CommFunc.WriteString(data, self.Len, self.Msg)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                MapID:%d,
+                                FuncLineID:%d,
+                                TagType:%d,
+                                TagID:%d,
+                                State:%d,
+                                TurnNum:%d,
+                                TurnMax:%d,
+                                Len:%d,
+                                Msg:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.MapID,
+                                self.FuncLineID,
+                                self.TagType,
+                                self.TagID,
+                                self.State,
+                                self.TurnNum,
+                                self.TurnMax,
+                                self.Len,
+                                self.Msg
+                                )
+        return DumpString
+
+
+m_NAtagMCTurnFightState=tagMCTurnFightState()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCTurnFightState.Head.Cmd,m_NAtagMCTurnFightState.Head.SubCmd))] = m_NAtagMCTurnFightState
+
+
+#------------------------------------------------------
 # C1 09 跨服排位玩家信息 #tagMCChampionshipPlayerInfo
 
 class  tagMCChampionshipPlayerInfo(Structure):
@@ -48852,6 +51299,7 @@
                   ("EnterCountWeek", c_int),    # 本周总参与次数
                   ("BuyOpenCountWeek", c_int),    # 本周总购买召集次数
                   ("HighScoreTotalWeek", c_int),    # 本周每日最高分累加总分
+                  ("ZoneID", c_ubyte),    # 所属分区ID
                   ]
 
     def __init__(self):
@@ -48873,6 +51321,7 @@
         self.EnterCountWeek = 0
         self.BuyOpenCountWeek = 0
         self.HighScoreTotalWeek = 0
+        self.ZoneID = 0
         return
 
     def GetLength(self):
@@ -48889,7 +51338,8 @@
                                 HighScoreToday:%d,
                                 EnterCountWeek:%d,
                                 BuyOpenCountWeek:%d,
-                                HighScoreTotalWeek:%d
+                                HighScoreTotalWeek:%d,
+                                ZoneID:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -48898,7 +51348,8 @@
                                 self.HighScoreToday,
                                 self.EnterCountWeek,
                                 self.BuyOpenCountWeek,
-                                self.HighScoreTotalWeek
+                                self.HighScoreTotalWeek,
+                                self.ZoneID
                                 )
         return DumpString
 

--
Gitblit v1.8.0