From ace5dadbba4a16357d0aca93ee5734ab8adf7a94 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 28 十月 2025 17:57:08 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(韩遂技能;增加效果6016-对护盾造成伤害加成)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py | 1284 ++++++++++------------------------------------------------
 1 files changed, 221 insertions(+), 1,063 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
index 5938ce6..af57e4b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.py
@@ -5527,118 +5527,6 @@
 
 
 #------------------------------------------------------
-# A3 1D 神兵等级信息 #tagMCGodWeaponLVList
-
-class  tagMCGodWeaponLVInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("WeaponType", c_ubyte),    #神兵类型
-                  ("WeaponLV", c_ushort),    #神兵等级
-                  ("WeaponExp", 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.WeaponType = 0
-        self.WeaponLV = 0
-        self.WeaponExp = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCGodWeaponLVInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A3 1D 神兵等级信息 //tagMCGodWeaponLVList:
-                                WeaponType:%d,
-                                WeaponLV:%d,
-                                WeaponExp:%d
-                                '''\
-                                %(
-                                self.WeaponType,
-                                self.WeaponLV,
-                                self.WeaponExp
-                                )
-        return DumpString
-
-
-class  tagMCGodWeaponLVList(Structure):
-    Head = tagHead()
-    WeaponNum = 0    #(BYTE WeaponNum)//神器个数
-    WeaponInfoList = list()    #(vector<tagMCGodWeaponLVInfo> WeaponInfoList)// 副本数据列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x1D
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.WeaponNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.WeaponNum):
-            temWeaponInfoList = tagMCGodWeaponLVInfo()
-            _pos = temWeaponInfoList.ReadData(_lpData, _pos)
-            self.WeaponInfoList.append(temWeaponInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA3
-        self.Head.SubCmd = 0x1D
-        self.WeaponNum = 0
-        self.WeaponInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        for i in range(self.WeaponNum):
-            length += self.WeaponInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.WeaponNum)
-        for i in range(self.WeaponNum):
-            data = CommFunc.WriteString(data, self.WeaponInfoList[i].GetLength(), self.WeaponInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                WeaponNum:%d,
-                                WeaponInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.WeaponNum,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCGodWeaponLVList=tagMCGodWeaponLVList()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGodWeaponLVList.Head.Cmd,m_NAtagMCGodWeaponLVList.Head.SubCmd))] = m_NAtagMCGodWeaponLVList
-
-
-#------------------------------------------------------
 # A3 37 投资理财信息 #tagMCGoldInvestInfo
 
 class  tagMCInvestReward(Structure):
@@ -7539,58 +7427,6 @@
 
 m_NAtagMCNPCIDCollectionCntInfo=tagMCNPCIDCollectionCntInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCNPCIDCollectionCntInfo.Head.Cmd,m_NAtagMCNPCIDCollectionCntInfo.Head.SubCmd))] = m_NAtagMCNPCIDCollectionCntInfo
-
-
-#------------------------------------------------------
-# A3 19 分包下载奖励记录 #tagMCPackDownloadRecord
-
-class  tagMCPackDownloadRecord(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("Record", c_ubyte),    #0-未领取 1-已领取	
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA3
-        self.SubCmd = 0x19
-        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 = 0xA3
-        self.SubCmd = 0x19
-        self.Record = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCPackDownloadRecord)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A3 19 分包下载奖励记录 //tagMCPackDownloadRecord:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                Record:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.Record
-                                )
-        return DumpString
-
-
-m_NAtagMCPackDownloadRecord=tagMCPackDownloadRecord()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCPackDownloadRecord.Cmd,m_NAtagMCPackDownloadRecord.SubCmd))] = m_NAtagMCPackDownloadRecord
 
 
 #------------------------------------------------------
@@ -10631,208 +10467,6 @@
 
 
 #------------------------------------------------------
-# A4 06 家族仓库物品信息 #tagGCFamilyStoreItemInfo
-
-class  tagGCFamilyStoreItem(Structure):
-    Index = 0    #(BYTE Index)// 仓库格子索引,从0开始代表第一格
-    ItemID = 0    #(DWORD ItemID)// 物品ID
-    ItemDataLen = 0    #(WORD ItemDataLen)
-    ItemData = ""    #(String ItemData)//size = ItemDataLen
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        self.Index,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.ItemDataLen,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ItemData,_pos = CommFunc.ReadString(_lpData, _pos,self.ItemDataLen)
-        return _pos
-
-    def Clear(self):
-        self.Index = 0
-        self.ItemID = 0
-        self.ItemDataLen = 0
-        self.ItemData = ""
-        return
-
-    def GetLength(self):
-        length = 0
-        length += 1
-        length += 4
-        length += 2
-        length += len(self.ItemData)
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteBYTE(data, self.Index)
-        data = CommFunc.WriteDWORD(data, self.ItemID)
-        data = CommFunc.WriteWORD(data, self.ItemDataLen)
-        data = CommFunc.WriteString(data, self.ItemDataLen, self.ItemData)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Index:%d,
-                                ItemID:%d,
-                                ItemDataLen:%d,
-                                ItemData:%s
-                                '''\
-                                %(
-                                self.Index,
-                                self.ItemID,
-                                self.ItemDataLen,
-                                self.ItemData
-                                )
-        return DumpString
-
-
-class  tagGCFamilyStoreItemInfo(Structure):
-    Head = tagHead()
-    Count = 0    #(BYTE Count)//数量
-    StoreItemList = list()    #(vector<tagGCFamilyStoreItem> StoreItemList)//size = Count
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x06
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temStoreItemList = tagGCFamilyStoreItem()
-            _pos = temStoreItemList.ReadData(_lpData, _pos)
-            self.StoreItemList.append(temStoreItemList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x06
-        self.Count = 0
-        self.StoreItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        for i in range(self.Count):
-            length += self.StoreItemList[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.StoreItemList[i].GetLength(), self.StoreItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Count:%d,
-                                StoreItemList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagGCFamilyStoreItemInfo=tagGCFamilyStoreItemInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCFamilyStoreItemInfo.Head.Cmd,m_NAtagGCFamilyStoreItemInfo.Head.SubCmd))] = m_NAtagGCFamilyStoreItemInfo
-
-
-#------------------------------------------------------
-# A4 07 家族仓库物品清除 #tagGCFamilyStoreItemClear
-
-class  tagGCFamilyStoreItemClear(Structure):
-    Head = tagHead()
-    ClearType = 0    #(BYTE ClearType)//0-指定格子清除; 1-所有物品清除
-    IndexCount = 0    #(BYTE IndexCount)
-    IndexList = list()    #(vector<BYTE> IndexList)//清除的格子索引, 仅指定格子清除时有效,从0开始代表第一格
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x07
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.ClearType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.IndexCount):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.IndexList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA4
-        self.Head.SubCmd = 0x07
-        self.ClearType = 0
-        self.IndexCount = 0
-        self.IndexList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 1 * self.IndexCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.ClearType)
-        data = CommFunc.WriteBYTE(data, self.IndexCount)
-        for i in range(self.IndexCount):
-            data = CommFunc.WriteBYTE(data, self.IndexList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                ClearType:%d,
-                                IndexCount:%d,
-                                IndexList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.ClearType,
-                                self.IndexCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagGCFamilyStoreItemClear=tagGCFamilyStoreItemClear()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCFamilyStoreItemClear.Head.Cmd,m_NAtagGCFamilyStoreItemClear.Head.SubCmd))] = m_NAtagGCFamilyStoreItemClear
-
-
-#------------------------------------------------------
 # A4 09 家族守卫人皇信息通知 #tagGCFamilySWRHInfo
 
 class  tagGCFamilySWRHInfo(Structure):
@@ -11566,194 +11200,6 @@
 
 
 #------------------------------------------------------
-# A5 35 王者仙盟每日俸禄奖励状态 #tagMCChampionFamilyDailyReward
-
-class  tagMCChampionFamilyDailyReward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("GetState", c_ubyte),    #是否已领取
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x35
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x35
-        self.GetState = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCChampionFamilyDailyReward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 35 王者仙盟每日俸禄奖励状态 //tagMCChampionFamilyDailyReward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                GetState:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.GetState
-                                )
-        return DumpString
-
-
-m_NAtagMCChampionFamilyDailyReward=tagMCChampionFamilyDailyReward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCChampionFamilyDailyReward.Cmd,m_NAtagMCChampionFamilyDailyReward.SubCmd))] = m_NAtagMCChampionFamilyDailyReward
-
-
-#------------------------------------------------------
-# A5 10 传功奖励结果 #tagMCChuangongResult
-
-class  tagMCChuangongItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    
-                  ("ItemCount", 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.ItemCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCChuangongItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 10 传功奖励结果 //tagMCChuangongResult:
-                                ItemID:%d,
-                                ItemCount:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCount
-                                )
-        return DumpString
-
-
-class  tagMCChuangongResult(Structure):
-    Head = tagHead()
-    FromLV = 0    #(WORD FromLV)// 传功前等级
-    ToLV = 0    #(WORD ToLV)// 传功后等级
-    Exp = 0    #(DWORD Exp)// 获得经验求余亿部分
-    ExpPoint = 0    #(DWORD ExpPoint)// 获得经验整除亿部分
-    ItemCount = 0    #(BYTE ItemCount)
-    AwardItemList = list()    #(vector<tagMCChuangongItem> AwardItemList)// 奖励物品列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x10
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.FromLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.ToLV,_pos = CommFunc.ReadWORD(_lpData, _pos)
-        self.Exp,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.ExpPoint,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.ItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.ItemCount):
-            temAwardItemList = tagMCChuangongItem()
-            _pos = temAwardItemList.ReadData(_lpData, _pos)
-            self.AwardItemList.append(temAwardItemList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x10
-        self.FromLV = 0
-        self.ToLV = 0
-        self.Exp = 0
-        self.ExpPoint = 0
-        self.ItemCount = 0
-        self.AwardItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 2
-        length += 2
-        length += 4
-        length += 4
-        length += 1
-        for i in range(self.ItemCount):
-            length += self.AwardItemList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteWORD(data, self.FromLV)
-        data = CommFunc.WriteWORD(data, self.ToLV)
-        data = CommFunc.WriteDWORD(data, self.Exp)
-        data = CommFunc.WriteDWORD(data, self.ExpPoint)
-        data = CommFunc.WriteBYTE(data, self.ItemCount)
-        for i in range(self.ItemCount):
-            data = CommFunc.WriteString(data, self.AwardItemList[i].GetLength(), self.AwardItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                FromLV:%d,
-                                ToLV:%d,
-                                Exp:%d,
-                                ExpPoint:%d,
-                                ItemCount:%d,
-                                AwardItemList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.FromLV,
-                                self.ToLV,
-                                self.Exp,
-                                self.ExpPoint,
-                                self.ItemCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCChuangongResult=tagMCChuangongResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCChuangongResult.Head.Cmd,m_NAtagMCChuangongResult.Head.SubCmd))] = m_NAtagMCChuangongResult
-
-
-#------------------------------------------------------
 # A5 02 捐献次数信息 #tagSCDonateCntInfo
 
 class  tagSCDonateCntInfo(Structure):
@@ -12012,74 +11458,6 @@
 
 
 #------------------------------------------------------
-# A5 07 家族boss副本玩家信息 #tagMCFamilyBosFBPlayerInfo
-
-class  tagMCFamilyBosFBPlayerInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("HurtTotal", c_int),    # 累计伤血,亿求余部分
-                  ("HurtTotalPoint", c_int),    # 累计伤血,亿整除部分
-                  ("FightSeconds", c_int),    # 已累计战斗时长,秒
-                  ("HurtAwardState", c_int),    # 个人总伤血领奖记录,按奖励位二进制位运算表示是否已领取
-                  ("HurtAwardStateFamily", c_int),    # 仙盟总伤血领奖记录,按奖励位二进制位运算表示是否已领取
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x07
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x07
-        self.HurtTotal = 0
-        self.HurtTotalPoint = 0
-        self.FightSeconds = 0
-        self.HurtAwardState = 0
-        self.HurtAwardStateFamily = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCFamilyBosFBPlayerInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 07 家族boss副本玩家信息 //tagMCFamilyBosFBPlayerInfo:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                HurtTotal:%d,
-                                HurtTotalPoint:%d,
-                                FightSeconds:%d,
-                                HurtAwardState:%d,
-                                HurtAwardStateFamily:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.HurtTotal,
-                                self.HurtTotalPoint,
-                                self.FightSeconds,
-                                self.HurtAwardState,
-                                self.HurtAwardStateFamily
-                                )
-        return DumpString
-
-
-m_NAtagMCFamilyBosFBPlayerInfo=tagMCFamilyBosFBPlayerInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyBosFBPlayerInfo.Cmd,m_NAtagMCFamilyBosFBPlayerInfo.SubCmd))] = m_NAtagMCFamilyBosFBPlayerInfo
-
-
-#------------------------------------------------------
 # A5 21 家族变更 #tagMCFamilyChange
 
 class  tagMCFamilyChange(Structure):
@@ -12129,114 +11507,6 @@
 
 m_NAtagMCFamilyChange=tagMCFamilyChange()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyChange.Cmd,m_NAtagMCFamilyChange.SubCmd))] = m_NAtagMCFamilyChange
-
-
-#------------------------------------------------------
-# A5 06 仙盟每日福利领取状态 #tagMCFamilyDayAward
-
-class  tagMCFamilyDayAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("GetState", c_ubyte),    #是否已领取
-                  ("MoneyDonateCount", c_ubyte),    #今日货币捐献次数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x06
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x06
-        self.GetState = 0
-        self.MoneyDonateCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCFamilyDayAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 06 仙盟每日福利领取状态 //tagMCFamilyDayAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                GetState:%d,
-                                MoneyDonateCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.GetState,
-                                self.MoneyDonateCount
-                                )
-        return DumpString
-
-
-m_NAtagMCFamilyDayAward=tagMCFamilyDayAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyDayAward.Cmd,m_NAtagMCFamilyDayAward.SubCmd))] = m_NAtagMCFamilyDayAward
-
-
-#------------------------------------------------------
-# A5 03 当日祈福信息 #tagMCFamilyPrayInfo
-
-class  tagMCFamilyPrayInfo(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("PrayCntInfo", c_int),    # 当日祈福次数信息, 按位存储祈福类型对应次数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x03
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x03
-        self.PrayCntInfo = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCFamilyPrayInfo)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 03 当日祈福信息 //tagMCFamilyPrayInfo:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                PrayCntInfo:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.PrayCntInfo
-                                )
-        return DumpString
-
-
-m_NAtagMCFamilyPrayInfo=tagMCFamilyPrayInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyPrayInfo.Cmd,m_NAtagMCFamilyPrayInfo.SubCmd))] = m_NAtagMCFamilyPrayInfo
 
 
 #------------------------------------------------------
@@ -12438,22 +11708,205 @@
 
 
 #------------------------------------------------------
-# A5 11 打坐信息 #tagMCFamilySitInfo
+# A5 04 公会讨伐攻击结果 #tagSCFamilyTaofaAtkRet
 
-class  tagMCFamilySitInfo(Structure):
+class  tagSCFamilyTaofaAtkItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("ItemID", c_int),    
+                  ("Count", 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.Count = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagSCFamilyTaofaAtkItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 04 公会讨伐攻击结果 //tagSCFamilyTaofaAtkRet:
+                                ItemID:%d,
+                                Count:%d
+                                '''\
+                                %(
+                                self.ItemID,
+                                self.Count
+                                )
+        return DumpString
+
+
+class  tagSCFamilyTaofaAtkHurt(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("IsSuper", c_ubyte),    # 是否暴击
+                  ("HurtValue", c_int),    # 本次伤害,求余亿部分
+                  ("HurtValueEx", 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.IsSuper = 0
+        self.HurtValue = 0
+        self.HurtValueEx = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagSCFamilyTaofaAtkHurt)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 04 公会讨伐攻击结果 //tagSCFamilyTaofaAtkRet:
+                                IsSuper:%d,
+                                HurtValue:%d,
+                                HurtValueEx:%d
+                                '''\
+                                %(
+                                self.IsSuper,
+                                self.HurtValue,
+                                self.HurtValueEx
+                                )
+        return DumpString
+
+
+class  tagSCFamilyTaofaAtkRet(Structure):
+    Head = tagHead()
+    AtkType = 0    #(BYTE AtkType)// 攻击类型:0-常规;1-怒气攻击
+    HurtCount = 0    #(BYTE HurtCount)
+    HurtList = list()    #(vector<tagSCFamilyTaofaAtkHurt> HurtList)// 伤害次数列表,如怒气攻击有多次伤害
+    ItemCount = 0    #(BYTE ItemCount)
+    ItemList = list()    #(vector<tagSCFamilyTaofaAtkItem> ItemList)// 奖励物品列表
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA5
+        self.Head.SubCmd = 0x04
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.AtkType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.HurtCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.HurtCount):
+            temHurtList = tagSCFamilyTaofaAtkHurt()
+            _pos = temHurtList.ReadData(_lpData, _pos)
+            self.HurtList.append(temHurtList)
+        self.ItemCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.ItemCount):
+            temItemList = tagSCFamilyTaofaAtkItem()
+            _pos = temItemList.ReadData(_lpData, _pos)
+            self.ItemList.append(temItemList)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA5
+        self.Head.SubCmd = 0x04
+        self.AtkType = 0
+        self.HurtCount = 0
+        self.HurtList = list()
+        self.ItemCount = 0
+        self.ItemList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        for i in range(self.HurtCount):
+            length += self.HurtList[i].GetLength()
+        length += 1
+        for i in range(self.ItemCount):
+            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.AtkType)
+        data = CommFunc.WriteBYTE(data, self.HurtCount)
+        for i in range(self.HurtCount):
+            data = CommFunc.WriteString(data, self.HurtList[i].GetLength(), self.HurtList[i].GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.ItemCount)
+        for i in range(self.ItemCount):
+            data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                AtkType:%d,
+                                HurtCount:%d,
+                                HurtList:%s,
+                                ItemCount:%d,
+                                ItemList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.AtkType,
+                                self.HurtCount,
+                                "...",
+                                self.ItemCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagSCFamilyTaofaAtkRet=tagSCFamilyTaofaAtkRet()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCFamilyTaofaAtkRet.Head.Cmd,m_NAtagSCFamilyTaofaAtkRet.Head.SubCmd))] = m_NAtagSCFamilyTaofaAtkRet
+
+
+#------------------------------------------------------
+# A5 03 公会讨伐信息 #tagSCFamilyTaofaInfo
+
+class  tagSCFamilyTaofaInfo(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("ExpRound", c_ushort),    # 已获得经验轮次
-                  ("Exp", c_int),    # 获得经验求余亿部分
-                  ("ExpPoint", c_int),    # 获得经验整除亿部分
+                  ("BuZhenState", c_ubyte),    # 是否已布阵
+                  ("AtkCount", c_ushort),    # 已斩杀次数,用于计算剩余次数=免费次数+道具增加次数-已斩杀次数
+                  ("ItemAddCount", c_ushort),    # 道具增加斩杀次数
+                  ("Anger", c_ushort),    # 当前怒气值
+                  ("BoxUnGetCount", c_ushort),    # 当前未领取的宝箱数,即可领取的
+                  ("BoxHurt", c_int),    # 宝箱奖励计算累计伤害,求余亿部分;个人今日累计伤害,换公会不会重置
+                  ("BoxHurtEx", c_int),    # 宝箱奖励计算累计伤害,整除亿部分
+                  ("BoxHurtHis", c_int),    # 宝箱奖励计算累计历史最高伤害,求余亿部分
+                  ("BoxHurtHisEx", c_int),    # 宝箱奖励计算累计历史最高伤害,整除亿部分
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xA5
-        self.SubCmd = 0x11
+        self.SubCmd = 0x03
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -12463,38 +11916,56 @@
 
     def Clear(self):
         self.Cmd = 0xA5
-        self.SubCmd = 0x11
-        self.ExpRound = 0
-        self.Exp = 0
-        self.ExpPoint = 0
+        self.SubCmd = 0x03
+        self.BuZhenState = 0
+        self.AtkCount = 0
+        self.ItemAddCount = 0
+        self.Anger = 0
+        self.BoxUnGetCount = 0
+        self.BoxHurt = 0
+        self.BoxHurtEx = 0
+        self.BoxHurtHis = 0
+        self.BoxHurtHisEx = 0
         return
 
     def GetLength(self):
-        return sizeof(tagMCFamilySitInfo)
+        return sizeof(tagSCFamilyTaofaInfo)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A5 11 打坐信息 //tagMCFamilySitInfo:
+        DumpString = '''// A5 03 公会讨伐信息 //tagSCFamilyTaofaInfo:
                                 Cmd:%s,
                                 SubCmd:%s,
-                                ExpRound:%d,
-                                Exp:%d,
-                                ExpPoint:%d
+                                BuZhenState:%d,
+                                AtkCount:%d,
+                                ItemAddCount:%d,
+                                Anger:%d,
+                                BoxUnGetCount:%d,
+                                BoxHurt:%d,
+                                BoxHurtEx:%d,
+                                BoxHurtHis:%d,
+                                BoxHurtHisEx:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
-                                self.ExpRound,
-                                self.Exp,
-                                self.ExpPoint
+                                self.BuZhenState,
+                                self.AtkCount,
+                                self.ItemAddCount,
+                                self.Anger,
+                                self.BoxUnGetCount,
+                                self.BoxHurt,
+                                self.BoxHurtEx,
+                                self.BoxHurtHis,
+                                self.BoxHurtHisEx
                                 )
         return DumpString
 
 
-m_NAtagMCFamilySitInfo=tagMCFamilySitInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilySitInfo.Cmd,m_NAtagMCFamilySitInfo.SubCmd))] = m_NAtagMCFamilySitInfo
+m_NAtagSCFamilyTaofaInfo=tagSCFamilyTaofaInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagSCFamilyTaofaInfo.Cmd,m_NAtagSCFamilyTaofaInfo.SubCmd))] = m_NAtagSCFamilyTaofaInfo
 
 
 #------------------------------------------------------
@@ -12798,125 +12269,6 @@
 
 m_NAtagMCFamilyZhenbaogeInfo=tagMCFamilyZhenbaogeInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyZhenbaogeInfo.Cmd,m_NAtagMCFamilyZhenbaogeInfo.SubCmd))] = m_NAtagMCFamilyZhenbaogeInfo
-
-
-#------------------------------------------------------
-# A5 09 仙盟阵法信息 #tagMCFamilyZhenfaInfo
-
-class  tagMCFamilyZhenfa(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ZhenfaType", c_ubyte),    # 阵法类型
-                  ("ZhenfaLV", c_ushort),    # 阵法等级
-                  ("ZhenfaExp", 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.ZhenfaType = 0
-        self.ZhenfaLV = 0
-        self.ZhenfaExp = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCFamilyZhenfa)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 09 仙盟阵法信息 //tagMCFamilyZhenfaInfo:
-                                ZhenfaType:%d,
-                                ZhenfaLV:%d,
-                                ZhenfaExp:%d
-                                '''\
-                                %(
-                                self.ZhenfaType,
-                                self.ZhenfaLV,
-                                self.ZhenfaExp
-                                )
-        return DumpString
-
-
-class  tagMCFamilyZhenfaInfo(Structure):
-    Head = tagHead()
-    PlayerID = 0    #(DWORD PlayerID)// 当前培养阵法的玩家ID,如果有做自动捐献,需等收到的玩家ID为自己的时候才发送下一个捐献包
-    Count = 0    #(BYTE Count)
-    ZhenfaInfoList = list()    #(vector<tagMCFamilyZhenfa> ZhenfaInfoList)
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x09
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            temZhenfaInfoList = tagMCFamilyZhenfa()
-            _pos = temZhenfaInfoList.ReadData(_lpData, _pos)
-            self.ZhenfaInfoList.append(temZhenfaInfoList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x09
-        self.PlayerID = 0
-        self.Count = 0
-        self.ZhenfaInfoList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 4
-        length += 1
-        for i in range(self.Count):
-            length += self.ZhenfaInfoList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteDWORD(data, self.PlayerID)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteString(data, self.ZhenfaInfoList[i].GetLength(), self.ZhenfaInfoList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                PlayerID:%d,
-                                Count:%d,
-                                ZhenfaInfoList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.PlayerID,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCFamilyZhenfaInfo=tagMCFamilyZhenfaInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFamilyZhenfaInfo.Head.Cmd,m_NAtagMCFamilyZhenfaInfo.Head.SubCmd))] = m_NAtagMCFamilyZhenfaInfo
 
 
 #------------------------------------------------------
@@ -17771,80 +17123,6 @@
 
 m_NAtagGCNotifyEquipDetailInfo=tagGCNotifyEquipDetailInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCNotifyEquipDetailInfo.Head.Cmd,m_NAtagGCNotifyEquipDetailInfo.Head.SubCmd))] = m_NAtagGCNotifyEquipDetailInfo
-
-
-#------------------------------------------------------
-#A9 03 开服活动奖励数量刷新#tagGCOpenServerCampaignAwardCount
-
-class  tagGCOpenServerCampaignAwardCount(Structure):
-    Head = tagHead()
-    CampaignType = 0    #(BYTE CampaignType)//奖励类型
-    AwardTypeCount = 0    #(BYTE AwardTypeCount)//奖品种类数量
-    GotCountList = list()    #(vector<DWORD> GotCountList)//奖品已领取数量列表,根据种类索引依次
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA9
-        self.Head.SubCmd = 0x03
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.CampaignType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.AwardTypeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.AwardTypeCount):
-            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
-            self.GotCountList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA9
-        self.Head.SubCmd = 0x03
-        self.CampaignType = 0
-        self.AwardTypeCount = 0
-        self.GotCountList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 4 * self.AwardTypeCount
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.CampaignType)
-        data = CommFunc.WriteBYTE(data, self.AwardTypeCount)
-        for i in range(self.AwardTypeCount):
-            data = CommFunc.WriteDWORD(data, self.GotCountList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                CampaignType:%d,
-                                AwardTypeCount:%d,
-                                GotCountList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.CampaignType,
-                                self.AwardTypeCount,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagGCOpenServerCampaignAwardCount=tagGCOpenServerCampaignAwardCount()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCOpenServerCampaignAwardCount.Head.Cmd,m_NAtagGCOpenServerCampaignAwardCount.Head.SubCmd))] = m_NAtagGCOpenServerCampaignAwardCount
 
 
 #------------------------------------------------------
@@ -31685,126 +30963,6 @@
 
 m_NAtagMCBossRebornInfo=tagMCBossRebornInfo()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCBossRebornInfo.Head.Cmd,m_NAtagMCBossRebornInfo.Head.SubCmd))] = m_NAtagMCBossRebornInfo
-
-
-#------------------------------------------------------
-# AB 17 开服活动奖励状态 #tagMCOpenServerCampaignAwardList
-
-class  tagMCOpenServerCampaignAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("CampaignType", c_ubyte),    #奖励类型
-                  ("BillAwardRecord", c_ubyte),    #排行奖励是否已领取
-                  ("TagAwardRecord", c_int),    #目标奖励索引位领取记录:0-未领;1-已领
-                  ("RecordData", c_int),    #活动时的记录值,求余亿部分,为了统一逻辑,其他非战力榜的也使用此规则
-                  ("RecordDataEx", c_int),    #活动时的记录值,整除亿部分,1代表1亿
-                  ]
-
-    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.CampaignType = 0
-        self.BillAwardRecord = 0
-        self.TagAwardRecord = 0
-        self.RecordData = 0
-        self.RecordDataEx = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCOpenServerCampaignAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// AB 17 开服活动奖励状态 //tagMCOpenServerCampaignAwardList:
-                                CampaignType:%d,
-                                BillAwardRecord:%d,
-                                TagAwardRecord:%d,
-                                RecordData:%d,
-                                RecordDataEx:%d
-                                '''\
-                                %(
-                                self.CampaignType,
-                                self.BillAwardRecord,
-                                self.TagAwardRecord,
-                                self.RecordData,
-                                self.RecordDataEx
-                                )
-        return DumpString
-
-
-class  tagMCOpenServerCampaignAwardList(Structure):
-    Head = tagHead()
-    OSCAwardCnt = 0    #(BYTE OSCAwardCnt)//奖励类型数
-    OSCAwardList = list()    #(vector<tagMCOpenServerCampaignAward> OSCAwardList)// 奖励状态列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xAB
-        self.Head.SubCmd = 0x17
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.OSCAwardCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.OSCAwardCnt):
-            temOSCAwardList = tagMCOpenServerCampaignAward()
-            _pos = temOSCAwardList.ReadData(_lpData, _pos)
-            self.OSCAwardList.append(temOSCAwardList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xAB
-        self.Head.SubCmd = 0x17
-        self.OSCAwardCnt = 0
-        self.OSCAwardList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        for i in range(self.OSCAwardCnt):
-            length += self.OSCAwardList[i].GetLength()
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.OSCAwardCnt)
-        for i in range(self.OSCAwardCnt):
-            data = CommFunc.WriteString(data, self.OSCAwardList[i].GetLength(), self.OSCAwardList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                OSCAwardCnt:%d,
-                                OSCAwardList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.OSCAwardCnt,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCOpenServerCampaignAwardList=tagMCOpenServerCampaignAwardList()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCOpenServerCampaignAwardList.Head.Cmd,m_NAtagMCOpenServerCampaignAwardList.Head.SubCmd))] = m_NAtagMCOpenServerCampaignAwardList
 
 
 #------------------------------------------------------

--
Gitblit v1.8.0