From 09e53ea10631c31e091c2947fc05c56ffe954ba6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 02 七月 2019 16:55:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py |  240 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index f5b9705..aac90ff 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -4829,6 +4829,58 @@
 
 
 #------------------------------------------------------
+# AC 01 仙盟联赛信息通知 #tagGCFamilyWarInfo
+
+class  tagGCFamilyWarInfo(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("WorldLV", c_ushort),    # 当前进行中的联赛世界等级
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xAC
+        self.SubCmd = 0x01
+        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 = 0xAC
+        self.SubCmd = 0x01
+        self.WorldLV = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagGCFamilyWarInfo)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// AC 01 仙盟联赛信息通知 //tagGCFamilyWarInfo:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                WorldLV:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.WorldLV
+                                )
+        return DumpString
+
+
+m_NAtagGCFamilyWarInfo=tagGCFamilyWarInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCFamilyWarInfo.Cmd,m_NAtagGCFamilyWarInfo.SubCmd))] = m_NAtagGCFamilyWarInfo
+
+
+#------------------------------------------------------
 # AC 11 节日红包活动信息 #tagGCFeastRedPacketInfo
 
 class  tagGCFeastRedPacketDay(Structure):
@@ -12798,6 +12850,7 @@
                   ("BossType", c_ubyte),    #编号类型0-世界boss 1-boss之家
                   ("KillCnt", c_int),    #击杀次数
                   ("ItemAddCnt", c_int),    #物品增加次数
+                  ("BuyCnt", c_ubyte),    #购买次数
                   ]
 
     def __init__(self):
@@ -12813,6 +12866,7 @@
         self.BossType = 0
         self.KillCnt = 0
         self.ItemAddCnt = 0
+        self.BuyCnt = 0
         return
 
     def GetLength(self):
@@ -12825,12 +12879,14 @@
         DumpString = '''//A3 B7 当日累计攻击boss次数 //tagMCBOSSAttactCnt:
                                 BossType:%d,
                                 KillCnt:%d,
-                                ItemAddCnt:%d
+                                ItemAddCnt:%d,
+                                BuyCnt:%d
                                 '''\
                                 %(
                                 self.BossType,
                                 self.KillCnt,
-                                self.ItemAddCnt
+                                self.ItemAddCnt,
+                                self.BuyCnt
                                 )
         return DumpString
 
@@ -16784,6 +16840,7 @@
                   ("ExtraCnt", c_ubyte),    # VIP额外次数
                   ("ExtraData", c_ubyte),    # 额外参数1
                   ("ExtraData2", c_ubyte),    # 额外参数2
+                  ("HaveRecover", c_ubyte),    # 已找回 1-全部已找回 2-非VIP已找回
                   ]
 
     def __init__(self):
@@ -16801,6 +16858,7 @@
         self.ExtraCnt = 0
         self.ExtraData = 0
         self.ExtraData2 = 0
+        self.HaveRecover = 0
         return
 
     def GetLength(self):
@@ -16815,14 +16873,16 @@
                                 RecoverCnt:%d,
                                 ExtraCnt:%d,
                                 ExtraData:%d,
-                                ExtraData2:%d
+                                ExtraData2:%d,
+                                HaveRecover:%d
                                 '''\
                                 %(
                                 self.Index,
                                 self.RecoverCnt,
                                 self.ExtraCnt,
                                 self.ExtraData,
-                                self.ExtraData2
+                                self.ExtraData2,
+                                self.HaveRecover
                                 )
         return DumpString
 
@@ -21446,6 +21506,58 @@
 
 
 #------------------------------------------------------
+# A8 15 灵器突破结果 #tagMCLingQiEquipBreakResult
+
+class  tagMCLingQiEquipBreakResult(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("MakeItemID", c_int),    #突破后的物品ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA8
+        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 = 0xA8
+        self.SubCmd = 0x15
+        self.MakeItemID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagMCLingQiEquipBreakResult)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A8 15 灵器突破结果 //tagMCLingQiEquipBreakResult:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                MakeItemID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.MakeItemID
+                                )
+        return DumpString
+
+
+m_NAtagMCLingQiEquipBreakResult=tagMCLingQiEquipBreakResult()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCLingQiEquipBreakResult.Cmd,m_NAtagMCLingQiEquipBreakResult.SubCmd))] = m_NAtagMCLingQiEquipBreakResult
+
+
+#------------------------------------------------------
 # A8 14 合成结果通知 #tagMCMakeItemAnswer
 
 class  tagMCMakeItemAnswer(Structure):
@@ -22067,118 +22179,6 @@
 
 m_NAtagMCVirtualItemDrop=tagMCVirtualItemDrop()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCVirtualItemDrop.Head.Cmd,m_NAtagMCVirtualItemDrop.Head.SubCmd))] = m_NAtagMCVirtualItemDrop
-
-
-#------------------------------------------------------
-# A8 15 诛仙装备分解结果通知 #tagMCZhuXianDecomposeResult
-
-class  tagMCZhuXianDecomposeItem(Structure):
-    _pack_ = 1
-    _fields_ = [
-                  ("ItemID", c_int),    #物品ID
-                  ("ItemCnt", c_ubyte),    #物品数量
-                  ("IsBind", c_ubyte),    #是否绑定
-                  ]
-
-    def __init__(self):
-        self.Clear()
-        return
-
-    def ReadData(self, stringData, _pos=0, _len=0):
-        self.Clear()
-        memmove(addressof(self), stringData[_pos:], self.GetLength())
-        return _pos + self.GetLength()
-
-    def Clear(self):
-        self.ItemID = 0
-        self.ItemCnt = 0
-        self.IsBind = 0
-        return
-
-    def GetLength(self):
-        return sizeof(tagMCZhuXianDecomposeItem)
-
-    def GetBuffer(self):
-        return string_at(addressof(self), self.GetLength())
-
-    def OutputString(self):
-        DumpString = '''// A8 15 诛仙装备分解结果通知 //tagMCZhuXianDecomposeResult:
-                                ItemID:%d,
-                                ItemCnt:%d,
-                                IsBind:%d
-                                '''\
-                                %(
-                                self.ItemID,
-                                self.ItemCnt,
-                                self.IsBind
-                                )
-        return DumpString
-
-
-class  tagMCZhuXianDecomposeResult(Structure):
-    Head = tagHead()
-    Cnt = 0    #(BYTE Cnt)//数量
-    ItemList = list()    #(vector<tagMCZhuXianDecomposeItem> ItemList)
-    data = None
-
-    def __init__(self):
-        self.Clear()
-        self.Head.Cmd = 0xA8
-        self.Head.SubCmd = 0x15
-        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):
-            temItemList = tagMCZhuXianDecomposeItem()
-            _pos = temItemList.ReadData(_lpData, _pos)
-            self.ItemList.append(temItemList)
-        return _pos
-
-    def Clear(self):
-        self.Head = tagHead()
-        self.Head.Clear()
-        self.Head.Cmd = 0xA8
-        self.Head.SubCmd = 0x15
-        self.Cnt = 0
-        self.ItemList = list()
-        return
-
-    def GetLength(self):
-        length = 0
-        length += self.Head.GetLength()
-        length += 1
-        for i in range(self.Cnt):
-            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.Cnt)
-        for i in range(self.Cnt):
-            data = CommFunc.WriteString(data, self.ItemList[i].GetLength(), self.ItemList[i].GetBuffer())
-        return data
-
-    def OutputString(self):
-        DumpString = '''
-                                Head:%s,
-                                Cnt:%d,
-                                ItemList:%s
-                                '''\
-                                %(
-                                self.Head.OutputString(),
-                                self.Cnt,
-                                "..."
-                                )
-        return DumpString
-
-
-m_NAtagMCZhuXianDecomposeResult=tagMCZhuXianDecomposeResult()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCZhuXianDecomposeResult.Head.Cmd,m_NAtagMCZhuXianDecomposeResult.Head.SubCmd))] = m_NAtagMCZhuXianDecomposeResult
 
 
 #------------------------------------------------------
@@ -28195,7 +28195,7 @@
     Head = tagHead()
     PointAttrIDCount = 0    #(BYTE PointAttrIDCount)// 点类型个数
     PointAttrIDList = list()    #(vector<BYTE> PointAttrIDList)// 点类型列表
-    PointValueList = list()    #(vector<WORD> PointValueList)// 点类型对应已加自由点数列表
+    PointValueList = list()    #(vector<DWORD> PointValueList)// 点类型对应已加自由点数列表
     data = None
 
     def __init__(self):
@@ -28212,7 +28212,7 @@
             value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
             self.PointAttrIDList.append(value)
         for i in range(self.PointAttrIDCount):
-            value,_pos=CommFunc.ReadWORD(_lpData,_pos)
+            value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
             self.PointValueList.append(value)
         return _pos
 
@@ -28231,7 +28231,7 @@
         length += self.Head.GetLength()
         length += 1
         length += 1 * self.PointAttrIDCount
-        length += 2 * self.PointAttrIDCount
+        length += 4 * self.PointAttrIDCount
 
         return length
 
@@ -28242,7 +28242,7 @@
         for i in range(self.PointAttrIDCount):
             data = CommFunc.WriteBYTE(data, self.PointAttrIDList[i])
         for i in range(self.PointAttrIDCount):
-            data = CommFunc.WriteWORD(data, self.PointValueList[i])
+            data = CommFunc.WriteDWORD(data, self.PointValueList[i])
         return data
 
     def OutputString(self):

--
Gitblit v1.8.0