From af061eb963b3d4c97f3d71424f42f89f4ff3b498 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 08 十月 2018 14:03:28 +0800
Subject: [PATCH] 2091 【主干】【1.0.18】神兽背包满情况下拾取错误导致内存泄露
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 174 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 25 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 9976369..96d39c5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -8210,56 +8210,74 @@
# A5 C0 神兽穿戴装备 #tagCMDogzEquipItem
class tagCMDogzEquipItem(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("DogzID", c_ubyte), # 神兽ID
- ("EquipIndex", c_ubyte), #神兽装备所在神兽背包索引
- ]
+ Head = tagHead()
+ DogzID = 0 #(BYTE DogzID)// 神兽ID
+ EquipIndexCount = 0 #(BYTE EquipIndexCount)
+ EquipIndexList = list() #(vector<BYTE> EquipIndexList)//神兽装备所在神兽背包索引列表
+ data = None
def __init__(self):
self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0xC0
+ self.Head.Cmd = 0xA5
+ self.Head.SubCmd = 0xC0
return
- def ReadData(self, stringData, _pos=0, _len=0):
+ def ReadData(self, _lpData, _pos=0, _Len=0):
self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.DogzID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.EquipIndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.EquipIndexCount):
+ value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
+ self.EquipIndexList.append(value)
+ return _pos
def Clear(self):
- self.Cmd = 0xA5
- self.SubCmd = 0xC0
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xA5
+ self.Head.SubCmd = 0xC0
self.DogzID = 0
- self.EquipIndex = 0
+ self.EquipIndexCount = 0
+ self.EquipIndexList = list()
return
def GetLength(self):
- return sizeof(tagCMDogzEquipItem)
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1
+ length += 1 * self.EquipIndexCount
+
+ return length
def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.DogzID)
+ data = CommFunc.WriteBYTE(data, self.EquipIndexCount)
+ for i in range(self.EquipIndexCount):
+ data = CommFunc.WriteBYTE(data, self.EquipIndexList[i])
+ return data
def OutputString(self):
- DumpString = '''// A5 C0 神兽穿戴装备 //tagCMDogzEquipItem:
- Cmd:%s,
- SubCmd:%s,
+ DumpString = '''
+ Head:%s,
DogzID:%d,
- EquipIndex:%d
+ EquipIndexCount:%d,
+ EquipIndexList:%s
'''\
%(
- self.Cmd,
- self.SubCmd,
+ self.Head.OutputString(),
self.DogzID,
- self.EquipIndex
+ self.EquipIndexCount,
+ "..."
)
return DumpString
m_NAtagCMDogzEquipItem=tagCMDogzEquipItem()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDogzEquipItem.Cmd,m_NAtagCMDogzEquipItem.SubCmd))] = m_NAtagCMDogzEquipItem
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMDogzEquipItem.Head.Cmd,m_NAtagCMDogzEquipItem.Head.SubCmd))] = m_NAtagCMDogzEquipItem
#------------------------------------------------------
@@ -8270,6 +8288,7 @@
EquipIndex = 0 #(BYTE EquipIndex)//神兽装备背包中索引
IndexCount = 0 #(BYTE IndexCount)//材料所在神兽物品背包索引的数量
IndexList = list() #(vector<BYTE> IndexList)//材料所在神兽物品背包索引列表
+ IndexUseCountList = list() #(vector<DWORD> IndexUseCountList)//材料所在神兽物品背包索引对应使用个数列表
IsDouble = 0 #(BYTE IsDouble)//是否双倍强化
data = None
@@ -8287,6 +8306,9 @@
for i in range(self.IndexCount):
value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
self.IndexList.append(value)
+ for i in range(self.IndexCount):
+ value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+ self.IndexUseCountList.append(value)
self.IsDouble,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
@@ -8298,6 +8320,7 @@
self.EquipIndex = 0
self.IndexCount = 0
self.IndexList = list()
+ self.IndexUseCountList = list()
self.IsDouble = 0
return
@@ -8307,6 +8330,7 @@
length += 1
length += 1
length += 1 * self.IndexCount
+ length += 4 * self.IndexCount
length += 1
return length
@@ -8318,6 +8342,8 @@
data = CommFunc.WriteBYTE(data, self.IndexCount)
for i in range(self.IndexCount):
data = CommFunc.WriteBYTE(data, self.IndexList[i])
+ for i in range(self.IndexCount):
+ data = CommFunc.WriteDWORD(data, self.IndexUseCountList[i])
data = CommFunc.WriteBYTE(data, self.IsDouble)
return data
@@ -8327,12 +8353,14 @@
EquipIndex:%d,
IndexCount:%d,
IndexList:%s,
+ IndexUseCountList:%s,
IsDouble:%d
'''\
%(
self.Head.OutputString(),
self.EquipIndex,
self.IndexCount,
+ "...",
"...",
self.IsDouble
)
@@ -9394,6 +9422,54 @@
#------------------------------------------------------
+# A5 14 祈福丹药 #tagCMPrayElixir
+
+class tagCMPrayElixir(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ 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 = 0xA5
+ self.SubCmd = 0x14
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMPrayElixir)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 14 祈福丹药 //tagCMPrayElixir:
+ Cmd:%s,
+ SubCmd:%s
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd
+ )
+ return DumpString
+
+
+m_NAtagCMPrayElixir=tagCMPrayElixir()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMPrayElixir.Cmd,m_NAtagCMPrayElixir.SubCmd))] = m_NAtagCMPrayElixir
+
+
+#------------------------------------------------------
#A5 34 查询天梯竞技场状态#tagCMQueryHighLadderState
class tagCMQueryHighLadderState(Structure):
@@ -10199,6 +10275,54 @@
#------------------------------------------------------
+# A5 17 绑玉转盘开始 #tagCMStartBindJadeWheel
+
+class tagCMStartBindJadeWheel(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA5
+ self.SubCmd = 0x17
+ 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 = 0x17
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMStartBindJadeWheel)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A5 17 绑玉转盘开始 //tagCMStartBindJadeWheel:
+ Cmd:%s,
+ SubCmd:%s
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd
+ )
+ return DumpString
+
+
+m_NAtagCMStartBindJadeWheel=tagCMStartBindJadeWheel()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMStartBindJadeWheel.Cmd,m_NAtagCMStartBindJadeWheel.SubCmd))] = m_NAtagCMStartBindJadeWheel
+
+
+#------------------------------------------------------
# A5 11 试用首充武器 #tagCMTryFirstGoldItem
class tagCMTryFirstGoldItem(Structure):
--
Gitblit v1.8.0