From db168633a2853111b43c413779a5535228dfe61c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 二月 2026 20:20:24 +0800
Subject: [PATCH] 462 【付费活动】限时冲刺-服务端(轮回殿支持消费货币冲制;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 1141 +++++++++++++++++++-------------------------------------
 1 files changed, 397 insertions(+), 744 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 9cd7499..fa266ef 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -677,6 +677,77 @@
 
 
 #------------------------------------------------------
+# A1 31 前端自定义保存设置内容 #tagCSSettingData
+
+class  tagCSSettingData(Structure):
+    Head = tagHead()
+    KeyNum = 0    #(BYTE KeyNum)// 自定义key编号,后端使用数字key存储,前端自行进行转换定义,限制100个
+    DataLen = 0    #(BYTE DataLen)
+    SetData = ""    #(String SetData)//自定义保存的内容
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA1
+        self.Head.SubCmd = 0x31
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.KeyNum,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.DataLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.SetData,_pos = CommFunc.ReadString(_lpData, _pos,self.DataLen)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA1
+        self.Head.SubCmd = 0x31
+        self.KeyNum = 0
+        self.DataLen = 0
+        self.SetData = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        length += len(self.SetData)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.KeyNum)
+        data = CommFunc.WriteBYTE(data, self.DataLen)
+        data = CommFunc.WriteString(data, self.DataLen, self.SetData)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                KeyNum:%d,
+                                DataLen:%d,
+                                SetData:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.KeyNum,
+                                self.DataLen,
+                                self.SetData
+                                )
+        return DumpString
+
+
+m_NAtagCSSettingData=tagCSSettingData()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSSettingData.Head.Cmd,m_NAtagCSSettingData.Head.SubCmd))] = m_NAtagCSSettingData
+
+
+#------------------------------------------------------
 #A1 03 设置是否成年 #tagCMAdult
 
 class  tagCMAdult(Structure):
@@ -2165,7 +2236,7 @@
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
                   ("PlayerID", c_int),    
-                  ("EquipClassLV", c_ubyte),    #大于0为查看指定境界阶装备信息,  0为查看默认信息
+                  ("ServerID", c_int),    #玩家服务器ID,发0默认本服玩家
                   ]
 
     def __init__(self):
@@ -2183,7 +2254,7 @@
         self.Cmd = 0xA2
         self.SubCmd = 0x12
         self.PlayerID = 0
-        self.EquipClassLV = 0
+        self.ServerID = 0
         return
 
     def GetLength(self):
@@ -2197,13 +2268,13 @@
                                 Cmd:%s,
                                 SubCmd:%s,
                                 PlayerID:%d,
-                                EquipClassLV:%d
+                                ServerID:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.PlayerID,
-                                self.EquipClassLV
+                                self.ServerID
                                 )
         return DumpString
 
@@ -4929,54 +5000,6 @@
 
 
 #------------------------------------------------------
-# A5 46 购买通天令 #tagCMBuyTongTianLing
-
-class  tagCMBuyTongTianLing(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x46
-        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 = 0x46
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMBuyTongTianLing)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 46 购买通天令 //tagCMBuyTongTianLing:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCMBuyTongTianLing=tagCMBuyTongTianLing()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBuyTongTianLing.Cmd,m_NAtagCMBuyTongTianLing.SubCmd))] = m_NAtagCMBuyTongTianLing
-
-
-#------------------------------------------------------
 #A5 3B 请求领取补偿#tagCMRequestCompensation
 
 class  tagCMRequestCompensation(Structure):
@@ -5031,90 +5054,6 @@
 
 m_NAtagCMRequestCompensation=tagCMRequestCompensation()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRequestCompensation.Head.Cmd,m_NAtagCMRequestCompensation.Head.SubCmd))] = m_NAtagCMRequestCompensation
-
-
-#------------------------------------------------------
-# A5 78 符印合成 #tagCMRuneCompound
-
-class  tagCMRuneCompound(Structure):
-    Head = tagHead()
-    Cnt = 0    #(BYTE Cnt)
-    PackList = list()    #(vector<BYTE> PackList)//所在位置 0-背包 1-符印孔
-    IndexList = list()    #(vector<BYTE> IndexList)//物品索引
-    TagItemID = 0    #(DWORD TagItemID)//合成目标物品ID
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x78
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.Cnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Cnt):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.PackList.append(value)
-        for i in range(self.Cnt):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.IndexList.append(value)
-        self.TagItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x78
-        self.Cnt = 0
-        self.PackList = list()
-        self.IndexList = list()
-        self.TagItemID = 0
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1 * self.Cnt
-        length += 1 * self.Cnt
-        length += 4
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.Cnt)
-        for i in range(self.Cnt):
-            data = CommFunc.WriteBYTE(data, self.PackList[i])
-        for i in range(self.Cnt):
-            data = CommFunc.WriteBYTE(data, self.IndexList[i])
-        data = CommFunc.WriteDWORD(data, self.TagItemID)
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Cnt:%d,
-                                PackList:%s,
-                                IndexList:%s,
-                                TagItemID:%d
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Cnt,
-                                "...",
-                                "...",
-                                self.TagItemID
-                                )
-        return DumpString
-
-
-m_NAtagCMRuneCompound=tagCMRuneCompound()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRuneCompound.Head.Cmd,m_NAtagCMRuneCompound.Head.SubCmd))] = m_NAtagCMRuneCompound
 
 
 #------------------------------------------------------
@@ -5955,58 +5894,6 @@
 
 
 #------------------------------------------------------
-# A5 45 兑换通天令等级经验积分点 #tagCMExchangeTongTianLVPoint
-
-class  tagCMExchangeTongTianLVPoint(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ExchangePoint", c_int),    # 兑换点数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x45
-        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 = 0x45
-        self.ExchangePoint = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMExchangeTongTianLVPoint)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 45 兑换通天令等级经验积分点 //tagCMExchangeTongTianLVPoint:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ExchangePoint:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ExchangePoint
-                                )
-        return DumpString
-
-
-m_NAtagCMExchangeTongTianLVPoint=tagCMExchangeTongTianLVPoint()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExchangeTongTianLVPoint.Cmd,m_NAtagCMExchangeTongTianLVPoint.SubCmd))] = m_NAtagCMExchangeTongTianLVPoint
-
-
-#------------------------------------------------------
 # A5 32 法器升级 #tagCMFaQiLVUp
 
 class  tagCMFaQiLVUp(Structure):
@@ -6116,114 +6003,6 @@
 
 m_NAtagCMGetInvestReward=tagCMGetInvestReward()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetInvestReward.Cmd,m_NAtagCMGetInvestReward.SubCmd))] = m_NAtagCMGetInvestReward
-
-
-#------------------------------------------------------
-# A5 44 通天令领取等级奖励 #tagCMGetTongTianLVAward
-
-class  tagCMGetTongTianLVAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("TTLV", c_ubyte),    # 领取对应等级奖励,发255为一键领取所有等级奖励,包含仙品奖励
-                  ("IsXian", c_ubyte),    # 是否领取仙品奖励,仅指定等级奖励有效
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x44
-        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 = 0x44
-        self.TTLV = 0
-        self.IsXian = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGetTongTianLVAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 44 通天令领取等级奖励 //tagCMGetTongTianLVAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TTLV:%d,
-                                IsXian:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TTLV,
-                                self.IsXian
-                                )
-        return DumpString
-
-
-m_NAtagCMGetTongTianLVAward=tagCMGetTongTianLVAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetTongTianLVAward.Cmd,m_NAtagCMGetTongTianLVAward.SubCmd))] = m_NAtagCMGetTongTianLVAward
-
-
-#------------------------------------------------------
-# A5 43 通天令领取任务奖励 #tagCMGetTongTianTaskAward
-
-class  tagCMGetTongTianTaskAward(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("TaskID", c_ubyte),    # 任务ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x43
-        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 = 0x43
-        self.TaskID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMGetTongTianTaskAward)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 43 通天令领取任务奖励 //tagCMGetTongTianTaskAward:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                TaskID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.TaskID
-                                )
-        return DumpString
-
-
-m_NAtagCMGetTongTianTaskAward=tagCMGetTongTianTaskAward()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGetTongTianTaskAward.Cmd,m_NAtagCMGetTongTianTaskAward.SubCmd))] = m_NAtagCMGetTongTianTaskAward
 
 
 #------------------------------------------------------
@@ -6737,227 +6516,6 @@
 
 
 #------------------------------------------------------
-# A5 66 符印分解 #tagCMRuneDecompose
-
-class  tagCMRuneDecompose(Structure):
-    Head = tagHead()
-    IsAll = 0    #(BYTE IsAll)// 是否全部分解,优先级最高,锁定除外
-    QualityCnt = 0    #(BYTE QualityCnt)// 按全部分解品质数
-    QualityList = list()    #(vector<BYTE> QualityList)// 全部分解的品质列表,发送的品质会全部分解,锁定除外
-    Count = 0    #(BYTE Count)// 指定批量分解数,最大不超过50个
-    PlaceIndexList = list()    #(vector<WORD> PlaceIndexList)// 批量分解位置索引列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x66
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.IsAll,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.QualityCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.QualityCnt):
-            value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
-            self.QualityList.append(value)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
-            self.PlaceIndexList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x66
-        self.IsAll = 0
-        self.QualityCnt = 0
-        self.QualityList = list()
-        self.Count = 0
-        self.PlaceIndexList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 1 * self.QualityCnt
-        length += 1
-        length += 2 * self.Count
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.IsAll)
-        data = CommFunc.WriteBYTE(data, self.QualityCnt)
-        for i in range(self.QualityCnt):
-            data = CommFunc.WriteBYTE(data, self.QualityList[i])
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteWORD(data, self.PlaceIndexList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                IsAll:%d,
-                                QualityCnt:%d,
-                                QualityList:%s,
-                                Count:%d,
-                                PlaceIndexList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.IsAll,
-                                self.QualityCnt,
-                                "...",
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMRuneDecompose=tagCMRuneDecompose()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRuneDecompose.Head.Cmd,m_NAtagCMRuneDecompose.Head.SubCmd))] = m_NAtagCMRuneDecompose
-
-
-#------------------------------------------------------
-# A5 67 符印锁定状态变更 #tagCMRuneLock
-
-class  tagCMRuneLock(Structure):
-    Head = tagHead()
-    LockState = 0    #(BYTE LockState)// 锁定状态, 0-锁定,1-解锁
-    Count = 0    #(BYTE Count)// 批量操作数,最大不超过50个
-    PlaceIndexList = list()    #(vector<WORD> PlaceIndexList)// 批量操作位置索引列表
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x67
-        return
-
-    def ReadData(self, _lpData, _pos=0, _Len=0):
-        self.Clear()
-        _pos = self.Head.ReadData(_lpData, _pos)
-        self.LockState,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        for i in range(self.Count):
-            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
-            self.PlaceIndexList.append(value)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA5
-        self.Head.SubCmd = 0x67
-        self.LockState = 0
-        self.Count = 0
-        self.PlaceIndexList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        length += 1
-        length += 2 * self.Count
-
-        return length
-
-    def GetBuffer(self):
-        data = ''
-        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.LockState)
-        data = CommFunc.WriteBYTE(data, self.Count)
-        for i in range(self.Count):
-            data = CommFunc.WriteWORD(data, self.PlaceIndexList[i])
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                LockState:%d,
-                                Count:%d,
-                                PlaceIndexList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.LockState,
-                                self.Count,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagCMRuneLock=tagCMRuneLock()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRuneLock.Head.Cmd,m_NAtagCMRuneLock.Head.SubCmd))] = m_NAtagCMRuneLock
-
-
-#------------------------------------------------------
-# A5 65 符印升级 #tagCMRuneUp
-
-class  tagCMRuneUp(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("PlaceType", c_ubyte),    # 位置类型;0-符印背包,1-符印孔
-                  ("PlaceIndex", c_ushort),    # 位置索引
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x65
-        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 = 0x65
-        self.PlaceType = 0
-        self.PlaceIndex = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMRuneUp)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 65 符印升级 //tagCMRuneUp:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                PlaceType:%d,
-                                PlaceIndex:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.PlaceType,
-                                self.PlaceIndex
-                                )
-        return DumpString
-
-
-m_NAtagCMRuneUp=tagCMRuneUp()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRuneUp.Cmd,m_NAtagCMRuneUp.SubCmd))] = m_NAtagCMRuneUp
-
-
-#------------------------------------------------------
 # A5 16 选择技能五行专精 #tagCMSelectSkillElement
 
 class  tagCMSelectSkillElement(Structure):
@@ -7150,58 +6708,6 @@
 
 m_NAtagCSTreasureWishSelect=tagCSTreasureWishSelect()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSTreasureWishSelect.Head.Cmd,m_NAtagCSTreasureWishSelect.Head.SubCmd))] = m_NAtagCSTreasureWishSelect
-
-
-#------------------------------------------------------
-# A5 13 解锁符印孔 #tagCMUnlockRuneHole
-
-class  tagCMUnlockRuneHole(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("HoleIndex", c_ubyte),    # 孔索引
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA5
-        self.SubCmd = 0x13
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xA5
-        self.SubCmd = 0x13
-        self.HoleIndex = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMUnlockRuneHole)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A5 13 解锁符印孔 //tagCMUnlockRuneHole:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                HoleIndex:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.HoleIndex
-                                )
-        return DumpString
-
-
-m_NAtagCMUnlockRuneHole=tagCMUnlockRuneHole()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnlockRuneHole.Cmd,m_NAtagCMUnlockRuneHole.SubCmd))] = m_NAtagCMUnlockRuneHole
 
 
 #------------------------------------------------------
@@ -8127,6 +7633,62 @@
 
 m_NAtagCMViewFamilyPage=tagCMViewFamilyPage()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMViewFamilyPage.Head.Cmd,m_NAtagCMViewFamilyPage.Head.SubCmd))] = m_NAtagCMViewFamilyPage
+
+
+#------------------------------------------------------
+# A6 19 查看目标公会 #tagCSViewTagFamily
+
+class  tagCSViewTagFamily(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("FamilyID", c_int),    
+                  ("DataServerID", c_int),    #数据所在服务器ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA6
+        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 = 0xA6
+        self.SubCmd = 0x19
+        self.FamilyID = 0
+        self.DataServerID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSViewTagFamily)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A6 19 查看目标公会 //tagCSViewTagFamily:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                FamilyID:%d,
+                                DataServerID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.FamilyID,
+                                self.DataServerID
+                                )
+        return DumpString
+
+
+m_NAtagCSViewTagFamily=tagCSViewTagFamily()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSViewTagFamily.Cmd,m_NAtagCSViewTagFamily.SubCmd))] = m_NAtagCSViewTagFamily
 
 
 #------------------------------------------------------
@@ -11097,6 +10659,62 @@
 
 
 #------------------------------------------------------
+# B2 63 战斗预设切换 #tagCSBatPresetSwitch
+
+class  tagCSBatPresetSwitch(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("BatPresetType", c_ubyte),    #战斗预设类型:1-主线战斗;2-演武场防守;
+                  ("BatPresetID", c_ubyte),    #切换至目标战斗预设ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x63
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x63
+        self.BatPresetType = 0
+        self.BatPresetID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSBatPresetSwitch)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 63 战斗预设切换 //tagCSBatPresetSwitch:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                BatPresetType:%d,
+                                BatPresetID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.BatPresetType,
+                                self.BatPresetID
+                                )
+        return DumpString
+
+
+m_NAtagCSBatPresetSwitch=tagCSBatPresetSwitch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSBatPresetSwitch.Cmd,m_NAtagCSBatPresetSwitch.SubCmd))] = m_NAtagCSBatPresetSwitch
+
+
+#------------------------------------------------------
 # B2 19 红颜激活 #tagCSBeautyActivate
 
 class  tagCSBeautyActivate(Structure):
@@ -11266,6 +10884,200 @@
 
 m_NAtagCSBeautySkinOP=tagCSBeautySkinOP()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSBeautySkinOP.Cmd,m_NAtagCSBeautySkinOP.SubCmd))] = m_NAtagCSBeautySkinOP
+
+
+#------------------------------------------------------
+# B2 62 功能预设切换 #tagCSFuncPresetSwitch
+
+class  tagCSFuncPresetSwitch(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("BatPresetID", c_ubyte),    #所属战斗预设ID
+                  ("FuncPresetType", c_ubyte),    #预设类型,2-阵容;3-命格;
+                  ("PresetID", c_ubyte),    #本功能切换至目标预设ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x62
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x62
+        self.BatPresetID = 0
+        self.FuncPresetType = 0
+        self.PresetID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSFuncPresetSwitch)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 62 功能预设切换 //tagCSFuncPresetSwitch:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                BatPresetID:%d,
+                                FuncPresetType:%d,
+                                PresetID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.BatPresetID,
+                                self.FuncPresetType,
+                                self.PresetID
+                                )
+        return DumpString
+
+
+m_NAtagCSFuncPresetSwitch=tagCSFuncPresetSwitch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetSwitch.Cmd,m_NAtagCSFuncPresetSwitch.SubCmd))] = m_NAtagCSFuncPresetSwitch
+
+
+#------------------------------------------------------
+# B2 60 功能预设解锁 #tagCSFuncPresetUnlock
+
+class  tagCSFuncPresetUnlock(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("FuncPresetType", c_ubyte),    #预设类型,1-全局;2-阵容;3-命格;
+                  ("PresetID", c_ubyte),    #预设ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB2
+        self.SubCmd = 0x60
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB2
+        self.SubCmd = 0x60
+        self.FuncPresetType = 0
+        self.PresetID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCSFuncPresetUnlock)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B2 60 功能预设解锁 //tagCSFuncPresetUnlock:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                FuncPresetType:%d,
+                                PresetID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.FuncPresetType,
+                                self.PresetID
+                                )
+        return DumpString
+
+
+m_NAtagCSFuncPresetUnlock=tagCSFuncPresetUnlock()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetUnlock.Cmd,m_NAtagCSFuncPresetUnlock.SubCmd))] = m_NAtagCSFuncPresetUnlock
+
+
+#------------------------------------------------------
+# B2 61 功能预设改名 #tagCSFuncPresetUpdName
+
+class  tagCSFuncPresetUpdName(Structure):
+    Head = tagHead()
+    FuncPresetType = 0    #(BYTE FuncPresetType)//预设类型,1-全局;2-阵容;3-命格;
+    PresetID = 0    #(BYTE PresetID)//预设ID
+    NameLen = 0    #(BYTE NameLen)
+    PresetName = ""    #(String PresetName)//预设名称
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB2
+        self.Head.SubCmd = 0x61
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.FuncPresetType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.PresetID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.PresetName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB2
+        self.Head.SubCmd = 0x61
+        self.FuncPresetType = 0
+        self.PresetID = 0
+        self.NameLen = 0
+        self.PresetName = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += 1
+        length += 1
+        length += len(self.PresetName)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.FuncPresetType)
+        data = CommFunc.WriteBYTE(data, self.PresetID)
+        data = CommFunc.WriteBYTE(data, self.NameLen)
+        data = CommFunc.WriteString(data, self.NameLen, self.PresetName)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                FuncPresetType:%d,
+                                PresetID:%d,
+                                NameLen:%d,
+                                PresetName:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.FuncPresetType,
+                                self.PresetID,
+                                self.NameLen,
+                                self.PresetName
+                                )
+        return DumpString
+
+
+m_NAtagCSFuncPresetUpdName=tagCSFuncPresetUpdName()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSFuncPresetUpdName.Head.Cmd,m_NAtagCSFuncPresetUpdName.Head.SubCmd))] = m_NAtagCSFuncPresetUpdName
 
 
 #------------------------------------------------------
@@ -13812,9 +13624,9 @@
 
 
 #------------------------------------------------------
-# B4 12 战斗阵容保存 #tagCSHeroLineupSave
+# B4 12 战斗阵容预设保存 #tagCSHeroPresetSave
 
-class  tagCSHeroLineupPos(Structure):
+class  tagCSHeroPresetPos(Structure):
     _pack_ = 1
     _fields_ = [
                   ("ItemIndex", c_ushort),    #武将物品所在武将背包位置索引
@@ -13836,13 +13648,13 @@
         return
 
     def GetLength(self):
-        return sizeof(tagCSHeroLineupPos)
+        return sizeof(tagCSHeroPresetPos)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// B4 12 战斗阵容保存 //tagCSHeroLineupSave:
+        DumpString = '''// B4 12 战斗阵容预设保存 //tagCSHeroPresetSave:
                                 ItemIndex:%d,
                                 PosNum:%d
                                 '''\
@@ -13853,12 +13665,11 @@
         return DumpString
 
 
-class  tagCSHeroLineupSave(Structure):
+class  tagCSHeroPresetSave(Structure):
     Head = tagHead()
-    LineupID = 0    #(BYTE LineupID)//阵容ID:1-主阵容;其他待扩展,如某个防守阵容
-    ShapeType = 0    #(BYTE ShapeType)//本阵容阵型,0为默认阵型,可扩展不同的阵型
+    PresetID = 0    #(BYTE PresetID)//阵容方案预设ID
     PosCnt = 0    #(BYTE PosCnt)
-    HeroPosList = list()    #(vector<tagCSHeroLineupPos> HeroPosList)// 保存的阵容,只发送最终的阵容武将位置即可
+    HeroPosList = list()    #(vector<tagCSHeroPresetPos> HeroPosList)// 保存的阵容,只发送最终的阵容武将位置即可
     data = None
 
     def __init__(self):
@@ -13870,11 +13681,10 @@
     def ReadData(self, _lpData, _pos=0, _Len=0):
         self.Clear()
         _pos = self.Head.ReadData(_lpData, _pos)
-        self.LineupID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
-        self.ShapeType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.PresetID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         self.PosCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos)
         for i in range(self.PosCnt):
-            temHeroPosList = tagCSHeroLineupPos()
+            temHeroPosList = tagCSHeroPresetPos()
             _pos = temHeroPosList.ReadData(_lpData, _pos)
             self.HeroPosList.append(temHeroPosList)
         return _pos
@@ -13884,8 +13694,7 @@
         self.Head.Clear()
         self.Head.Cmd = 0xB4
         self.Head.SubCmd = 0x12
-        self.LineupID = 0
-        self.ShapeType = 0
+        self.PresetID = 0
         self.PosCnt = 0
         self.HeroPosList = list()
         return
@@ -13893,7 +13702,6 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
-        length += 1
         length += 1
         length += 1
         for i in range(self.PosCnt):
@@ -13904,8 +13712,7 @@
     def GetBuffer(self):
         data = ''
         data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
-        data = CommFunc.WriteBYTE(data, self.LineupID)
-        data = CommFunc.WriteBYTE(data, self.ShapeType)
+        data = CommFunc.WriteBYTE(data, self.PresetID)
         data = CommFunc.WriteBYTE(data, self.PosCnt)
         for i in range(self.PosCnt):
             data = CommFunc.WriteString(data, self.HeroPosList[i].GetLength(), self.HeroPosList[i].GetBuffer())
@@ -13914,23 +13721,21 @@
     def OutputString(self):
         DumpString = '''
                                 Head:%s,
-                                LineupID:%d,
-                                ShapeType:%d,
+                                PresetID:%d,
                                 PosCnt:%d,
                                 HeroPosList:%s
                                 '''\
                                 %(
                                 self.Head.OutputString(),
-                                self.LineupID,
-                                self.ShapeType,
+                                self.PresetID,
                                 self.PosCnt,
                                 "..."
                                 )
         return DumpString
 
 
-m_NAtagCSHeroLineupSave=tagCSHeroLineupSave()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroLineupSave.Head.Cmd,m_NAtagCSHeroLineupSave.Head.SubCmd))] = m_NAtagCSHeroLineupSave
+m_NAtagCSHeroPresetSave=tagCSHeroPresetSave()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCSHeroPresetSave.Head.Cmd,m_NAtagCSHeroPresetSave.Head.SubCmd))] = m_NAtagCSHeroPresetSave
 
 
 #------------------------------------------------------
@@ -16920,106 +16725,6 @@
 
 
 #------------------------------------------------------
-# C0 06 查询幸运云购开奖记录 #tagCGQueryLuckyCloudBuyLotteryRec
-
-class  tagCGQueryLuckyCloudBuyLotteryRec(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("ZoneID", c_ubyte),    #查询分区ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xC0
-        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 = 0xC0
-        self.SubCmd = 0x06
-        self.ZoneID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCGQueryLuckyCloudBuyLotteryRec)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// C0 06 查询幸运云购开奖记录 //tagCGQueryLuckyCloudBuyLotteryRec:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                ZoneID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.ZoneID
-                                )
-        return DumpString
-
-
-m_NAtagCGQueryLuckyCloudBuyLotteryRec=tagCGQueryLuckyCloudBuyLotteryRec()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryLuckyCloudBuyLotteryRec.Cmd,m_NAtagCGQueryLuckyCloudBuyLotteryRec.SubCmd))] = m_NAtagCGQueryLuckyCloudBuyLotteryRec
-
-
-#------------------------------------------------------
-# C0 05 查询幸运云购购买号码记录 #tagCGQueryLuckyCloudBuyNumRec
-
-class  tagCGQueryLuckyCloudBuyNumRec(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xC0
-        self.SubCmd = 0x05
-        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 = 0xC0
-        self.SubCmd = 0x05
-        return
-
-    def GetLength(self):
-        return sizeof(tagCGQueryLuckyCloudBuyNumRec)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// C0 05 查询幸运云购购买号码记录 //tagCGQueryLuckyCloudBuyNumRec:
-                                Cmd:%s,
-                                SubCmd:%s
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd
-                                )
-        return DumpString
-
-
-m_NAtagCGQueryLuckyCloudBuyNumRec=tagCGQueryLuckyCloudBuyNumRec()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryLuckyCloudBuyNumRec.Cmd,m_NAtagCGQueryLuckyCloudBuyNumRec.SubCmd))] = m_NAtagCGQueryLuckyCloudBuyNumRec
-
-
-#------------------------------------------------------
 # C0 04 查看跨服排行榜 #tagCGViewCrossBillboard
 
 class  tagCGViewCrossBillboard(Structure):
@@ -18067,56 +17772,4 @@
 
 
 m_NAtagCMFamilyGCZSQ=tagCMFamilyGCZSQ()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyGCZSQ.Cmd,m_NAtagCMFamilyGCZSQ.SubCmd))] = m_NAtagCMFamilyGCZSQ
-
-
-#------------------------------------------------------
-# C1 10 幸运云购购买 #tagCMLuckyCloudBuy
-
-class  tagCMLuckyCloudBuy(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("BuyCount", c_ushort),    # 购买份数
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xC1
-        self.SubCmd = 0x10
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.Cmd = 0xC1
-        self.SubCmd = 0x10
-        self.BuyCount = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCMLuckyCloudBuy)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// C1 10 幸运云购购买 //tagCMLuckyCloudBuy:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                BuyCount:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.BuyCount
-                                )
-        return DumpString
-
-
-m_NAtagCMLuckyCloudBuy=tagCMLuckyCloudBuy()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMLuckyCloudBuy.Cmd,m_NAtagCMLuckyCloudBuy.SubCmd))] = m_NAtagCMLuckyCloudBuy
\ No newline at end of file
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyGCZSQ.Cmd,m_NAtagCMFamilyGCZSQ.SubCmd))] = m_NAtagCMFamilyGCZSQ
\ No newline at end of file

--
Gitblit v1.8.0