From 303a03f56c01092ce7a7194e994dea2089b4728d Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 11 七月 2019 14:24:45 +0800
Subject: [PATCH] 7982 【后端】【主干】渡劫条件调整

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py |  180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 176 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 84eae5a..07975d4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -6774,6 +6774,58 @@
 
 
 #------------------------------------------------------
+# A3 18 灵器突破 #tagCMLingQiEquipBreak
+
+class  tagCMLingQiEquipBreak(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("ItemID", c_int),    #突破的物品ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA3
+        self.SubCmd = 0x18
+        return
+
+    def ReadData(self, stringData, _pos=0, _len=0):
+        self.Clear()
+        memmove(addressof(self), stringData[_pos:], self.GetLength())
+        return _pos + self.GetLength()
+
+    def Clear(self):
+        self.Cmd = 0xA3
+        self.SubCmd = 0x18
+        self.ItemID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMLingQiEquipBreak)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A3 18 灵器突破 //tagCMLingQiEquipBreak:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                ItemID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.ItemID
+                                )
+        return DumpString
+
+
+m_NAtagCMLingQiEquipBreak=tagCMLingQiEquipBreak()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMLingQiEquipBreak.Cmd,m_NAtagCMLingQiEquipBreak.SubCmd))] = m_NAtagCMLingQiEquipBreak
+
+
+#------------------------------------------------------
 #A3 02 丢弃背包物品 #tagPlayerDropItem
 
 class  tagPlayerDropItem(Structure):
@@ -9759,6 +9811,126 @@
 
 m_NAtagCMGoldInvest=tagCMGoldInvest()
 ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGoldInvest.Cmd,m_NAtagCMGoldInvest.SubCmd))] = m_NAtagCMGoldInvest
+
+
+#------------------------------------------------------
+# A5 29 骑宠觉醒 #tagCMHorsePetAwake
+
+class  tagCMHorsePetAwake(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("Type", c_ushort),    # 1-坐骑 2-灵宠
+                  ("ID", c_int),    # 对应坐骑表灵宠表ID
+                  ("EatItemID", c_int),    # 吞噬的物品ID
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA5
+        self.SubCmd = 0x29
+        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 = 0x29
+        self.Type = 0
+        self.ID = 0
+        self.EatItemID = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMHorsePetAwake)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 29 骑宠觉醒 //tagCMHorsePetAwake:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                Type:%d,
+                                ID:%d,
+                                EatItemID:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.Type,
+                                self.ID,
+                                self.EatItemID
+                                )
+        return DumpString
+
+
+m_NAtagCMHorsePetAwake=tagCMHorsePetAwake()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorsePetAwake.Cmd,m_NAtagCMHorsePetAwake.SubCmd))] = m_NAtagCMHorsePetAwake
+
+
+#------------------------------------------------------
+# A5 30 骑宠外观选择 #tagCMHorsePetSkinSelect
+
+class  tagCMHorsePetSkinSelect(Structure):
+    _pack_ = 1
+    _fields_ = [
+                  ("Cmd", c_ubyte),
+                  ("SubCmd", c_ubyte),
+                  ("Type", c_ushort),    # 1-坐骑 2-灵宠
+                  ("ID", c_int),    # 对应坐骑表灵宠表ID
+                  ("SkinIndex", c_ubyte),    # 外观索引
+                  ]
+
+    def __init__(self):
+        self.Clear()
+        self.Cmd = 0xA5
+        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 = 0xA5
+        self.SubCmd = 0x30
+        self.Type = 0
+        self.ID = 0
+        self.SkinIndex = 0
+        return
+
+    def GetLength(self):
+        return sizeof(tagCMHorsePetSkinSelect)
+
+    def GetBuffer(self):
+        return string_at(addressof(self), self.GetLength())
+
+    def OutputString(self):
+        DumpString = '''// A5 30 骑宠外观选择 //tagCMHorsePetSkinSelect:
+                                Cmd:%s,
+                                SubCmd:%s,
+                                Type:%d,
+                                ID:%d,
+                                SkinIndex:%d
+                                '''\
+                                %(
+                                self.Cmd,
+                                self.SubCmd,
+                                self.Type,
+                                self.ID,
+                                self.SkinIndex
+                                )
+        return DumpString
+
+
+m_NAtagCMHorsePetSkinSelect=tagCMHorsePetSkinSelect()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHorsePetSkinSelect.Cmd,m_NAtagCMHorsePetSkinSelect.SubCmd))] = m_NAtagCMHorsePetSkinSelect
 
 
 #------------------------------------------------------
@@ -14001,7 +14173,7 @@
     Head = tagHead()
     PointAttrIDCount = 0    #(BYTE PointAttrIDCount)// 加点属性ID个数
     PointAttrIDList = list()    #(vector<BYTE> PointAttrIDList)// 加点属性ID列表
-    PointValueList = list()    #(vector<WORD> PointValueList)// 加点属性ID对应的点数列表
+    PointValueList = list()    #(vector<DWORD> PointValueList)// 加点属性ID对应的点数列表
     data = None
 
     def __init__(self):
@@ -14018,7 +14190,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
 
@@ -14037,7 +14209,7 @@
         length += self.Head.GetLength()
         length += 1
         length += 1 * self.PointAttrIDCount
-        length += 2 * self.PointAttrIDCount
+        length += 4 * self.PointAttrIDCount
 
         return length
 
@@ -14048,7 +14220,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