From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 16 十月 2018 15:04:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 450 insertions(+), 25 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 6bc333c..b037e1b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -808,6 +808,91 @@
#------------------------------------------------------
+# A4 12 搜索家族 #tagCGPySearchFamily
+
+class tagCGPySearchFamily(Structure):
+ Head = tagHead()
+ MsgLen = 0 #(BYTE MsgLen)//模糊搜索家族，如果输入为空，则为不限制该条件
+ Msg = "" #(String Msg)//size = MsgLen
+ LV = 0 #(BYTE LV)//最低家族等级,如果为0，则不限制该条件
+ MaxCount = 0 #(BYTE MaxCount)//搜索结果所需最大条数，后端限制最多返回20条
+ IsSearching = 0 #(BYTE IsSearching)//默认1，如果有指定其他值，则返回指定值
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xA4
+ self.Head.SubCmd = 0x12
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.MsgLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Msg,_pos = CommFunc.ReadString(_lpData, _pos,self.MsgLen)
+ self.LV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.MaxCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.IsSearching,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xA4
+ self.Head.SubCmd = 0x12
+ self.MsgLen = 0
+ self.Msg = ""
+ self.LV = 0
+ self.MaxCount = 0
+ self.IsSearching = 0
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += len(self.Msg)
+ length += 1
+ length += 1
+ length += 1
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.MsgLen)
+ data = CommFunc.WriteString(data, self.MsgLen, self.Msg)
+ data = CommFunc.WriteBYTE(data, self.LV)
+ data = CommFunc.WriteBYTE(data, self.MaxCount)
+ data = CommFunc.WriteBYTE(data, self.IsSearching)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ MsgLen:%d,
+ Msg:%s,
+ LV:%d,
+ MaxCount:%d,
+ IsSearching:%d
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.MsgLen,
+ self.Msg,
+ self.LV,
+ self.MaxCount,
+ self.IsSearching
+ )
+ return DumpString
+
+
+m_NAtagCGPySearchFamily=tagCGPySearchFamily()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGPySearchFamily.Head.Cmd,m_NAtagCGPySearchFamily.Head.SubCmd))] = m_NAtagCGPySearchFamily
+
+
+#------------------------------------------------------
#A4 01 查看家族第N页#tagCGViewFamilyPage
class tagCGViewFamilyPage(Structure):
@@ -2556,6 +2641,62 @@
m_NAtagCGInvitePlayerJoinTeam=tagCGInvitePlayerJoinTeam()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGInvitePlayerJoinTeam.Cmd,m_NAtagCGInvitePlayerJoinTeam.SubCmd))] = m_NAtagCGInvitePlayerJoinTeam
+
+
+#------------------------------------------------------
+# B9 0A 按条件邀请玩家加入队伍 #tagCGInvitePlayerJoinTeamByLV
+
+class tagCGInvitePlayerJoinTeamByLV(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("LVLimit", c_ushort), # 目标玩家大于等于此等级
+ ("InviteCnt", c_ubyte), # 邀请玩家个数
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xB9
+ self.SubCmd = 0x0A
+ 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 = 0xB9
+ self.SubCmd = 0x0A
+ self.LVLimit = 0
+ self.InviteCnt = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCGInvitePlayerJoinTeamByLV)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// B9 0A 按条件邀请玩家加入队伍 //tagCGInvitePlayerJoinTeamByLV:
+ Cmd:%s,
+ SubCmd:%s,
+ LVLimit:%d,
+ InviteCnt:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.LVLimit,
+ self.InviteCnt
+ )
+ return DumpString
+
+
+m_NAtagCGInvitePlayerJoinTeamByLV=tagCGInvitePlayerJoinTeamByLV()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGInvitePlayerJoinTeamByLV.Cmd,m_NAtagCGInvitePlayerJoinTeamByLV.SubCmd))] = m_NAtagCGInvitePlayerJoinTeamByLV
#------------------------------------------------------
@@ -5751,6 +5892,58 @@
#------------------------------------------------------
+# A3 13 物品拆解 #tagCMItemDecompound
+
+class tagCMItemDecompound(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("Index", c_ubyte), # 拆解物品所在背包索引
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xA3
+ 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 = 0xA3
+ self.SubCmd = 0x13
+ self.Index = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMItemDecompound)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// A3 13 物品拆解 //tagCMItemDecompound:
+ Cmd:%s,
+ SubCmd:%s,
+ Index:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.Index
+ )
+ return DumpString
+
+
+m_NAtagCMItemDecompound=tagCMItemDecompound()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMItemDecompound.Cmd,m_NAtagCMItemDecompound.SubCmd))] = m_NAtagCMItemDecompound
+
+
+#------------------------------------------------------
#A3 02 丢弃背包物品 #tagPlayerDropItem
class tagPlayerDropItem(Structure):
@@ -8069,56 +8262,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
#------------------------------------------------------
@@ -8129,6 +8340,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
@@ -8146,6 +8358,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
@@ -8157,6 +8372,7 @@
self.EquipIndex = 0
self.IndexCount = 0
self.IndexList = list()
+ self.IndexUseCountList = list()
self.IsDouble = 0
return
@@ -8166,6 +8382,7 @@
length += 1
length += 1
length += 1 * self.IndexCount
+ length += 4 * self.IndexCount
length += 1
return length
@@ -8177,6 +8394,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
@@ -8186,12 +8405,14 @@
EquipIndex:%d,
IndexCount:%d,
IndexList:%s,
+ IndexUseCountList:%s,
IsDouble:%d
'''\
%(
self.Head.OutputString(),
self.EquipIndex,
self.IndexCount,
+ "...",
"...",
self.IsDouble
)
@@ -9253,6 +9474,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):
@@ -10058,6 +10327,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):
@@ -10155,6 +10472,58 @@
m_NAtagCMUnLockBirthChartHole=tagCMUnLockBirthChartHole()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnLockBirthChartHole.Cmd,m_NAtagCMUnLockBirthChartHole.SubCmd))] = m_NAtagCMUnLockBirthChartHole
+
+
+#------------------------------------------------------
+# 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
#------------------------------------------------------
@@ -11011,6 +11380,62 @@
#------------------------------------------------------
+# AA 05 限时抢购预约 #tagCMFlashSaleAppointment
+
+class tagCMFlashSaleAppointment(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("GoodsID", c_int), # 抢购商品标识
+ ("State", c_ubyte), # 1-预约 0-取消
+ ]
+
+ def __init__(self):
+ self.Clear()
+ self.Cmd = 0xAA
+ 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 = 0xAA
+ self.SubCmd = 0x05
+ self.GoodsID = 0
+ self.State = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagCMFlashSaleAppointment)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// AA 05 限时抢购预约 //tagCMFlashSaleAppointment:
+ Cmd:%s,
+ SubCmd:%s,
+ GoodsID:%d,
+ State:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.GoodsID,
+ self.State
+ )
+ return DumpString
+
+
+m_NAtagCMFlashSaleAppointment=tagCMFlashSaleAppointment()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFlashSaleAppointment.Cmd,m_NAtagCMFlashSaleAppointment.SubCmd))] = m_NAtagCMFlashSaleAppointment
+
+
+#------------------------------------------------------
# AA 02 领取升阶功能特惠奖励 #tagCMGetClassUPDayAward
class tagCMGetClassUPDayAward(Structure):
--
Gitblit v1.8.0