From 021437fc736fafdb8608933ebe095b93cfb9b8ed Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 七月 2024 19:31:05 +0800
Subject: [PATCH] 10192 【越南】【主干】【港台】【砍树】上线增加膜拜主动推送(修改为可膜拜自己;)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 1163 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,094 insertions(+), 69 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 4a1280f..f396f18 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -706,58 +706,6 @@
 
 
 #------------------------------------------------------
-# A4 05 开启家族boss副本 #tagCGOpenFamilyBossFB
-
-class  tagCGOpenFamilyBossFB(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("Cmd", c_ubyte),
-                  ("SubCmd", c_ubyte),
-                  ("MapID", c_int),    # 开启的副本地图ID
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        self.Cmd = 0xA4
-        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 = 0xA4
-        self.SubCmd = 0x05
-        self.MapID = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagCGOpenFamilyBossFB)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A4 05 开启家族boss副本 //tagCGOpenFamilyBossFB:
-                                Cmd:%s,
-                                SubCmd:%s,
-                                MapID:%d
-                                '''\
-                                %(
-                                self.Cmd,
-                                self.SubCmd,
-                                self.MapID
-                                )
-        return DumpString
-
-
-m_NAtagCGOpenFamilyBossFB=tagCGOpenFamilyBossFB()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGOpenFamilyBossFB.Cmd,m_NAtagCGOpenFamilyBossFB.SubCmd))] = m_NAtagCGOpenFamilyBossFB
-
-
-#------------------------------------------------------
 # A4 04 创建家族 #tagCGPyCreatFamily
 
 class  tagCGPyCreatFamily(Structure):
@@ -1137,7 +1085,7 @@
                   ("Type", c_ubyte),    #类型 TBillboardType
                   ("StartIndex", c_int),    #查看的起始名次索引, 默认0
                   ("WatchCnt", c_ubyte),    #查看条数,默认20,最大不超过100
-                  ("IsWatchSelf", c_ubyte),    #是否查看自己名次前后,默认10条数据
+                  ("WatchID", c_int),    #查看指定ID名次前后,如玩家ID、家族ID等
                   ]
 
     def __init__(self):
@@ -1157,7 +1105,7 @@
         self.Type = 0
         self.StartIndex = 0
         self.WatchCnt = 0
-        self.IsWatchSelf = 0
+        self.WatchID = 0
         return
 
     def GetLength(self):
@@ -1173,7 +1121,7 @@
                                 Type:%d,
                                 StartIndex:%d,
                                 WatchCnt:%d,
-                                IsWatchSelf:%d
+                                WatchID:%d
                                 '''\
                                 %(
                                 self.Cmd,
@@ -1181,7 +1129,7 @@
                                 self.Type,
                                 self.StartIndex,
                                 self.WatchCnt,
-                                self.IsWatchSelf
+                                self.WatchID
                                 )
         return DumpString
 
@@ -2169,6 +2117,110 @@
 
 
 #------------------------------------------------------
+# B0 34 福地请求结算奖励 #tagCGMineAreaAwardGet
+
+class  tagCGMineAreaAwardGet(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x34
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x34
+        return
+
+    def GetLength(self):
+        return sizeof(tagCGMineAreaAwardGet)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 34 福地请求结算奖励 //tagCGMineAreaAwardGet:
+                                Cmd:%s,
+                                SubCmd:%s
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd
+                                )
+        return DumpString
+
+
+m_NAtagCGMineAreaAwardGet=tagCGMineAreaAwardGet()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMineAreaAwardGet.Cmd,m_NAtagCGMineAreaAwardGet.SubCmd))] = m_NAtagCGMineAreaAwardGet
+
+
+#------------------------------------------------------
+# B0 33 福地查看 #tagCGMineAreaView
+
+class  tagCGMineAreaView(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("QueryType", c_ubyte),    # 查询同步类型:0-后端主动同步;1-查看指定福地;2-查看道友福地列表;3-查看周围随机福地列表;4-退出他人福地;5-查看记录
+                  ("QueryValue", c_int),    # 查询值,类型1时-发送目标玩家ID;3时-发送是否重新随机
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x33
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x33
+        self.QueryType = 0
+        self.QueryValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCGMineAreaView)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 33 福地查看 //tagCGMineAreaView:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                QueryType:%d,
+                                QueryValue:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.QueryType,
+                                self.QueryValue
+                                )
+        return DumpString
+
+
+m_NAtagCGMineAreaView=tagCGMineAreaView()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGMineAreaView.Cmd,m_NAtagCGMineAreaView.SubCmd))] = m_NAtagCGMineAreaView
+
+
+#------------------------------------------------------
 #B0 25 请求家族悬赏任务完成情况 #tagQueryFamilyArrestOverState
 
 class  tagQueryFamilyArrestOverState(Structure):
@@ -2327,6 +2379,66 @@
 
 m_NAtagCGUseAssistThanksGift=tagCGUseAssistThanksGift()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGUseAssistThanksGift.Cmd,m_NAtagCGUseAssistThanksGift.SubCmd))] = m_NAtagCGUseAssistThanksGift
+
+
+#------------------------------------------------------
+# B0 20 请求膜拜玩家 #tagCGWorship
+
+class  tagCGWorship(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("PlayerID", c_int),    # 目标玩家ID
+                  ("WorshipType", c_ubyte),    # 膜拜类型
+                  ("WorshipValue", c_int),    # 膜拜类型对应的功能值,如名次或其他,由具体膜拜类型定义对应值含义
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x20
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x20
+        self.PlayerID = 0
+        self.WorshipType = 0
+        self.WorshipValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCGWorship)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 20 请求膜拜玩家 //tagCGWorship:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                PlayerID:%d,
+                                WorshipType:%d,
+                                WorshipValue:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.PlayerID,
+                                self.WorshipType,
+                                self.WorshipValue
+                                )
+        return DumpString
+
+
+m_NAtagCGWorship=tagCGWorship()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGWorship.Cmd,m_NAtagCGWorship.SubCmd))] = m_NAtagCGWorship
 
 
 #------------------------------------------------------
@@ -4561,6 +4673,9 @@
                   ("Type", c_ubyte),    #榜单类型
                   ("GroupValue1", c_ubyte),    # 分组值1
                   ("GroupValue2", c_ubyte),    # 分组值2,与分组值1组合归为同组榜单数据
+                  ("StartIndex", c_int),    #查看的起始名次索引, 默认0
+                  ("WatchCnt", c_ubyte),    #查看条数,默认20,最大不超过100
+                  ("WatchID", c_int),    #查看指定ID名次前后,如玩家ID、家族ID等
                   ]
 
     def __init__(self):
@@ -4580,6 +4695,9 @@
         self.Type = 0
         self.GroupValue1 = 0
         self.GroupValue2 = 0
+        self.StartIndex = 0
+        self.WatchCnt = 0
+        self.WatchID = 0
         return
 
     def GetLength(self):
@@ -4594,14 +4712,20 @@
                                 SubCmd:%s,
                                 Type:%d,
                                 GroupValue1:%d,
-                                GroupValue2:%d
+                                GroupValue2:%d,
+                                StartIndex:%d,
+                                WatchCnt:%d,
+                                WatchID:%d
                                 '''\
                                 %(
                                 self.Cmd,
                                 self.SubCmd,
                                 self.Type,
                                 self.GroupValue1,
-                                self.GroupValue2
+                                self.GroupValue2,
+                                self.StartIndex,
+                                self.WatchCnt,
+                                self.WatchID
                                 )
         return DumpString
 
@@ -4775,6 +4899,144 @@
 
 
 #------------------------------------------------------
+# A1 25 代币购买充值商品编号商品 #tagCMCoinBuyOrderInfo
+
+class  tagCMCoinBuyOrderInfo(Structure):
+    Head = tagHead()
+    AppIDLen = 0    #(BYTE AppIDLen)
+    AppID = ""    #(String AppID)
+    OrderInfoLen = 0    #(BYTE OrderInfoLen)
+    OrderInfo = ""    #(String OrderInfo)//商品编号
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xA1
+        self.Head.SubCmd = 0x25
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.AppIDLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.AppID,_pos = CommFunc.ReadString(_lpData, _pos,self.AppIDLen)
+        self.OrderInfoLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.OrderInfo,_pos = CommFunc.ReadString(_lpData, _pos,self.OrderInfoLen)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xA1
+        self.Head.SubCmd = 0x25
+        self.AppIDLen = 0
+        self.AppID = ""
+        self.OrderInfoLen = 0
+        self.OrderInfo = ""
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 1
+        length += len(self.AppID)
+        length += 1
+        length += len(self.OrderInfo)
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteBYTE(data, self.AppIDLen)
+        data = CommFunc.WriteString(data, self.AppIDLen, self.AppID)
+        data = CommFunc.WriteBYTE(data, self.OrderInfoLen)
+        data = CommFunc.WriteString(data, self.OrderInfoLen, self.OrderInfo)
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                AppIDLen:%d,
+                                AppID:%s,
+                                OrderInfoLen:%d,
+                                OrderInfo:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.AppIDLen,
+                                self.AppID,
+                                self.OrderInfoLen,
+                                self.OrderInfo
+                                )
+        return DumpString
+
+
+m_NAtagCMCoinBuyOrderInfo=tagCMCoinBuyOrderInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCoinBuyOrderInfo.Head.Cmd,m_NAtagCMCoinBuyOrderInfo.Head.SubCmd))] = m_NAtagCMCoinBuyOrderInfo
+
+
+#------------------------------------------------------
+# A1 20 货币兑换 #tagCMMoneyExchange
+
+class  tagCMMoneyExchange(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("SrcMoneyType", c_ubyte),    # 源货币类型
+                  ("TagMoneyType", c_ubyte),    # 目标货币类型
+                  ("ExchangeValue", c_int),    # 兑换数量(消耗源货币的数量)
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA1
+        self.SubCmd = 0x20
+        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 = 0xA1
+        self.SubCmd = 0x20
+        self.SrcMoneyType = 0
+        self.TagMoneyType = 0
+        self.ExchangeValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMMoneyExchange)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A1 20 货币兑换 //tagCMMoneyExchange:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                SrcMoneyType:%d,
+                                TagMoneyType:%d,
+                                ExchangeValue:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.SrcMoneyType,
+                                self.TagMoneyType,
+                                self.ExchangeValue
+                                )
+        return DumpString
+
+
+m_NAtagCMMoneyExchange=tagCMMoneyExchange()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMoneyExchange.Cmd,m_NAtagCMMoneyExchange.SubCmd))] = m_NAtagCMMoneyExchange
+
+
+#------------------------------------------------------
 # A1 01 玩家电脑信息 #tagCMPCInfo
 
 class  tagCMPCInfo(Structure):
@@ -4902,7 +5164,7 @@
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
-                  ("RecordID", c_ubyte),    #充值记录ID,也就是充值ID,发0则查全部
+                  ("RecordID", c_ushort),    #充值记录ID,也就是充值ID,发0则查全部
                   ]
 
     def __init__(self):
@@ -4992,6 +5254,62 @@
 
 m_NAtagCMRefreshMainServerRole=tagCMRefreshMainServerRole()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshMainServerRole.Cmd,m_NAtagCMRefreshMainServerRole.SubCmd))] = m_NAtagCMRefreshMainServerRole
+
+
+#------------------------------------------------------
+# A1 26 充值自选物品选择 #tagCMSelectCTGItem
+
+class  tagCMSelectCTGItem(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("RecordID", c_ushort),    #充值ID
+                  ("SelectItemValue", c_int),    # 自选物品索引值,每两位存储每个自选索引对应选择的物品索引+1,存储位值为0代表未选择,最多支持选择4种物品
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA1
+        self.SubCmd = 0x26
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xA1
+        self.SubCmd = 0x26
+        self.RecordID = 0
+        self.SelectItemValue = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMSelectCTGItem)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A1 26 充值自选物品选择 //tagCMSelectCTGItem:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                RecordID:%d,
+                                SelectItemValue:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.RecordID,
+                                self.SelectItemValue
+                                )
+        return DumpString
+
+
+m_NAtagCMSelectCTGItem=tagCMSelectCTGItem()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSelectCTGItem.Cmd,m_NAtagCMSelectCTGItem.SubCmd))] = m_NAtagCMSelectCTGItem
 
 
 #------------------------------------------------------
@@ -11946,6 +12264,58 @@
 
 
 #------------------------------------------------------
+# A5 35 坐骑升星 #tagCMHorseStarUp
+
+class  tagCMHorseStarUp(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("HorseID", c_int),    #坐骑ID,对应坐骑表ID
+                  ]
+
+    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.HorseID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMHorseStarUp)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 35 坐骑升星 //tagCMHorseStarUp:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                HorseID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.HorseID
+                                )
+        return DumpString
+
+
+m_NAtagCMHorseStarUp=tagCMHorseStarUp()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorseStarUp.Cmd,m_NAtagCMHorseStarUp.SubCmd))] = m_NAtagCMHorseStarUp
+
+
+#------------------------------------------------------
 # A5 31 坐骑培养 #tagCMHorseTrain
 
 class  tagCMHorseTrain(Structure):
@@ -13417,6 +13787,58 @@
 
 
 #------------------------------------------------------
+# A5 36 称号升星 #tagCMTitleStarUp
+
+class  tagCMTitleStarUp(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("TitleID", c_int),    #称号ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA5
+        self.SubCmd = 0x36
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xA5
+        self.SubCmd = 0x36
+        self.TitleID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMTitleStarUp)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 36 称号升星 //tagCMTitleStarUp:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                TitleID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.TitleID
+                                )
+        return DumpString
+
+
+m_NAtagCMTitleStarUp=tagCMTitleStarUp()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTitleStarUp.Cmd,m_NAtagCMTitleStarUp.SubCmd))] = m_NAtagCMTitleStarUp
+
+
+#------------------------------------------------------
 # A5 11 试用首充武器 #tagCMTryFirstGoldItem
 
 class  tagCMTryFirstGoldItem(Structure):
@@ -13741,6 +14163,66 @@
 
 
 #------------------------------------------------------
+# A6 15 传功操作 #tagCMChuangongOP
+
+class  tagCMChuangongOP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("OPType", c_ubyte),    # 操作类型:1-邀请;2-回应;3-领奖;
+                  ("PlayerID", c_int),    # 目标玩家ID;回应时为邀请方玩家ID
+                  ("OPData", c_ubyte),    # 操作数据,可选:回应时为是否同意
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA6
+        self.SubCmd = 0x15
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xA6
+        self.SubCmd = 0x15
+        self.OPType = 0
+        self.PlayerID = 0
+        self.OPData = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMChuangongOP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A6 15 传功操作 //tagCMChuangongOP:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                OPType:%d,
+                                PlayerID:%d,
+                                OPData:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.OPType,
+                                self.PlayerID,
+                                self.OPData
+                                )
+        return DumpString
+
+
+m_NAtagCMChuangongOP=tagCMChuangongOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMChuangongOP.Cmd,m_NAtagCMChuangongOP.SubCmd))] = m_NAtagCMChuangongOP
+
+
+#------------------------------------------------------
 # A6 11 家族改名 #tagCMRenameFamily
 
 class  tagCMRenameFamily(Structure):
@@ -13889,19 +14371,21 @@
 
 
 #------------------------------------------------------
-# A6 05  家族捐献兽粮 #tagCMFamilyDonate
+# A6 13 家族事务操作 #tagCMFamilyAffairOP
 
-class  tagCMFamilyDonate(Structure):
+class  tagCMFamilyAffairOP(Structure):
     _pack_ = 1
     _fields_ = [
                   ("Cmd", c_ubyte),
                   ("SubCmd", c_ubyte),
+                  ("OPType", c_ubyte),    # 操作类型:1-刷新事务;2-开始事务;3-领取事务奖励;
+                  ("AffairID", c_ushort),    # 事务ID,可选
                   ]
 
     def __init__(self):
         self.Clear()
         self.Cmd = 0xA6
-        self.SubCmd = 0x05
+        self.SubCmd = 0x13
         return
 
     def ReadData(self, stringData, _pos=0, _len=0):
@@ -13911,29 +14395,87 @@
 
     def Clear(self):
         self.Cmd = 0xA6
-        self.SubCmd = 0x05
+        self.SubCmd = 0x13
+        self.OPType = 0
+        self.AffairID = 0
         return
 
     def GetLength(self):
-        return sizeof(tagCMFamilyDonate)
+        return sizeof(tagCMFamilyAffairOP)
 
     def GetBuffer(self):
         return string_at(addressof(self), self.GetLength())
 
     def OutputString(self):
-        DumpString = '''// A6 05  家族捐献兽粮 //tagCMFamilyDonate:
+        DumpString = '''// A6 13 家族事务操作 //tagCMFamilyAffairOP:
                                 Cmd:%s,
-                                SubCmd:%s
+                                SubCmd:%s,
+                                OPType:%d,
+                                AffairID:%d
                                 '''\
                                 %(
                                 self.Cmd,
-                                self.SubCmd
+                                self.SubCmd,
+                                self.OPType,
+                                self.AffairID
                                 )
         return DumpString
 
 
-m_NAtagCMFamilyDonate=tagCMFamilyDonate()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyDonate.Cmd,m_NAtagCMFamilyDonate.SubCmd))] = m_NAtagCMFamilyDonate
+m_NAtagCMFamilyAffairOP=tagCMFamilyAffairOP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyAffairOP.Cmd,m_NAtagCMFamilyAffairOP.SubCmd))] = m_NAtagCMFamilyAffairOP
+
+
+#------------------------------------------------------
+# A6 12 家族捐献货币 #tagCMFamilyMoneyDonate
+
+class  tagCMFamilyMoneyDonate(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("MoneyType", c_ubyte),    # 捐献货币类型
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA6
+        self.SubCmd = 0x12
+        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 = 0x12
+        self.MoneyType = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMFamilyMoneyDonate)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A6 12 家族捐献货币 //tagCMFamilyMoneyDonate:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                MoneyType:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.MoneyType
+                                )
+        return DumpString
+
+
+m_NAtagCMFamilyMoneyDonate=tagCMFamilyMoneyDonate()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyMoneyDonate.Cmd,m_NAtagCMFamilyMoneyDonate.SubCmd))] = m_NAtagCMFamilyMoneyDonate
 
 
 #------------------------------------------------------
@@ -14046,6 +14588,66 @@
 
 m_NAtagCMFamilyStoreExchange=tagCMFamilyStoreExchange()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyStoreExchange.Cmd,m_NAtagCMFamilyStoreExchange.SubCmd))] = m_NAtagCMFamilyStoreExchange
+
+
+#------------------------------------------------------
+# A6 14 家族阵法升级 #tagCMFamilyZhenfaLVUP
+
+class  tagCMFamilyZhenfaLVUP(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("ZhenfaType", c_ubyte),    # 阵法类型
+                  ("ItemID", c_int),    # 消耗的物品ID
+                  ("ItemCount", c_ushort),    # 消耗个数,默认1
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA6
+        self.SubCmd = 0x14
+        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 = 0x14
+        self.ZhenfaType = 0
+        self.ItemID = 0
+        self.ItemCount = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMFamilyZhenfaLVUP)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A6 14 家族阵法升级 //tagCMFamilyZhenfaLVUP:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                ZhenfaType:%d,
+                                ItemID:%d,
+                                ItemCount:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.ZhenfaType,
+                                self.ItemID,
+                                self.ItemCount
+                                )
+        return DumpString
+
+
+m_NAtagCMFamilyZhenfaLVUP=tagCMFamilyZhenfaLVUP()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFamilyZhenfaLVUP.Cmd,m_NAtagCMFamilyZhenfaLVUP.SubCmd))] = m_NAtagCMFamilyZhenfaLVUP
 
 
 #------------------------------------------------------
@@ -14406,6 +15008,58 @@
 
 
 #------------------------------------------------------
+# A7 06 宠物升星 #tagCMPetStarUp
+
+class  tagCMPetStarUp(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("PetItemIndex", c_ubyte),    #宠物数据背包索引
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA7
+        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 = 0xA7
+        self.SubCmd = 0x06
+        self.PetItemIndex = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMPetStarUp)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A7 06 宠物升星 //tagCMPetStarUp:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                PetItemIndex:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.PetItemIndex
+                                )
+        return DumpString
+
+
+m_NAtagCMPetStarUp=tagCMPetStarUp()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMPetStarUp.Cmd,m_NAtagCMPetStarUp.SubCmd))] = m_NAtagCMPetStarUp
+
+
+#------------------------------------------------------
 # A7 05 宠物培养 #tagCMPetTrain
 
 class  tagCMPetTrain(Structure):
@@ -14715,6 +15369,118 @@
 
 m_NAtagCMVIPKillNPCLVInfoSwitch=tagCMVIPKillNPCLVInfoSwitch()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMVIPKillNPCLVInfoSwitch.Cmd,m_NAtagCMVIPKillNPCLVInfoSwitch.SubCmd))] = m_NAtagCMVIPKillNPCLVInfoSwitch
+
+
+#------------------------------------------------------
+# AA 24 Boss历练领奖 #tagCMActBossTrialGetAward
+
+class  tagCMActBossTrialGetAward(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("ActNum", c_ubyte),    #活动编号
+                  ("SubmitCount", c_ushort),    #领取凭证个数对应奖励
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xAA
+        self.SubCmd = 0x24
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xAA
+        self.SubCmd = 0x24
+        self.ActNum = 0
+        self.SubmitCount = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMActBossTrialGetAward)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 24 Boss历练领奖 //tagCMActBossTrialGetAward:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                ActNum:%d,
+                                SubmitCount:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.ActNum,
+                                self.SubmitCount
+                                )
+        return DumpString
+
+
+m_NAtagCMActBossTrialGetAward=tagCMActBossTrialGetAward()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActBossTrialGetAward.Cmd,m_NAtagCMActBossTrialGetAward.SubCmd))] = m_NAtagCMActBossTrialGetAward
+
+
+#------------------------------------------------------
+# AA 23 Boss历练提交凭证 #tagCMActBossTrialSubmit
+
+class  tagCMActBossTrialSubmit(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("ActNum", c_ubyte),    #活动编号
+                  ("SubmitCount", c_ushort),    #提交凭证个数
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xAA
+        self.SubCmd = 0x23
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xAA
+        self.SubCmd = 0x23
+        self.ActNum = 0
+        self.SubmitCount = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMActBossTrialSubmit)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AA 23 Boss历练提交凭证 //tagCMActBossTrialSubmit:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                ActNum:%d,
+                                SubmitCount:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.ActNum,
+                                self.SubmitCount
+                                )
+        return DumpString
+
+
+m_NAtagCMActBossTrialSubmit=tagCMActBossTrialSubmit()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActBossTrialSubmit.Cmd,m_NAtagCMActBossTrialSubmit.SubCmd))] = m_NAtagCMActBossTrialSubmit
 
 
 #------------------------------------------------------
@@ -16804,6 +17570,170 @@
 
 m_NAtagCMDoFish=tagCMDoFish()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDoFish.Cmd,m_NAtagCMDoFish.SubCmd))] = m_NAtagCMDoFish
+
+
+#------------------------------------------------------
+# B0 30 福地物品拉 #tagCMMineItemPull
+
+class  tagCMMineItemPull(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("PlayerID", c_int),    # 福地所属玩家ID,0默认自己
+                  ("ItemIndex", c_ubyte),    # 物品所在位置索引0~n
+                  ("WorkerCount", c_ubyte),    # 上工人人数
+                  ("IsPreview", c_ubyte),    # 是否预览;0-直接拉,1-预览大概时间
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x30
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x30
+        self.PlayerID = 0
+        self.ItemIndex = 0
+        self.WorkerCount = 0
+        self.IsPreview = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMMineItemPull)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 30 福地物品拉 //tagCMMineItemPull:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                PlayerID:%d,
+                                ItemIndex:%d,
+                                WorkerCount:%d,
+                                IsPreview:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.PlayerID,
+                                self.ItemIndex,
+                                self.WorkerCount,
+                                self.IsPreview
+                                )
+        return DumpString
+
+
+m_NAtagCMMineItemPull=tagCMMineItemPull()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineItemPull.Cmd,m_NAtagCMMineItemPull.SubCmd))] = m_NAtagCMMineItemPull
+
+
+#------------------------------------------------------
+# B0 31 福地物品刷新 #tagCMMineItemRefresh
+
+class  tagCMMineItemRefresh(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("IsSuper", c_ubyte),    # 是否超级刷新
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x31
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x31
+        self.IsSuper = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMMineItemRefresh)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 31 福地物品刷新 //tagCMMineItemRefresh:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                IsSuper:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.IsSuper
+                                )
+        return DumpString
+
+
+m_NAtagCMMineItemRefresh=tagCMMineItemRefresh()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineItemRefresh.Cmd,m_NAtagCMMineItemRefresh.SubCmd))] = m_NAtagCMMineItemRefresh
+
+
+#------------------------------------------------------
+# B0 32 福地工人雇佣 #tagCMMineWorkerEmploy
+
+class  tagCMMineWorkerEmploy(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xB0
+        self.SubCmd = 0x32
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xB0
+        self.SubCmd = 0x32
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMMineWorkerEmploy)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// B0 32 福地工人雇佣 //tagCMMineWorkerEmploy:
+                                Cmd:%s,
+                                SubCmd:%s
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd
+                                )
+        return DumpString
+
+
+m_NAtagCMMineWorkerEmploy=tagCMMineWorkerEmploy()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMineWorkerEmploy.Cmd,m_NAtagCMMineWorkerEmploy.SubCmd))] = m_NAtagCMMineWorkerEmploy
 
 
 #------------------------------------------------------
@@ -19901,6 +20831,101 @@
 
 
 #------------------------------------------------------
+# B4 10 回合制战斗 #tagCMTurnFight
+
+class  tagCMTurnFight(Structure):
+    Head = tagHead()
+    MapID = 0    #(DWORD MapID)// 自定义地图ID,可用于绑定战斗场景功能(如野外关卡,爬塔功能,竞技场等)
+    FuncLineID = 0    #(WORD FuncLineID)
+    TagType = 0    #(BYTE TagType)// 战斗目标类型,0-NPC,1-玩家,2-队伍
+    TagID = 0    #(DWORD TagID)// 战斗目标类型对应的ID
+    ValueCount = 0    #(BYTE ValueCount)
+    ValueList = list()    #(vector<DWORD> ValueList)// 附加值列表,可选,具体含义由MapID决定
+    data = None
+
+    def __init__(self):
+        self.Clear()
+        self.Head.Cmd = 0xB4
+        self.Head.SubCmd = 0x10
+        return
+
+    def ReadData(self, _lpData, _pos=0, _Len=0):
+        self.Clear()
+        _pos = self.Head.ReadData(_lpData, _pos)
+        self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.FuncLineID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+        self.TagType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        self.TagID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+        self.ValueCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+        for i in range(self.ValueCount):
+            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+            self.ValueList.append(value)
+        return _pos
+
+    def Clear(self):
+        self.Head = tagHead()
+        self.Head.Clear()
+        self.Head.Cmd = 0xB4
+        self.Head.SubCmd = 0x10
+        self.MapID = 0
+        self.FuncLineID = 0
+        self.TagType = 0
+        self.TagID = 0
+        self.ValueCount = 0
+        self.ValueList = list()
+        return
+
+    def GetLength(self):
+        length = 0
+        length += self.Head.GetLength()
+        length += 4
+        length += 2
+        length += 1
+        length += 4
+        length += 1
+        length += 4 * self.ValueCount
+
+        return length
+
+    def GetBuffer(self):
+        data = ''
+        data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+        data = CommFunc.WriteDWORD(data, self.MapID)
+        data = CommFunc.WriteWORD(data, self.FuncLineID)
+        data = CommFunc.WriteBYTE(data, self.TagType)
+        data = CommFunc.WriteDWORD(data, self.TagID)
+        data = CommFunc.WriteBYTE(data, self.ValueCount)
+        for i in range(self.ValueCount):
+            data = CommFunc.WriteDWORD(data, self.ValueList[i])
+        return data
+
+    def OutputString(self):
+        DumpString = '''
+                                Head:%s,
+                                MapID:%d,
+                                FuncLineID:%d,
+                                TagType:%d,
+                                TagID:%d,
+                                ValueCount:%d,
+                                ValueList:%s
+                                '''\
+                                %(
+                                self.Head.OutputString(),
+                                self.MapID,
+                                self.FuncLineID,
+                                self.TagType,
+                                self.TagID,
+                                self.ValueCount,
+                                "..."
+                                )
+        return DumpString
+
+
+m_NAtagCMTurnFight=tagCMTurnFight()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTurnFight.Head.Cmd,m_NAtagCMTurnFight.Head.SubCmd))] = m_NAtagCMTurnFight
+
+
+#------------------------------------------------------
 # B5 14 拍卖行竞价物品 #tagCMBiddingAuctionItem
 
 class  tagCMBiddingAuctionItem(Structure):

--
Gitblit v1.8.0