From 0d5d93d5adc8035d2a140ecb363fdb464cde9ed0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 10 七月 2024 19:29:28 +0800
Subject: [PATCH] 10192 【越南】【主干】【港台】【砍树】上线增加膜拜主动推送(膜拜玩家信息转json格式)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 1467 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 1,415 insertions(+), 52 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index edb62fd..bde1c54 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):
@@ -4479,9 +4663,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):
@@ -4498,9 +4690,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):
@@ -4512,9 +4712,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):
@@ -4530,6 +4738,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
 
@@ -4543,9 +4759,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):
@@ -4558,9 +4782,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,
@@ -4571,16 +4803,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
@@ -4595,7 +4835,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):
@@ -4609,7 +4849,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()
@@ -4618,7 +4858,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
-        length += 1
+        length += 4
         length += 1
         length += 1
         for i in range(self.BillboardCount):
@@ -4629,7 +4869,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):
@@ -4639,14 +4879,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,
                                 "..."
@@ -8498,6 +8738,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
 
 
 #------------------------------------------------------
@@ -14785,15 +15232,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):
@@ -14802,31 +15259,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
@@ -14836,44 +15315,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
 
@@ -14883,6 +15400,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
@@ -14899,6 +15417,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()
@@ -14914,6 +15433,7 @@
         self.Type = 0
         self.GroupValue1 = 0
         self.GroupValue2 = 0
+        self.WatchID = 0
         self.BillboardCount = 0
         self.CrossBillboardDataList = list()
         return
@@ -14924,6 +15444,7 @@
         length += 1
         length += 1
         length += 1
+        length += 4
         length += 1
         for i in range(self.BillboardCount):
             length += self.CrossBillboardDataList[i].GetLength()
@@ -14936,6 +15457,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())
@@ -14947,6 +15469,7 @@
                                 Type:%d,
                                 GroupValue1:%d,
                                 GroupValue2:%d,
+                                WatchID:%d,
                                 BillboardCount:%d,
                                 CrossBillboardDataList:%s
                                 '''\
@@ -14955,6 +15478,7 @@
                                 self.Type,
                                 self.GroupValue1,
                                 self.GroupValue2,
+                                self.WatchID,
                                 self.BillboardCount,
                                 "..."
                                 )
@@ -16952,6 +17476,7 @@
                   ("TotalPayCount", c_int),    # 累计总购买次数
                   ("WeekPayCount", c_ushort),    # 周总购买次数
                   ("MonthPayCount", c_ushort),    # 月总购买次数
+                  ("SelectItemValue", c_int),    # 自选物品索引值,每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
                   ]
 
     def __init__(self):
@@ -16969,6 +17494,7 @@
         self.TotalPayCount = 0
         self.WeekPayCount = 0
         self.MonthPayCount = 0
+        self.SelectItemValue = 0
         return
 
     def GetLength(self):
@@ -16983,14 +17509,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
 
@@ -31350,7 +31878,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):
@@ -31365,12 +31895,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):
@@ -31379,6 +31916,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
 
@@ -31388,17 +31928,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
@@ -31473,13 +32020,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):
@@ -31494,19 +32047,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):
@@ -31517,13 +32079,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):
@@ -31532,15 +32100,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
 
@@ -31550,15 +32125,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):
@@ -31567,25 +32149,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
@@ -31604,8 +32198,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):
@@ -31624,7 +32219,8 @@
         self.SubCmd = 0x68
         self.ActNum = 0
         self.SubmitCount = 0
-        self.SubmitCountAward = 0
+        self.SubmitAwardCount = 0
+        self.SubmitAwardState = 0
         return
 
     def GetLength(self):
@@ -31639,14 +32235,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
 
@@ -31702,7 +32300,7 @@
 
 
 class  tagMCActBuyCountGift(Structure):
-    NeedBuyCount = 0    #(BYTE NeedBuyCount)// 所需总购买次数
+    NeedBuyCount = 0    #(BYTE NeedBuyCount)// 所需总购买次数,0为免费领取的档次
     Count = 0    #(BYTE Count)// 奖励物品数
     AwardItemList = list()    #(vector<tagMCActBuyCountGiftItem> AwardItemList)// 奖励物品列表
     data = None
@@ -31767,7 +32365,7 @@
     ResetType = 0    #(BYTE ResetType)// 重置类型,0-0点重置;1-5点重置
     LimitLV = 0    #(WORD LimitLV)// 限制等级
     CTGIDCount = 0    #(BYTE CTGIDCount)
-    CTGIDList = list()    #(vector<DWORD> CTGIDList)// CTGID列表;总购买次数前端自己统计,直接取CTGID对应的累计购买次数累加
+    CTGIDList = list()    #(vector<WORD> CTGIDList)// CTGID列表;总购买次数前端自己统计,直接取CTGID对应的累计购买次数累加
     GiftCount = 0    #(BYTE GiftCount)
     BuyCountGiftList = list()    #(vector<tagMCActBuyCountGift> BuyCountGiftList)// 购买次数礼包列表
     data = None
@@ -31789,7 +32387,7 @@
         self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
         self.CTGIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.CTGIDCount):
-            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
             self.CTGIDList.append(value)
         self.GiftCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.GiftCount):
@@ -31825,7 +32423,7 @@
         length += 1
         length += 2
         length += 1
-        length += 4 * self.CTGIDCount
+        length += 2 * self.CTGIDCount
         length += 1
         for i in range(self.GiftCount):
             length += self.BuyCountGiftList[i].GetLength()
@@ -31843,7 +32441,7 @@
         data = CommFunc.WriteWORD(data, self.LimitLV)
         data = CommFunc.WriteBYTE(data, self.CTGIDCount)
         for i in range(self.CTGIDCount):
-            data = CommFunc.WriteDWORD(data, self.CTGIDList[i])
+            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())
@@ -32626,6 +33224,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
 
 
 #------------------------------------------------------
@@ -34250,7 +35115,8 @@
     StartDate = ""    #(char StartDate[10])// 开始日期 y-m-d
     EndtDate = ""    #(char EndtDate[10])// 结束日期 y-m-d
     LimitLV = 0    #(WORD LimitLV)// 限制等级
-    RepSignCostMoney = list()    #(DWORD RepSignCostMoney[2])// 补签消耗 [货币类型, 货币值]
+    RepSignMoneyType = 0    #(BYTE RepSignMoneyType)// 补签消耗货币类型
+    RepSignMoneyValue = 0    #(DWORD RepSignMoneyValue)// 补签消耗货币值
     DayCount = 0    #(BYTE DayCount)
     AwardDayList = list()    #(vector<tagMCActLoginNewDay> AwardDayList)// 奖励天列表
     data = None
@@ -34268,7 +35134,8 @@
         self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         self.EndtDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
         self.LimitLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.RepSignCostMoney, _pos = CommFunc.ReadString(_lpData, _pos, 2*17582024)
+        self.RepSignMoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.RepSignMoneyValue,_pos = CommFunc.ReadDWORD(_lpData, _pos)
         self.DayCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.DayCount):
             temAwardDayList = tagMCActLoginNewDay()
@@ -34285,7 +35152,8 @@
         self.StartDate = ""
         self.EndtDate = ""
         self.LimitLV = 0
-        self.RepSignCostMoney = list()
+        self.RepSignMoneyType = 0
+        self.RepSignMoneyValue = 0
         self.DayCount = 0
         self.AwardDayList = list()
         return
@@ -34297,7 +35165,8 @@
         length += 10
         length += 10
         length += 2
-        length += 4*2
+        length += 1
+        length += 4
         length += 1
         for i in range(self.DayCount):
             length += self.AwardDayList[i].GetLength()
@@ -34311,8 +35180,8 @@
         data = CommFunc.WriteString(data, 10, self.StartDate)
         data = CommFunc.WriteString(data, 10, self.EndtDate)
         data = CommFunc.WriteWORD(data, self.LimitLV)
-        for item in self.RepSignCostMoney:
-            data = CommFunc.WriteDWORD(data, item)
+        data = CommFunc.WriteBYTE(data, self.RepSignMoneyType)
+        data = CommFunc.WriteDWORD(data, self.RepSignMoneyValue)
         data = CommFunc.WriteBYTE(data, self.DayCount)
         for i in range(self.DayCount):
             data = CommFunc.WriteString(data, self.AwardDayList[i].GetLength(), self.AwardDayList[i].GetBuffer())
@@ -34325,7 +35194,8 @@
                                 StartDate:%s,
                                 EndtDate:%s,
                                 LimitLV:%d,
-                                RepSignCostMoney:%s,
+                                RepSignMoneyType:%d,
+                                RepSignMoneyValue:%d,
                                 DayCount:%d,
                                 AwardDayList:%s
                                 '''\
@@ -34335,7 +35205,8 @@
                                 self.StartDate,
                                 self.EndtDate,
                                 self.LimitLV,
-                                "...",
+                                self.RepSignMoneyType,
+                                self.RepSignMoneyValue,
                                 self.DayCount,
                                 "..."
                                 )
@@ -38368,6 +39239,290 @@
 
 
 #------------------------------------------------------
+# 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 25 每日礼包活动信息 #tagMCDailyGiftbagInfo
 
 class  tagMCDailyGiftbagItem(Structure):
@@ -38417,6 +39572,7 @@
     RMB = 0    #(DWORD RMB)//所需RMB,元
     GiftItemCount = 0    #(BYTE GiftItemCount)// 礼包物品数
     ItemInfo = list()    #(vector<tagMCDailyGiftbagItem> ItemInfo)// 物品信息
+    Discount = 0    #(WORD Discount)// 折扣力度百分比
     data = None
 
     def __init__(self):
@@ -38435,6 +39591,7 @@
             temItemInfo = tagMCDailyGiftbagItem()
             _pos = temItemInfo.ReadData(_lpData, _pos)
             self.ItemInfo.append(temItemInfo)
+        self.Discount,_pos = CommFunc.ReadWORD(_lpData, _pos)
         return _pos
 
     def Clear(self):
@@ -38445,6 +39602,7 @@
         self.RMB = 0
         self.GiftItemCount = 0
         self.ItemInfo = list()
+        self.Discount = 0
         return
 
     def GetLength(self):
@@ -38457,6 +39615,7 @@
         length += 1
         for i in range(self.GiftItemCount):
             length += self.ItemInfo[i].GetLength()
+        length += 2
 
         return length
 
@@ -38470,6 +39629,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):
@@ -38480,7 +39640,8 @@
                                 BuyCountLimit:%d,
                                 RMB:%d,
                                 GiftItemCount:%d,
-                                ItemInfo:%s
+                                ItemInfo:%s,
+                                Discount:%d
                                 '''\
                                 %(
                                 self.GiftID,
@@ -38489,7 +39650,8 @@
                                 self.BuyCountLimit,
                                 self.RMB,
                                 self.GiftItemCount,
-                                "..."
+                                "...",
+                                self.Discount
                                 )
         return DumpString
 
@@ -45138,6 +46300,207 @@
 
 
 #------------------------------------------------------
+# B1 09 玩家挂机系统信息 #tagMCGuajiInfo
+
+class  tagMCGuajiMoney(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("MoneyType", c_ubyte),    
+                  ("MoneyValue", c_int),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.MoneyType = 0
+        self.MoneyValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGuajiMoney)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+                                MoneyType:%d,
+                                MoneyValue:%d
+                                '''\
+                                %(
+                                self.MoneyType,
+                                self.MoneyValue
+                                )
+        return DumpString
+
+
+class  tagMCGuajiItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("Count", c_ushort),    
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.ItemID = 0
+        self.Count = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCGuajiItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B1 09 玩家挂机系统信息 //tagMCGuajiInfo:
+                                ItemID:%d,
+                                Count:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.Count
+                                )
+        return DumpString
+
+
+class  tagMCGuajiInfo(Structure):
+    Head = tagHead()
+    QuickAwardCount = 0    #(BYTE QuickAwardCount)// 今日已快速挂机收益次数
+    AwardType = 0    #(BYTE AwardType)// 收益类型: 0-已累计预览;1-领取结算结果(包含常规领取跟快速领取)
+    AwardSeconds = 0    #(DWORD AwardSeconds)// 已累计收益时长,秒
+    Exp = 0    #(DWORD Exp)// 已累计经验,求余亿部分
+    ExpPoint = 0    #(DWORD ExpPoint)// 已累计经验,整除亿部分
+    MoneyLen = 0    #(BYTE MoneyLen)
+    MoneyList = list()    #(vector<tagMCGuajiMoney> MoneyList)// 已累计货币
+    ItemLen = 0    #(BYTE ItemLen)
+    ItemList = list()    #(vector<tagMCGuajiItem> ItemList)// 已累计物品
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x09
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.QuickAwardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AwardType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AwardSeconds,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.Exp,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.ExpPoint,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.MoneyLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.MoneyLen):
+            temMoneyList = tagMCGuajiMoney()
+            _pos = temMoneyList.ReadData(_lpData, _pos)
+            self.MoneyList.append(temMoneyList)
+        self.ItemLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.ItemLen):
+            temItemList = tagMCGuajiItem()
+            _pos = temItemList.ReadData(_lpData, _pos)
+            self.ItemList.append(temItemList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB1
+        self.Head.SubCmd = 0x09
+        self.QuickAwardCount = 0
+        self.AwardType = 0
+        self.AwardSeconds = 0
+        self.Exp = 0
+        self.ExpPoint = 0
+        self.MoneyLen = 0
+        self.MoneyList = list()
+        self.ItemLen = 0
+        self.ItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        length += 4
+        length += 4
+        length += 4
+        length += 1
+        for i in range(self.MoneyLen):
+            length += self.MoneyList[i].GetLength()
+        length += 1
+        for i in range(self.ItemLen):
+            length += self.ItemList[i].GetLength()
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.QuickAwardCount)
+        data = CommFunc.WriteBYTE(data, self.AwardType)
+        data = CommFunc.WriteDWORD(data, self.AwardSeconds)
+        data = CommFunc.WriteDWORD(data, self.Exp)
+        data = CommFunc.WriteDWORD(data, self.ExpPoint)
+        data = CommFunc.WriteBYTE(data, self.MoneyLen)
+        for i in range(self.MoneyLen):
+            data = CommFunc.WriteString(data, self.MoneyList[i].GetLength(), self.MoneyList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ItemLen)
+        for i in range(self.ItemLen):
+            data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                QuickAwardCount:%d,
+                                AwardType:%d,
+                                AwardSeconds:%d,
+                                Exp:%d,
+                                ExpPoint:%d,
+                                MoneyLen:%d,
+                                MoneyList:%s,
+                                ItemLen:%d,
+                                ItemList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.QuickAwardCount,
+                                self.AwardType,
+                                self.AwardSeconds,
+                                self.Exp,
+                                self.ExpPoint,
+                                self.MoneyLen,
+                                "...",
+                                self.ItemLen,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagMCGuajiInfo=tagMCGuajiInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGuajiInfo.Head.Cmd,m_NAtagMCGuajiInfo.Head.SubCmd))] = m_NAtagMCGuajiInfo
+
+
+#------------------------------------------------------
 # B1 06 通知玩家向目标点移动 #tagMCNotifyPlayerMove
 
 class  tagMCNotifyPlayerMove(Structure):

--
Gitblit v1.8.0