From 560e29fe8dc7af87417abd9c510701fde33d9ebb Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期三, 20 三月 2019 17:31:39 +0800 Subject: [PATCH] 6374 【后端】【2.0】删除无用功能代码、封包、配置(删除修复代码) --- ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 2654 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 2,094 insertions(+), 560 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py index 09463a3..4adb114 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py @@ -1234,6 +1234,73 @@ #------------------------------------------------------ +# A9 04 查询boss信息 #tagCGQueryBossInfo + +class tagCGQueryBossInfo(Structure): + Head = tagHead() + Count = 0 #(BYTE Count)//数量 + BossIDList = list() #(vector<DWORD> BossIDList)//boosid + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA9 + self.Head.SubCmd = 0x04 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.Count): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.BossIDList.append(value) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA9 + self.Head.SubCmd = 0x04 + self.Count = 0 + self.BossIDList = list() + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 4 * self.Count + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteBYTE(data, self.Count) + for i in range(self.Count): + data = CommFunc.WriteDWORD(data, self.BossIDList[i]) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + Count:%d, + BossIDList:%s + '''\ + %( + self.Head.OutputString(), + self.Count, + "..." + ) + return DumpString + + +m_NAtagCGQueryBossInfo=tagCGQueryBossInfo() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryBossInfo.Head.Cmd,m_NAtagCGQueryBossInfo.Head.SubCmd))] = m_NAtagCGQueryBossInfo + + +#------------------------------------------------------ #A9 A1 查询玩家补偿#tagCGQueryCompensation class tagCGQueryCompensation(Structure): @@ -2289,6 +2356,62 @@ #------------------------------------------------------ +# B5 18 拍卖行修改关注物品 #tagCGAttentionAuctionItemChange + +class tagCGAttentionAuctionItemChange(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("ItemID", c_int), + ("IsAttention", c_ubyte), #是否关注,取消关注发0 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB5 + 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 = 0xB5 + self.SubCmd = 0x18 + self.ItemID = 0 + self.IsAttention = 0 + return + + def GetLength(self): + return sizeof(tagCGAttentionAuctionItemChange) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B5 18 拍卖行修改关注物品 //tagCGAttentionAuctionItemChange: + Cmd:%s, + SubCmd:%s, + ItemID:%d, + IsAttention:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.ItemID, + self.IsAttention + ) + return DumpString + + +m_NAtagCGAttentionAuctionItemChange=tagCGAttentionAuctionItemChange() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGAttentionAuctionItemChange.Cmd,m_NAtagCGAttentionAuctionItemChange.SubCmd))] = m_NAtagCGAttentionAuctionItemChange + + +#------------------------------------------------------ # B5 03 交易所查询上架物品#tagCGPYQueryBourseItemOnSale class tagCGPYQueryBourseItemOnSale(Structure): @@ -2357,6 +2480,289 @@ m_NAtagCGPYQueryBourseItemOnSale=tagCGPYQueryBourseItemOnSale() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGPYQueryBourseItemOnSale.Head.Cmd,m_NAtagCGPYQueryBourseItemOnSale.Head.SubCmd))] = m_NAtagCGPYQueryBourseItemOnSale + + +#------------------------------------------------------ +# B5 16 拍卖行查询关注中的拍品 #tagCGQueryAttentionAuctionItem + +class tagCGQueryAttentionAuctionItem(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB5 + self.SubCmd = 0x16 + 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 = 0xB5 + self.SubCmd = 0x16 + return + + def GetLength(self): + return sizeof(tagCGQueryAttentionAuctionItem) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B5 16 拍卖行查询关注中的拍品 //tagCGQueryAttentionAuctionItem: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCGQueryAttentionAuctionItem=tagCGQueryAttentionAuctionItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryAttentionAuctionItem.Cmd,m_NAtagCGQueryAttentionAuctionItem.SubCmd))] = m_NAtagCGQueryAttentionAuctionItem + + +#------------------------------------------------------ +# B5 10 拍卖行查询拍卖中的物品 #tagCGQueryAuctionItem + +class tagCGQueryAuctionItem(Structure): + Head = tagHead() + Job = 0 #(BYTE Job)//过滤职业,0为不限制 + ItemTypeCount = 0 #(BYTE ItemTypeCount) + ItemTypeList = list() #(vector<DWORD> ItemTypeList)//指定的物品类型 + ClassLV = 0 #(BYTE ClassLV)//过滤阶数,0为不限制 + SpecItemIDCount = 0 #(BYTE SpecItemIDCount)//指定物品ID个数 + SpecItemIDList = list() #(vector<DWORD> SpecItemIDList)//指定物品ID + FromItemGUID = "" #(char FromItemGUID[40])//从哪个物品开始查询 + QueryDir = 0 #(BYTE QueryDir)//查询方向,1-往后查,2-往前查 + QueryCount = 0 #(BYTE QueryCount)//查询个数,0为全部 + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x10 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos) + self.ItemTypeCount,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.ItemTypeCount): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.ItemTypeList.append(value) + self.ClassLV,_pos = CommFunc.ReadBYTE(_lpData, _pos) + self.SpecItemIDCount,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.SpecItemIDCount): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.SpecItemIDList.append(value) + self.FromItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40) + self.QueryDir,_pos = CommFunc.ReadBYTE(_lpData, _pos) + self.QueryCount,_pos = CommFunc.ReadBYTE(_lpData, _pos) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x10 + self.Job = 0 + self.ItemTypeCount = 0 + self.ItemTypeList = list() + self.ClassLV = 0 + self.SpecItemIDCount = 0 + self.SpecItemIDList = list() + self.FromItemGUID = "" + self.QueryDir = 0 + self.QueryCount = 0 + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 1 + length += 4 * self.ItemTypeCount + length += 1 + length += 1 + length += 4 * self.SpecItemIDCount + length += 40 + 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.Job) + data = CommFunc.WriteBYTE(data, self.ItemTypeCount) + for i in range(self.ItemTypeCount): + data = CommFunc.WriteDWORD(data, self.ItemTypeList[i]) + data = CommFunc.WriteBYTE(data, self.ClassLV) + data = CommFunc.WriteBYTE(data, self.SpecItemIDCount) + for i in range(self.SpecItemIDCount): + data = CommFunc.WriteDWORD(data, self.SpecItemIDList[i]) + data = CommFunc.WriteString(data, 40, self.FromItemGUID) + data = CommFunc.WriteBYTE(data, self.QueryDir) + data = CommFunc.WriteBYTE(data, self.QueryCount) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + Job:%d, + ItemTypeCount:%d, + ItemTypeList:%s, + ClassLV:%d, + SpecItemIDCount:%d, + SpecItemIDList:%s, + FromItemGUID:%s, + QueryDir:%d, + QueryCount:%d + '''\ + %( + self.Head.OutputString(), + self.Job, + self.ItemTypeCount, + "...", + self.ClassLV, + self.SpecItemIDCount, + "...", + self.FromItemGUID, + self.QueryDir, + self.QueryCount + ) + return DumpString + + +m_NAtagCGQueryAuctionItem=tagCGQueryAuctionItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryAuctionItem.Head.Cmd,m_NAtagCGQueryAuctionItem.Head.SubCmd))] = m_NAtagCGQueryAuctionItem + + +#------------------------------------------------------ +# B5 12 拍卖行查询拍卖记录 #tagCGQueryAuctionRecord + +class tagCGQueryAuctionRecord(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("RecordType", c_ubyte), #记录类型 0-我的拍品记录 1-仙盟拍品记录 2-我的竞拍记录 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB5 + 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 = 0xB5 + self.SubCmd = 0x12 + self.RecordType = 0 + return + + def GetLength(self): + return sizeof(tagCGQueryAuctionRecord) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B5 12 拍卖行查询拍卖记录 //tagCGQueryAuctionRecord: + Cmd:%s, + SubCmd:%s, + RecordType:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.RecordType + ) + return DumpString + + +m_NAtagCGQueryAuctionRecord=tagCGQueryAuctionRecord() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryAuctionRecord.Cmd,m_NAtagCGQueryAuctionRecord.SubCmd))] = m_NAtagCGQueryAuctionRecord + + +#------------------------------------------------------ +# B5 17 拍卖行查询定位目标拍品 #tagCGQueryTagAuctionItem + +class tagCGQueryTagAuctionItem(Structure): + Head = tagHead() + ItemGUID = "" #(char ItemGUID[40]) + ItemID = 0 #(DWORD ItemID) + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x17 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40) + self.ItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x17 + self.ItemGUID = "" + self.ItemID = 0 + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 40 + length += 4 + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteString(data, 40, self.ItemGUID) + data = CommFunc.WriteDWORD(data, self.ItemID) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + ItemGUID:%s, + ItemID:%d + '''\ + %( + self.Head.OutputString(), + self.ItemGUID, + self.ItemID + ) + return DumpString + + +m_NAtagCGQueryTagAuctionItem=tagCGQueryTagAuctionItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGQueryTagAuctionItem.Head.Cmd,m_NAtagCGQueryTagAuctionItem.Head.SubCmd))] = m_NAtagCGQueryTagAuctionItem #------------------------------------------------------ @@ -2916,113 +3322,9 @@ #------------------------------------------------------ -#C0 11 上传数据的活动类型 #tagActionMergeRegister +# C0 03 强制退出跨服状态 #tagCGForceQuitCrossState -class tagActionMergeRegister(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("ActionType", c_ubyte), #活动类型 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xC0 - self.SubCmd = 0x11 - 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 = 0xC0 - self.SubCmd = 0x11 - self.ActionType = 0 - return - - def GetLength(self): - return sizeof(tagActionMergeRegister) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''//C0 11 上传数据的活动类型 //tagActionMergeRegister: - Cmd:%s, - SubCmd:%s, - ActionType:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.ActionType - ) - return DumpString - - -m_NAtagActionMergeRegister=tagActionMergeRegister() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagActionMergeRegister.Cmd,m_NAtagActionMergeRegister.SubCmd))] = m_NAtagActionMergeRegister - - -#------------------------------------------------------ -#C0 12 跨服上传数据账号查询 #tagMergeRegisterAccQuery - -class tagMergeRegisterAccQuery(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("ActionType", c_ubyte), #活动类型 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xC0 - 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 = 0xC0 - self.SubCmd = 0x12 - self.ActionType = 0 - return - - def GetLength(self): - return sizeof(tagMergeRegisterAccQuery) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''//C0 12 跨服上传数据账号查询 //tagMergeRegisterAccQuery: - Cmd:%s, - SubCmd:%s, - ActionType:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.ActionType - ) - return DumpString - - -m_NAtagMergeRegisterAccQuery=tagMergeRegisterAccQuery() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMergeRegisterAccQuery.Cmd,m_NAtagMergeRegisterAccQuery.SubCmd))] = m_NAtagMergeRegisterAccQuery - - -#------------------------------------------------------ -# C0 15 通知即将登录跳转到跨服服务器 #tagCGGotoMergeServer - -class tagCGGotoMergeServer(Structure): +class tagCGForceQuitCrossState(Structure): _pack_ = 1 _fields_ = [ ("Cmd", c_ubyte), @@ -3032,7 +3334,7 @@ def __init__(self): self.Clear() self.Cmd = 0xC0 - self.SubCmd = 0x15 + self.SubCmd = 0x03 return def ReadData(self, stringData, _pos=0, _len=0): @@ -3042,17 +3344,17 @@ def Clear(self): self.Cmd = 0xC0 - self.SubCmd = 0x15 + self.SubCmd = 0x03 return def GetLength(self): - return sizeof(tagCGGotoMergeServer) + return sizeof(tagCGForceQuitCrossState) def GetBuffer(self): return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = '''// C0 15 通知即将登录跳转到跨服服务器 //tagCGGotoMergeServer: + DumpString = '''// C0 03 强制退出跨服状态 //tagCGForceQuitCrossState: Cmd:%s, SubCmd:%s '''\ @@ -3063,8 +3365,116 @@ return DumpString -m_NAtagCGGotoMergeServer=tagCGGotoMergeServer() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGGotoMergeServer.Cmd,m_NAtagCGGotoMergeServer.SubCmd))] = m_NAtagCGGotoMergeServer +m_NAtagCGForceQuitCrossState=tagCGForceQuitCrossState() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGForceQuitCrossState.Cmd,m_NAtagCGForceQuitCrossState.SubCmd))] = m_NAtagCGForceQuitCrossState + + +#------------------------------------------------------ +# C0 01 查看跨服竞技场赛季排行榜 #tagCGViewCrossPKBillboard + +class tagCGViewCrossPKBillboard(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("ZoneID", c_ubyte), # 赛区ID + ("SeasonID", c_ubyte), # 赛季ID + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC0 + 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 = 0xC0 + self.SubCmd = 0x01 + self.ZoneID = 0 + self.SeasonID = 0 + return + + def GetLength(self): + return sizeof(tagCGViewCrossPKBillboard) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C0 01 查看跨服竞技场赛季排行榜 //tagCGViewCrossPKBillboard: + Cmd:%s, + SubCmd:%s, + ZoneID:%d, + SeasonID:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.ZoneID, + self.SeasonID + ) + return DumpString + + +m_NAtagCGViewCrossPKBillboard=tagCGViewCrossPKBillboard() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGViewCrossPKBillboard.Cmd,m_NAtagCGViewCrossPKBillboard.SubCmd))] = m_NAtagCGViewCrossPKBillboard + + +#------------------------------------------------------ +# C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo + +class tagCGViewCrossPlayerInfo(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("PlayerID", c_int), # 跨服玩家ID + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC0 + self.SubCmd = 0x02 + 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 = 0xC0 + self.SubCmd = 0x02 + self.PlayerID = 0 + return + + def GetLength(self): + return sizeof(tagCGViewCrossPlayerInfo) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C0 02 查看跨服玩家信息 //tagCGViewCrossPlayerInfo: + Cmd:%s, + SubCmd:%s, + PlayerID:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.PlayerID + ) + return DumpString + + +m_NAtagCGViewCrossPlayerInfo=tagCGViewCrossPlayerInfo() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGViewCrossPlayerInfo.Cmd,m_NAtagCGViewCrossPlayerInfo.SubCmd))] = m_NAtagCGViewCrossPlayerInfo #------------------------------------------------------ @@ -3185,6 +3595,54 @@ m_NAtagCMPCInfo=tagCMPCInfo() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMPCInfo.Head.Cmd,m_NAtagCMPCInfo.Head.SubCmd))] = m_NAtagCMPCInfo + + +#------------------------------------------------------ +# A1 08 刷新主服角色信息 #tagCMRefreshMainServerRole + +class tagCMRefreshMainServerRole(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA1 + self.SubCmd = 0x08 + 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 = 0x08 + return + + def GetLength(self): + return sizeof(tagCMRefreshMainServerRole) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A1 08 刷新主服角色信息 //tagCMRefreshMainServerRole: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMRefreshMainServerRole=tagCMRefreshMainServerRole() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshMainServerRole.Cmd,m_NAtagCMRefreshMainServerRole.SubCmd))] = m_NAtagCMRefreshMainServerRole #------------------------------------------------------ @@ -3650,6 +4108,54 @@ m_NAtagCMClearFBCD=tagCMClearFBCD() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClearFBCD.Cmd,m_NAtagCMClearFBCD.SubCmd))] = m_NAtagCMClearFBCD + + +#------------------------------------------------------ +# A2 31 前端开始自定义场景 #tagCMClientStartCustomScene + +class tagCMClientStartCustomScene(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA2 + 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 = 0xA2 + self.SubCmd = 0x31 + return + + def GetLength(self): + return sizeof(tagCMClientStartCustomScene) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A2 31 前端开始自定义场景 //tagCMClientStartCustomScene: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMClientStartCustomScene=tagCMClientStartCustomScene() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMClientStartCustomScene.Cmd,m_NAtagCMClientStartCustomScene.SubCmd))] = m_NAtagCMClientStartCustomScene #------------------------------------------------------ @@ -4643,6 +5149,54 @@ #------------------------------------------------------ +# A2 32 神秘商店刷新 #tagCMRefreshMysticalShop + +class tagCMRefreshMysticalShop(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA2 + 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 = 0xA2 + self.SubCmd = 0x32 + return + + def GetLength(self): + return sizeof(tagCMRefreshMysticalShop) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A2 32 神秘商店刷新 //tagCMRefreshMysticalShop: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMRefreshMysticalShop=tagCMRefreshMysticalShop() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRefreshMysticalShop.Cmd,m_NAtagCMRefreshMysticalShop.SubCmd))] = m_NAtagCMRefreshMysticalShop + + +#------------------------------------------------------ # A2 14 刷新定时神秘商店物品#tagCMRefreshShopItem class tagCMRefreshShopItem(Structure): @@ -5494,8 +6048,10 @@ class tagCMEquipDecompose(Structure): Head = tagHead() - IndexCount = 0 #(BYTE IndexCount)//材料所在背包索引的数量 - IndexList = list() #(vector<BYTE> IndexList)//材料所在背包索引列表 + Count = 0 #(BYTE Count)//材料所在背包索引的数量 + IndexList = list() #(vector<WORD> IndexList)//材料所在背包索引列表 + ItemIDList = list() #(vector<DWORD> ItemIDList)//材料所在背包物品ID列表 + IsAuto = 0 #(BYTE IsAuto)//是否自动分解 data = None def __init__(self): @@ -5507,10 +6063,14 @@ def ReadData(self, _lpData, _pos=0, _Len=0): self.Clear() _pos = self.Head.ReadData(_lpData, _pos) - self.IndexCount,_pos = CommFunc.ReadBYTE(_lpData, _pos) - for i in range(self.IndexCount): - value,_pos=CommFunc.ReadBYTE(_lpData,_pos) + self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.Count): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) self.IndexList.append(value) + for i in range(self.Count): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.ItemIDList.append(value) + self.IsAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos) return _pos def Clear(self): @@ -5518,36 +6078,47 @@ self.Head.Clear() self.Head.Cmd = 0xA3 self.Head.SubCmd = 0x2C - self.IndexCount = 0 + self.Count = 0 self.IndexList = list() + self.ItemIDList = list() + self.IsAuto = 0 return def GetLength(self): length = 0 length += self.Head.GetLength() length += 1 - length += 1 * self.IndexCount + length += 2 * self.Count + length += 4 * self.Count + length += 1 return length def GetBuffer(self): data = '' data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) - data = CommFunc.WriteBYTE(data, self.IndexCount) - for i in range(self.IndexCount): - data = CommFunc.WriteBYTE(data, self.IndexList[i]) + data = CommFunc.WriteBYTE(data, self.Count) + for i in range(self.Count): + data = CommFunc.WriteWORD(data, self.IndexList[i]) + for i in range(self.Count): + data = CommFunc.WriteDWORD(data, self.ItemIDList[i]) + data = CommFunc.WriteBYTE(data, self.IsAuto) return data def OutputString(self): DumpString = ''' Head:%s, - IndexCount:%d, - IndexList:%s + Count:%d, + IndexList:%s, + ItemIDList:%s, + IsAuto:%d '''\ %( self.Head.OutputString(), - self.IndexCount, - "..." + self.Count, + "...", + "...", + self.IsAuto ) return DumpString @@ -5670,6 +6241,58 @@ m_NAtagEquipPlus=tagEquipPlus() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagEquipPlus.Cmd,m_NAtagEquipPlus.SubCmd))] = m_NAtagEquipPlus + + +#------------------------------------------------------ +# A3 16 装备强化进化 #tagCMEquipPlusEvolve + +class tagCMEquipPlusEvolve(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("ItemIndex", c_ushort), #装备在背包中索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA3 + self.SubCmd = 0x16 + 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 = 0x16 + self.ItemIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMEquipPlusEvolve) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A3 16 装备强化进化 //tagCMEquipPlusEvolve: + Cmd:%s, + SubCmd:%s, + ItemIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.ItemIndex + ) + return DumpString + + +m_NAtagCMEquipPlusEvolve=tagCMEquipPlusEvolve() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMEquipPlusEvolve.Cmd,m_NAtagCMEquipPlusEvolve.SubCmd))] = m_NAtagCMEquipPlusEvolve #------------------------------------------------------ @@ -5953,6 +6576,62 @@ #------------------------------------------------------ +# A3 30 装备诛仙装备 #tagCMEquipZhuXianItem + +class tagCMEquipZhuXianItem(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("EquipIndex", c_ubyte), #装备在诛仙装备背包中的索引 + ("ItemIndex", c_ubyte), #装备在诛仙物品背包中的索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA3 + 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 = 0xA3 + self.SubCmd = 0x30 + self.EquipIndex = 0 + self.ItemIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMEquipZhuXianItem) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A3 30 装备诛仙装备 //tagCMEquipZhuXianItem: + Cmd:%s, + SubCmd:%s, + EquipIndex:%d, + ItemIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.EquipIndex, + self.ItemIndex + ) + return DumpString + + +m_NAtagCMEquipZhuXianItem=tagCMEquipZhuXianItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMEquipZhuXianItem.Cmd,m_NAtagCMEquipZhuXianItem.SubCmd))] = m_NAtagCMEquipZhuXianItem + + +#------------------------------------------------------ # A3 12 守护拾取物品 #tagCMGuardPickupItem class tagCMGuardPickupItem(Structure): @@ -6069,6 +6748,62 @@ m_NAtagCMItemDecompound=tagCMItemDecompound() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMItemDecompound.Cmd,m_NAtagCMItemDecompound.SubCmd))] = m_NAtagCMItemDecompound + + +#------------------------------------------------------ +# A3 08 物品过期 #tagCMItemTimeout + +class tagCMItemTimeout(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("PackType", c_ubyte), #背包类型 + ("ItemIndex", c_ubyte), #物品在背包中索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA3 + self.SubCmd = 0x08 + 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 = 0x08 + self.PackType = 0 + self.ItemIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMItemTimeout) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A3 08 物品过期 //tagCMItemTimeout: + Cmd:%s, + SubCmd:%s, + PackType:%d, + ItemIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.PackType, + self.ItemIndex + ) + return DumpString + + +m_NAtagCMItemTimeout=tagCMItemTimeout() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMItemTimeout.Cmd,m_NAtagCMItemTimeout.SubCmd))] = m_NAtagCMItemTimeout #------------------------------------------------------ @@ -6355,118 +7090,6 @@ #------------------------------------------------------ -#A3 17 套装合成#tagCMSuitCompose - -class tagCMSuitCompose(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("SuiteType", c_ubyte), # 套装类型 1普通 2强化 - ("EquipPlace", c_ubyte), # 装备位置 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA3 - 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 = 0xA3 - self.SubCmd = 0x17 - self.SuiteType = 0 - self.EquipPlace = 0 - return - - def GetLength(self): - return sizeof(tagCMSuitCompose) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''//A3 17 套装合成//tagCMSuitCompose: - Cmd:%s, - SubCmd:%s, - SuiteType:%d, - EquipPlace:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.SuiteType, - self.EquipPlace - ) - return DumpString - - -m_NAtagCMSuitCompose=tagCMSuitCompose() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSuitCompose.Cmd,m_NAtagCMSuitCompose.SubCmd))] = m_NAtagCMSuitCompose - - -#------------------------------------------------------ -# A3 08 套装拆解 #tagCMSuiteDecompose - -class tagCMSuiteDecompose(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("EquipPlace", c_ubyte), #部位索引 - ("SuiteType", c_ubyte), #套装类型 0代表全部类型 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA3 - self.SubCmd = 0x08 - 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 = 0x08 - self.EquipPlace = 0 - self.SuiteType = 0 - return - - def GetLength(self): - return sizeof(tagCMSuiteDecompose) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''// A3 08 套装拆解 //tagCMSuiteDecompose: - Cmd:%s, - SubCmd:%s, - EquipPlace:%d, - SuiteType:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.EquipPlace, - self.SuiteType - ) - return DumpString - - -m_NAtagCMSuiteDecompose=tagCMSuiteDecompose() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSuiteDecompose.Cmd,m_NAtagCMSuiteDecompose.SubCmd))] = m_NAtagCMSuiteDecompose - - -#------------------------------------------------------ #A3 20 将魔方背包中的物品转移到人物背包中 #tagCMMagicItemPutInItemPack class tagCMMagicItemPutInItemPack(Structure): @@ -6713,6 +7336,58 @@ #------------------------------------------------------ +# A3 31 卸下诛仙装备 #tagCMUnEquipZhuXianItem + +class tagCMUnEquipZhuXianItem(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("EquipIndex", c_ubyte), #装备在诛仙装备背包中的索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA3 + 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 = 0xA3 + self.SubCmd = 0x31 + self.EquipIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMUnEquipZhuXianItem) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A3 31 卸下诛仙装备 //tagCMUnEquipZhuXianItem: + Cmd:%s, + SubCmd:%s, + EquipIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.EquipIndex + ) + return DumpString + + +m_NAtagCMUnEquipZhuXianItem=tagCMUnEquipZhuXianItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMUnEquipZhuXianItem.Cmd,m_NAtagCMUnEquipZhuXianItem.SubCmd))] = m_NAtagCMUnEquipZhuXianItem + + +#------------------------------------------------------ # A3 2B 一键使用属性果实 #tagCMUseAllAttrFruit class tagCMUseAllAttrFruit(Structure): @@ -6889,6 +7564,90 @@ m_NAtagCMWingUp=tagCMWingUp() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMWingUp.Head.Cmd,m_NAtagCMWingUp.Head.SubCmd))] = m_NAtagCMWingUp + + +#------------------------------------------------------ +# A3 32 诛仙装备分解 #tagCMZhuXianEquipDecompose + +class tagCMZhuXianEquipDecompose(Structure): + Head = tagHead() + Count = 0 #(BYTE Count)//材料所在背包索引的数量 + IndexList = list() #(vector<WORD> IndexList)//材料所在背包索引列表 + ItemIDList = list() #(vector<DWORD> ItemIDList)//材料所在背包物品ID列表 + IsAuto = 0 #(BYTE IsAuto)//是否自动分解 + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA3 + self.Head.SubCmd = 0x32 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.Count): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) + self.IndexList.append(value) + for i in range(self.Count): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.ItemIDList.append(value) + self.IsAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA3 + self.Head.SubCmd = 0x32 + self.Count = 0 + self.IndexList = list() + self.ItemIDList = list() + self.IsAuto = 0 + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 2 * self.Count + length += 4 * self.Count + length += 1 + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteBYTE(data, self.Count) + for i in range(self.Count): + data = CommFunc.WriteWORD(data, self.IndexList[i]) + for i in range(self.Count): + data = CommFunc.WriteDWORD(data, self.ItemIDList[i]) + data = CommFunc.WriteBYTE(data, self.IsAuto) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + Count:%d, + IndexList:%s, + ItemIDList:%s, + IsAuto:%d + '''\ + %( + self.Head.OutputString(), + self.Count, + "...", + "...", + self.IsAuto + ) + return DumpString + + +m_NAtagCMZhuXianEquipDecompose=tagCMZhuXianEquipDecompose() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMZhuXianEquipDecompose.Head.Cmd,m_NAtagCMZhuXianEquipDecompose.Head.SubCmd))] = m_NAtagCMZhuXianEquipDecompose #------------------------------------------------------ @@ -7109,58 +7868,6 @@ m_NAtagCMActiveAllEquipAttr=tagCMActiveAllEquipAttr() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActiveAllEquipAttr.Cmd,m_NAtagCMActiveAllEquipAttr.SubCmd))] = m_NAtagCMActiveAllEquipAttr - - -#------------------------------------------------------ -# A5 12 激活法宝之魂 #tagCMActiveMWSoul - -class tagCMActiveMWSoul(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("ID", c_ubyte), #编号 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA5 - 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 = 0xA5 - self.SubCmd = 0x12 - self.ID = 0 - return - - def GetLength(self): - return sizeof(tagCMActiveMWSoul) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''// A5 12 激活法宝之魂 //tagCMActiveMWSoul: - Cmd:%s, - SubCmd:%s, - ID:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.ID - ) - return DumpString - - -m_NAtagCMActiveMWSoul=tagCMActiveMWSoul() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActiveMWSoul.Cmd,m_NAtagCMActiveMWSoul.SubCmd))] = m_NAtagCMActiveMWSoul #------------------------------------------------------ @@ -8088,6 +8795,83 @@ #------------------------------------------------------ +# A5 20 时装分解 #tagCMCoatDecompose + +class tagCMCoatDecompose(Structure): + Head = tagHead() + Count = 0 #(BYTE Count)//材料所在背包索引的数量 + IndexList = list() #(vector<WORD> IndexList)//材料所在背包索引列表 + ItemIDList = list() #(vector<DWORD> ItemIDList)//材料所在背包物品ID列表 + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x20 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.Count): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) + self.IndexList.append(value) + for i in range(self.Count): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.ItemIDList.append(value) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x20 + self.Count = 0 + self.IndexList = list() + self.ItemIDList = list() + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 2 * self.Count + length += 4 * self.Count + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteBYTE(data, self.Count) + for i in range(self.Count): + data = CommFunc.WriteWORD(data, self.IndexList[i]) + for i in range(self.Count): + data = CommFunc.WriteDWORD(data, self.ItemIDList[i]) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + Count:%d, + IndexList:%s, + ItemIDList:%s + '''\ + %( + self.Head.OutputString(), + self.Count, + "...", + "..." + ) + return DumpString + + +m_NAtagCMCoatDecompose=tagCMCoatDecompose() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCoatDecompose.Head.Cmd,m_NAtagCMCoatDecompose.Head.SubCmd))] = m_NAtagCMCoatDecompose + + +#------------------------------------------------------ # A5 0B 玩家时装升级 #tagCMCoatUp class tagCMCoatUp(Structure): @@ -8095,7 +8879,7 @@ _fields_ = [ ("Cmd", c_ubyte), ("SubCmd", c_ubyte), - ("CoatIndex", c_ubyte), # 时装索引 + ("CoatIndex", c_int), # 时装索引 ] def __init__(self): @@ -8629,6 +9413,90 @@ #------------------------------------------------------ +# A5 C5 装备部位升星 #tagCMEquipPartStarUp + +class tagCMEquipPartStarUp(Structure): + Head = tagHead() + EquipPackIndex = 0 #(WORD EquipPackIndex)// 部位格子索引 + CostEquipCnt = 0 #(BYTE CostEquipCnt)// 装备个数 + CostEquipIndex = list() #(vector<WORD> CostEquipIndex)// 装备索引 + CostEquipID = list() #(vector<DWORD> CostEquipID)// 装备物品ID + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0xC5 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.EquipPackIndex,_pos = CommFunc.ReadWORD(_lpData, _pos) + self.CostEquipCnt,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.CostEquipCnt): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) + self.CostEquipIndex.append(value) + for i in range(self.CostEquipCnt): + value,_pos=CommFunc.ReadDWORD(_lpData,_pos) + self.CostEquipID.append(value) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0xC5 + self.EquipPackIndex = 0 + self.CostEquipCnt = 0 + self.CostEquipIndex = list() + self.CostEquipID = list() + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 2 + length += 1 + length += 2 * self.CostEquipCnt + length += 4 * self.CostEquipCnt + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteWORD(data, self.EquipPackIndex) + data = CommFunc.WriteBYTE(data, self.CostEquipCnt) + for i in range(self.CostEquipCnt): + data = CommFunc.WriteWORD(data, self.CostEquipIndex[i]) + for i in range(self.CostEquipCnt): + data = CommFunc.WriteDWORD(data, self.CostEquipID[i]) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + EquipPackIndex:%d, + CostEquipCnt:%d, + CostEquipIndex:%s, + CostEquipID:%s + '''\ + %( + self.Head.OutputString(), + self.EquipPackIndex, + self.CostEquipCnt, + "...", + "..." + ) + return DumpString + + +m_NAtagCMEquipPartStarUp=tagCMEquipPartStarUp() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMEquipPartStarUp.Head.Cmd,m_NAtagCMEquipPartStarUp.Head.SubCmd))] = m_NAtagCMEquipPartStarUp + + +#------------------------------------------------------ # A5 48 兑换大师等级经验 #tagCMExchangeMasterEXP class tagCMExchangeMasterEXP(Structure): @@ -8738,6 +9606,220 @@ m_NAtagCMExchangeReiki=tagCMExchangeReiki() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExchangeReiki.Cmd,m_NAtagCMExchangeReiki.SubCmd))] = m_NAtagCMExchangeReiki + + +#------------------------------------------------------ +# A5 1C 聚魂合成 #tagCMGatherSoulCompound + +class tagCMGatherSoulCompound(Structure): + Head = tagHead() + Cnt = 0 #(BYTE Cnt) + PackList = list() #(vector<BYTE> PackList)//所在位置 0-背包 1-孔 + IndexList = list() #(vector<WORD> IndexList)//物品索引 + TagItemID = 0 #(DWORD TagItemID)//合成目标物品ID + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x1C + 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): + value,_pos=CommFunc.ReadBYTE(_lpData,_pos) + self.PackList.append(value) + for i in range(self.Cnt): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) + self.IndexList.append(value) + self.TagItemID,_pos = CommFunc.ReadDWORD(_lpData, _pos) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x1C + self.Cnt = 0 + self.PackList = list() + self.IndexList = list() + self.TagItemID = 0 + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 1 * self.Cnt + length += 2 * self.Cnt + length += 4 + + 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.WriteBYTE(data, self.PackList[i]) + for i in range(self.Cnt): + data = CommFunc.WriteWORD(data, self.IndexList[i]) + data = CommFunc.WriteDWORD(data, self.TagItemID) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + Cnt:%d, + PackList:%s, + IndexList:%s, + TagItemID:%d + '''\ + %( + self.Head.OutputString(), + self.Cnt, + "...", + "...", + self.TagItemID + ) + return DumpString + + +m_NAtagCMGatherSoulCompound=tagCMGatherSoulCompound() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulCompound.Head.Cmd,m_NAtagCMGatherSoulCompound.Head.SubCmd))] = m_NAtagCMGatherSoulCompound + + +#------------------------------------------------------ +# A5 19 聚魂分解 #tagCMGatherSoulDecompose + +class tagCMGatherSoulDecompose(Structure): + Head = tagHead() + IsAuto = 0 #(BYTE IsAuto)// 是否自动分解 + Count = 0 #(BYTE Count)// 指定批量分解数,最大不超过50个 + PlaceIndexList = list() #(vector<WORD> PlaceIndexList)// 批量分解位置索引列表 + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x19 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.IsAuto,_pos = CommFunc.ReadBYTE(_lpData, _pos) + self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos) + for i in range(self.Count): + value,_pos=CommFunc.ReadWORD(_lpData,_pos) + self.PlaceIndexList.append(value) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xA5 + self.Head.SubCmd = 0x19 + self.IsAuto = 0 + self.Count = 0 + self.PlaceIndexList = list() + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 1 + length += 1 + length += 2 * self.Count + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteBYTE(data, self.IsAuto) + data = CommFunc.WriteBYTE(data, self.Count) + for i in range(self.Count): + data = CommFunc.WriteWORD(data, self.PlaceIndexList[i]) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + IsAuto:%d, + Count:%d, + PlaceIndexList:%s + '''\ + %( + self.Head.OutputString(), + self.IsAuto, + self.Count, + "..." + ) + return DumpString + + +m_NAtagCMGatherSoulDecompose=tagCMGatherSoulDecompose() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulDecompose.Head.Cmd,m_NAtagCMGatherSoulDecompose.Head.SubCmd))] = m_NAtagCMGatherSoulDecompose + + +#------------------------------------------------------ +# A5 18 聚魂升级 #tagCMGatherSoulUp + +class tagCMGatherSoulUp(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("PlaceType", c_ubyte), # 位置类型;0-背包,1-孔 + ("PlaceIndex", c_ushort), # 位置索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA5 + 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 = 0xA5 + self.SubCmd = 0x18 + self.PlaceType = 0 + self.PlaceIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMGatherSoulUp) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A5 18 聚魂升级 //tagCMGatherSoulUp: + Cmd:%s, + SubCmd:%s, + PlaceType:%d, + PlaceIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.PlaceType, + self.PlaceIndex + ) + return DumpString + + +m_NAtagCMGatherSoulUp=tagCMGatherSoulUp() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMGatherSoulUp.Cmd,m_NAtagCMGatherSoulUp.SubCmd))] = m_NAtagCMGatherSoulUp #------------------------------------------------------ @@ -9181,62 +10263,6 @@ #------------------------------------------------------ -# A5 0D 升级法宝技能 #tagCMMagicWeaponSkillUp - -class tagCMMagicWeaponSkillUp(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("SkillTypeID", c_ushort), - ("CostIndex", c_ubyte), - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA5 - self.SubCmd = 0x0D - 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 = 0x0D - self.SkillTypeID = 0 - self.CostIndex = 0 - return - - def GetLength(self): - return sizeof(tagCMMagicWeaponSkillUp) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''// A5 0D 升级法宝技能 //tagCMMagicWeaponSkillUp: - Cmd:%s, - SubCmd:%s, - SkillTypeID:%d, - CostIndex:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.SkillTypeID, - self.CostIndex - ) - return DumpString - - -m_NAtagCMMagicWeaponSkillUp=tagCMMagicWeaponSkillUp() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMagicWeaponSkillUp.Cmd,m_NAtagCMMagicWeaponSkillUp.SubCmd))] = m_NAtagCMMagicWeaponSkillUp - - -#------------------------------------------------------ # A5 16 法宝状态记录 #tagCMMagicWeaponState class tagCMMagicWeaponState(Structure): @@ -9338,62 +10364,6 @@ m_NAtagCMMagicWeaponUp=tagCMMagicWeaponUp() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMagicWeaponUp.Cmd,m_NAtagCMMagicWeaponUp.SubCmd))] = m_NAtagCMMagicWeaponUp - - -#------------------------------------------------------ -# A5 77 玩家精炼法宝 #tagCMMWRefine - -class tagCMMWRefine(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("MWID", c_int), # 法宝ID - ("MaterialID", c_int), #材料ID - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA5 - self.SubCmd = 0x77 - 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 = 0x77 - self.MWID = 0 - self.MaterialID = 0 - return - - def GetLength(self): - return sizeof(tagCMMWRefine) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''// A5 77 玩家精炼法宝 //tagCMMWRefine: - Cmd:%s, - SubCmd:%s, - MWID:%d, - MaterialID:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.MWID, - self.MaterialID - ) - return DumpString - - -m_NAtagCMMWRefine=tagCMMWRefine() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMWRefine.Cmd,m_NAtagCMMWRefine.SubCmd))] = m_NAtagCMMWRefine #------------------------------------------------------ @@ -9956,58 +10926,6 @@ m_NAtagCMRecoverGain=tagCMRecoverGain() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRecoverGain.Head.Cmd,m_NAtagCMRecoverGain.Head.SubCmd))] = m_NAtagCMRecoverGain - - -#------------------------------------------------------ -# A5 0C 使用道具减少渡劫打坐时间 #tagCMReduceSitTime - -class tagCMReduceSitTime(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("ItemCnt", c_ushort), # 道具数量 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xA5 - self.SubCmd = 0x0C - 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 = 0x0C - self.ItemCnt = 0 - return - - def GetLength(self): - return sizeof(tagCMReduceSitTime) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''// A5 0C 使用道具减少渡劫打坐时间 //tagCMReduceSitTime: - Cmd:%s, - SubCmd:%s, - ItemCnt:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.ItemCnt - ) - return DumpString - - -m_NAtagCMReduceSitTime=tagCMReduceSitTime() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMReduceSitTime.Cmd,m_NAtagCMReduceSitTime.SubCmd))] = m_NAtagCMReduceSitTime #------------------------------------------------------ @@ -10584,6 +11502,54 @@ #------------------------------------------------------ +# A5 21 境界修为池提取 #tagCMTakeOutRealmExp + +class tagCMTakeOutRealmExp(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA5 + self.SubCmd = 0x21 + 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 = 0x21 + return + + def GetLength(self): + return sizeof(tagCMTakeOutRealmExp) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A5 21 境界修为池提取 //tagCMTakeOutRealmExp: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMTakeOutRealmExp=tagCMTakeOutRealmExp() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMTakeOutRealmExp.Cmd,m_NAtagCMTakeOutRealmExp.SubCmd))] = m_NAtagCMTakeOutRealmExp + + +#------------------------------------------------------ # A5 11 试用首充武器 #tagCMTryFirstGoldItem class tagCMTryFirstGoldItem(Structure): @@ -10797,6 +11763,62 @@ m_NAtagUseNewGuyCard=tagUseNewGuyCard() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagUseNewGuyCard.Head.Cmd,m_NAtagUseNewGuyCard.Head.SubCmd))] = m_NAtagUseNewGuyCard + + +#------------------------------------------------------ +# A5 1D 法宝佩戴 #tagCMWearMagicWeapon + +class tagCMWearMagicWeapon(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("MWID", c_int), #法宝ID + ("State", c_ubyte), #0-卸下 1-佩戴 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA5 + self.SubCmd = 0x1D + 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 = 0x1D + self.MWID = 0 + self.State = 0 + return + + def GetLength(self): + return sizeof(tagCMWearMagicWeapon) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A5 1D 法宝佩戴 //tagCMWearMagicWeapon: + Cmd:%s, + SubCmd:%s, + MWID:%d, + State:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.MWID, + self.State + ) + return DumpString + + +m_NAtagCMWearMagicWeapon=tagCMWearMagicWeapon() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMWearMagicWeapon.Cmd,m_NAtagCMWearMagicWeapon.SubCmd))] = m_NAtagCMWearMagicWeapon #------------------------------------------------------ @@ -11537,6 +12559,54 @@ #------------------------------------------------------ +# A8 06 查询充值结果 #tagCMQueryRecharge + +class tagCMQueryRecharge(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xA8 + 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 = 0xA8 + self.SubCmd = 0x06 + return + + def GetLength(self): + return sizeof(tagCMQueryRecharge) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// A8 06 查询充值结果 //tagCMQueryRecharge: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMQueryRecharge=tagCMQueryRecharge() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMQueryRecharge.Cmd,m_NAtagCMQueryRecharge.SubCmd))] = m_NAtagCMQueryRecharge + + +#------------------------------------------------------ # A8 05 VIP杀怪等级信息同步开关 #tagCMVIPKillNPCLVInfoSwitch class tagCMVIPKillNPCLVInfoSwitch(Structure): @@ -11981,6 +13051,54 @@ #------------------------------------------------------ +# AA 08 开始幸运鉴宝 #tagCMStartLuckyTreasure + +class tagCMStartLuckyTreasure(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xAA + self.SubCmd = 0x08 + 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 = 0x08 + return + + def GetLength(self): + return sizeof(tagCMStartLuckyTreasure) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// AA 08 开始幸运鉴宝 //tagCMStartLuckyTreasure: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMStartLuckyTreasure=tagCMStartLuckyTreasure() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMStartLuckyTreasure.Cmd,m_NAtagCMStartLuckyTreasure.SubCmd))] = m_NAtagCMStartLuckyTreasure + + +#------------------------------------------------------ # AB 0B 购买天神经验 #tagCMBuySkyGodExp class tagCMBuySkyGodExp(Structure): @@ -12037,6 +13155,7 @@ ("Cmd", c_ubyte), ("SubCmd", c_ubyte), ("RedPaketID", c_int), # 红包ID + ("GetWay", c_ubyte), #获得途径 ] def __init__(self): @@ -12054,6 +13173,7 @@ self.Cmd = 0xAB self.SubCmd = 0x12 self.RedPaketID = 0 + self.GetWay = 0 return def GetLength(self): @@ -12066,12 +13186,14 @@ DumpString = '''// AB 12 抢红包 //tagCMGrabFamilyRedPacket: Cmd:%s, SubCmd:%s, - RedPaketID:%d + RedPaketID:%d, + GetWay:%d '''\ %( self.Cmd, self.SubCmd, - self.RedPaketID + self.RedPaketID, + self.GetWay ) return DumpString @@ -13299,6 +14421,162 @@ #------------------------------------------------------ +# B1 06 助战召唤 #tagCMHelpBattleCall + +class tagCMHelpBattleCall(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("IsOneKeyCall", c_ubyte), # 是否一键召唤 + ("PlayerID", c_int), # 召唤的玩家ID,大于1小于100代表机器人 + ("IsGoldCall", c_ubyte), # 是否仙玉召唤 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB1 + 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 = 0xB1 + self.SubCmd = 0x06 + self.IsOneKeyCall = 0 + self.PlayerID = 0 + self.IsGoldCall = 0 + return + + def GetLength(self): + return sizeof(tagCMHelpBattleCall) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B1 06 助战召唤 //tagCMHelpBattleCall: + Cmd:%s, + SubCmd:%s, + IsOneKeyCall:%d, + PlayerID:%d, + IsGoldCall:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.IsOneKeyCall, + self.PlayerID, + self.IsGoldCall + ) + return DumpString + + +m_NAtagCMHelpBattleCall=tagCMHelpBattleCall() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleCall.Cmd,m_NAtagCMHelpBattleCall.SubCmd))] = m_NAtagCMHelpBattleCall + + +#------------------------------------------------------ +# B1 05 助战登记 #tagCMHelpBattleCheckIn + +class tagCMHelpBattleCheckIn(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB1 + 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 = 0xB1 + self.SubCmd = 0x05 + return + + def GetLength(self): + return sizeof(tagCMHelpBattleCheckIn) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B1 05 助战登记 //tagCMHelpBattleCheckIn: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMHelpBattleCheckIn=tagCMHelpBattleCheckIn() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleCheckIn.Cmd,m_NAtagCMHelpBattleCheckIn.SubCmd))] = m_NAtagCMHelpBattleCheckIn + + +#------------------------------------------------------ +# B1 07 助战刷新 #tagCMHelpBattleRefresh + +class tagCMHelpBattleRefresh(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB1 + self.SubCmd = 0x07 + 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 = 0xB1 + self.SubCmd = 0x07 + return + + def GetLength(self): + return sizeof(tagCMHelpBattleRefresh) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B1 07 助战刷新 //tagCMHelpBattleRefresh: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMHelpBattleRefresh=tagCMHelpBattleRefresh() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMHelpBattleRefresh.Cmd,m_NAtagCMHelpBattleRefresh.SubCmd))] = m_NAtagCMHelpBattleRefresh + + +#------------------------------------------------------ # B1 02 领取多倍副本奖励 #tagCMGetMultiFBPrize class tagCMGetMultiFBPrize(Structure): @@ -13759,6 +15037,66 @@ m_NAtagCMFightMove=tagCMFightMove() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMFightMove.Cmd,m_NAtagCMFightMove.SubCmd))] = m_NAtagCMFightMove + + +#------------------------------------------------------ +#B4 0B 根据类型来决定移动的方式 #tagCMMoveByType + +class tagCMMoveByType(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("PosX", c_ushort), # 目标X + ("PosY", c_ushort), # 目标Y + ("MoveType", c_ubyte), #移动方式 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB4 + self.SubCmd = 0x0B + 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 = 0xB4 + self.SubCmd = 0x0B + self.PosX = 0 + self.PosY = 0 + self.MoveType = 0 + return + + def GetLength(self): + return sizeof(tagCMMoveByType) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''//B4 0B 根据类型来决定移动的方式 //tagCMMoveByType: + Cmd:%s, + SubCmd:%s, + PosX:%d, + PosY:%d, + MoveType:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.PosX, + self.PosY, + self.MoveType + ) + return DumpString + + +m_NAtagCMMoveByType=tagCMMoveByType() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMoveByType.Cmd,m_NAtagCMMoveByType.SubCmd))] = m_NAtagCMMoveByType #------------------------------------------------------ @@ -14478,6 +15816,70 @@ #------------------------------------------------------ +# B5 14 拍卖行竞价物品 #tagCMBiddingAuctionItem + +class tagCMBiddingAuctionItem(Structure): + Head = tagHead() + ItemGUID = "" #(char ItemGUID[40]) + BiddingPrice = 0 #(WORD BiddingPrice)//竞价价格 + data = None + + def __init__(self): + self.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x14 + return + + def ReadData(self, _lpData, _pos=0, _Len=0): + self.Clear() + _pos = self.Head.ReadData(_lpData, _pos) + self.ItemGUID,_pos = CommFunc.ReadString(_lpData, _pos,40) + self.BiddingPrice,_pos = CommFunc.ReadWORD(_lpData, _pos) + return _pos + + def Clear(self): + self.Head = tagHead() + self.Head.Clear() + self.Head.Cmd = 0xB5 + self.Head.SubCmd = 0x14 + self.ItemGUID = "" + self.BiddingPrice = 0 + return + + def GetLength(self): + length = 0 + length += self.Head.GetLength() + length += 40 + length += 2 + + return length + + def GetBuffer(self): + data = '' + data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) + data = CommFunc.WriteString(data, 40, self.ItemGUID) + data = CommFunc.WriteWORD(data, self.BiddingPrice) + return data + + def OutputString(self): + DumpString = ''' + Head:%s, + ItemGUID:%s, + BiddingPrice:%d + '''\ + %( + self.Head.OutputString(), + self.ItemGUID, + self.BiddingPrice + ) + return DumpString + + +m_NAtagCMBiddingAuctionItem=tagCMBiddingAuctionItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMBiddingAuctionItem.Head.Cmd,m_NAtagCMBiddingAuctionItem.Head.SubCmd))] = m_NAtagCMBiddingAuctionItem + + +#------------------------------------------------------ # B5 02 交易所购买物品#tagCMPYBuyBourseItem class tagCMPYBuyBourseItem(Structure): @@ -14627,6 +16029,58 @@ #------------------------------------------------------ +# B5 13 拍卖行上架拍品 #tagCMSellAuctionItem + +class tagCMSellAuctionItem(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("ItemIndex", c_ubyte), #物品在背包中索引 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xB5 + 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 = 0xB5 + self.SubCmd = 0x13 + self.ItemIndex = 0 + return + + def GetLength(self): + return sizeof(tagCMSellAuctionItem) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// B5 13 拍卖行上架拍品 //tagCMSellAuctionItem: + Cmd:%s, + SubCmd:%s, + ItemIndex:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.ItemIndex + ) + return DumpString + + +m_NAtagCMSellAuctionItem=tagCMSellAuctionItem() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMSellAuctionItem.Cmd,m_NAtagCMSellAuctionItem.SubCmd))] = m_NAtagCMSellAuctionItem + + +#------------------------------------------------------ # B9 04 修改队伍相关审核状态 #tagCMChangeTeamCheckState class tagCMChangeTeamCheckState(Structure): @@ -14683,20 +16137,23 @@ #------------------------------------------------------ -#C1 03 领取奖励表奖励 #tagMSGetReward +# C1 06 跨服NPC对话 #tagCMCrossNPCTalk -class tagMSGetReward(Structure): +class tagCMCrossNPCTalk(Structure): _pack_ = 1 _fields_ = [ ("Cmd", c_ubyte), ("SubCmd", c_ubyte), - ("RewardType", c_ubyte), #奖励表奖励类型 + ("ObjID", c_int), + ("NPCID", c_int), + ("PosX", c_ushort), + ("PosY", c_ushort), ] def __init__(self): self.Clear() self.Cmd = 0xC1 - self.SubCmd = 0x03 + self.SubCmd = 0x06 return def ReadData(self, stringData, _pos=0, _len=0): @@ -14706,38 +16163,47 @@ def Clear(self): self.Cmd = 0xC1 - self.SubCmd = 0x03 - self.RewardType = 0 + self.SubCmd = 0x06 + self.ObjID = 0 + self.NPCID = 0 + self.PosX = 0 + self.PosY = 0 return def GetLength(self): - return sizeof(tagMSGetReward) + return sizeof(tagCMCrossNPCTalk) def GetBuffer(self): return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = '''//C1 03 领取奖励表奖励 //tagMSGetReward: + DumpString = '''// C1 06 跨服NPC对话 //tagCMCrossNPCTalk: Cmd:%s, SubCmd:%s, - RewardType:%d + ObjID:%d, + NPCID:%d, + PosX:%d, + PosY:%d '''\ %( self.Cmd, self.SubCmd, - self.RewardType + self.ObjID, + self.NPCID, + self.PosX, + self.PosY ) return DumpString -m_NAtagMSGetReward=tagMSGetReward() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMSGetReward.Cmd,m_NAtagMSGetReward.SubCmd))] = m_NAtagMSGetReward +m_NAtagCMCrossNPCTalk=tagCMCrossNPCTalk() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossNPCTalk.Cmd,m_NAtagCMCrossNPCTalk.SubCmd))] = m_NAtagCMCrossNPCTalk #------------------------------------------------------ -#C1 08 玩家执行膜拜 #tagPlayerMergeWorship +# C1 02 跨服PK购买次数 #tagCMCrossRealmPKBuy -class tagPlayerMergeWorship(Structure): +class tagCMCrossRealmPKBuy(Structure): _pack_ = 1 _fields_ = [ ("Cmd", c_ubyte), @@ -14747,7 +16213,7 @@ def __init__(self): self.Clear() self.Cmd = 0xC1 - self.SubCmd = 0x08 + self.SubCmd = 0x02 return def ReadData(self, stringData, _pos=0, _len=0): @@ -14757,17 +16223,17 @@ def Clear(self): self.Cmd = 0xC1 - self.SubCmd = 0x08 + self.SubCmd = 0x02 return def GetLength(self): - return sizeof(tagPlayerMergeWorship) + return sizeof(tagCMCrossRealmPKBuy) def GetBuffer(self): return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = '''//C1 08 玩家执行膜拜 //tagPlayerMergeWorship: + DumpString = '''// C1 02 跨服PK购买次数 //tagCMCrossRealmPKBuy: Cmd:%s, SubCmd:%s '''\ @@ -14778,106 +16244,70 @@ return DumpString -m_NAtagPlayerMergeWorship=tagPlayerMergeWorship() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagPlayerMergeWorship.Cmd,m_NAtagPlayerMergeWorship.SubCmd))] = m_NAtagPlayerMergeWorship +m_NAtagCMCrossRealmPKBuy=tagCMCrossRealmPKBuy() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKBuy.Cmd,m_NAtagCMCrossRealmPKBuy.SubCmd))] = m_NAtagCMCrossRealmPKBuy #------------------------------------------------------ -# C1 11 跨服王者争霸押注 #tagCMMergeKingSupport +# C1 03 跨服PK领取奖励 #tagCMCrossRealmPKGetAward -class tagCMMergeKingSupport(Structure): - Head = tagHead() - SupportType = 0 #(BYTE SupportType)// 0-押注; 1-贿赂 - GroupType = 0 #(BYTE GroupType)// 组类型;如32强、16强等 - BattleIndex = 0 #(BYTE BattleIndex)// 对战组索引,每种组类型的索引从1开始 - MoneyType = 0 #(BYTE MoneyType)// 押注的货币类型 - AccIDLen = 0 #(BYTE AccIDLen) - TagAccID = "" #(String TagAccID)// 支持的目标账号 - data = None +class tagCMCrossRealmPKGetAward(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("AwardType", c_ubyte), # 奖励类型;1-每日匹配奖励,2-每日胜利奖励,3-段位达标奖励,4-赛季结算奖励 + ("AwardData", c_ubyte), # 奖励类型对应领取值;每日匹配奖励时为匹配次数,每日胜利奖励时为胜利次数,段位达标奖励时为领取的段位 + ] def __init__(self): self.Clear() - self.Head.Cmd = 0xC1 - self.Head.SubCmd = 0x11 + self.Cmd = 0xC1 + self.SubCmd = 0x03 return - def ReadData(self, _lpData, _pos=0, _Len=0): + def ReadData(self, stringData, _pos=0, _len=0): self.Clear() - _pos = self.Head.ReadData(_lpData, _pos) - self.SupportType,_pos = CommFunc.ReadBYTE(_lpData, _pos) - self.GroupType,_pos = CommFunc.ReadBYTE(_lpData, _pos) - self.BattleIndex,_pos = CommFunc.ReadBYTE(_lpData, _pos) - self.MoneyType,_pos = CommFunc.ReadBYTE(_lpData, _pos) - self.AccIDLen,_pos = CommFunc.ReadBYTE(_lpData, _pos) - self.TagAccID,_pos = CommFunc.ReadString(_lpData, _pos,self.AccIDLen) - return _pos + memmove(addressof(self), stringData[_pos:], self.GetLength()) + return _pos + self.GetLength() def Clear(self): - self.Head = tagHead() - self.Head.Clear() - self.Head.Cmd = 0xC1 - self.Head.SubCmd = 0x11 - self.SupportType = 0 - self.GroupType = 0 - self.BattleIndex = 0 - self.MoneyType = 0 - self.AccIDLen = 0 - self.TagAccID = "" + self.Cmd = 0xC1 + self.SubCmd = 0x03 + self.AwardType = 0 + self.AwardData = 0 return def GetLength(self): - length = 0 - length += self.Head.GetLength() - length += 1 - length += 1 - length += 1 - length += 1 - length += 1 - length += len(self.TagAccID) - - return length + return sizeof(tagCMCrossRealmPKGetAward) def GetBuffer(self): - data = '' - data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer()) - data = CommFunc.WriteBYTE(data, self.SupportType) - data = CommFunc.WriteBYTE(data, self.GroupType) - data = CommFunc.WriteBYTE(data, self.BattleIndex) - data = CommFunc.WriteBYTE(data, self.MoneyType) - data = CommFunc.WriteBYTE(data, self.AccIDLen) - data = CommFunc.WriteString(data, self.AccIDLen, self.TagAccID) - return data + return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = ''' - Head:%s, - SupportType:%d, - GroupType:%d, - BattleIndex:%d, - MoneyType:%d, - AccIDLen:%d, - TagAccID:%s + DumpString = '''// C1 03 跨服PK领取奖励 //tagCMCrossRealmPKGetAward: + Cmd:%s, + SubCmd:%s, + AwardType:%d, + AwardData:%d '''\ %( - self.Head.OutputString(), - self.SupportType, - self.GroupType, - self.BattleIndex, - self.MoneyType, - self.AccIDLen, - self.TagAccID + self.Cmd, + self.SubCmd, + self.AwardType, + self.AwardData ) return DumpString -m_NAtagCMMergeKingSupport=tagCMMergeKingSupport() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMergeKingSupport.Head.Cmd,m_NAtagCMMergeKingSupport.Head.SubCmd))] = m_NAtagCMMergeKingSupport +m_NAtagCMCrossRealmPKGetAward=tagCMCrossRealmPKGetAward() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKGetAward.Cmd,m_NAtagCMCrossRealmPKGetAward.SubCmd))] = m_NAtagCMCrossRealmPKGetAward #------------------------------------------------------ -# C1 09 跨服PK匹配 #tagCMMergePKMatch +# C1 01 跨服PK匹配 #tagCMCrossRealmPKMatch -class tagCMMergePKMatch(Structure): +class tagCMCrossRealmPKMatch(Structure): _pack_ = 1 _fields_ = [ ("Cmd", c_ubyte), @@ -14888,7 +16318,7 @@ def __init__(self): self.Clear() self.Cmd = 0xC1 - self.SubCmd = 0x09 + self.SubCmd = 0x01 return def ReadData(self, stringData, _pos=0, _len=0): @@ -14898,18 +16328,18 @@ def Clear(self): self.Cmd = 0xC1 - self.SubCmd = 0x09 + self.SubCmd = 0x01 self.Type = 0 return def GetLength(self): - return sizeof(tagCMMergePKMatch) + return sizeof(tagCMCrossRealmPKMatch) def GetBuffer(self): return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = '''// C1 09 跨服PK匹配 //tagCMMergePKMatch: + DumpString = '''// C1 01 跨服PK匹配 //tagCMCrossRealmPKMatch: Cmd:%s, SubCmd:%s, Type:%d @@ -14922,24 +16352,25 @@ return DumpString -m_NAtagCMMergePKMatch=tagCMMergePKMatch() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMMergePKMatch.Cmd,m_NAtagCMMergePKMatch.SubCmd))] = m_NAtagCMMergePKMatch +m_NAtagCMCrossRealmPKMatch=tagCMCrossRealmPKMatch() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKMatch.Cmd,m_NAtagCMCrossRealmPKMatch.SubCmd))] = m_NAtagCMCrossRealmPKMatch #------------------------------------------------------ -# C1 10 跨服PK恢复连胜次数 #tagCMRecoverMergePKWin +# C1 08 跨服PK挑战机器人结算 #tagCMCrossRealmPKRobotOver -class tagCMRecoverMergePKWin(Structure): +class tagCMCrossRealmPKRobotOver(Structure): _pack_ = 1 _fields_ = [ ("Cmd", c_ubyte), ("SubCmd", c_ubyte), + ("IsWin", c_ubyte), #是否获胜 ] def __init__(self): self.Clear() self.Cmd = 0xC1 - self.SubCmd = 0x10 + self.SubCmd = 0x08 return def ReadData(self, stringData, _pos=0, _len=0): @@ -14949,17 +16380,120 @@ def Clear(self): self.Cmd = 0xC1 - self.SubCmd = 0x10 + self.SubCmd = 0x08 + self.IsWin = 0 return def GetLength(self): - return sizeof(tagCMRecoverMergePKWin) + return sizeof(tagCMCrossRealmPKRobotOver) def GetBuffer(self): return string_at(addressof(self), self.GetLength()) def OutputString(self): - DumpString = '''// C1 10 跨服PK恢复连胜次数 //tagCMRecoverMergePKWin: + DumpString = '''// C1 08 跨服PK挑战机器人结算 //tagCMCrossRealmPKRobotOver: + Cmd:%s, + SubCmd:%s, + IsWin:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.IsWin + ) + return DumpString + + +m_NAtagCMCrossRealmPKRobotOver=tagCMCrossRealmPKRobotOver() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKRobotOver.Cmd,m_NAtagCMCrossRealmPKRobotOver.SubCmd))] = m_NAtagCMCrossRealmPKRobotOver + + +#------------------------------------------------------ +# C1 05 进入跨服地图 #tagCMEnterCrossServer + +class tagCMEnterCrossServer(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("DataMapID", c_int), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC1 + 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 = 0xC1 + self.SubCmd = 0x05 + self.DataMapID = 0 + return + + def GetLength(self): + return sizeof(tagCMEnterCrossServer) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C1 05 进入跨服地图 //tagCMEnterCrossServer: + Cmd:%s, + SubCmd:%s, + DataMapID:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.DataMapID + ) + return DumpString + + +m_NAtagCMEnterCrossServer=tagCMEnterCrossServer() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMEnterCrossServer.Cmd,m_NAtagCMEnterCrossServer.SubCmd))] = m_NAtagCMEnterCrossServer + + +#------------------------------------------------------ +# C1 04 主动退出跨服 #tagCMExitCrossRealm + +class tagCMExitCrossRealm(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC1 + self.SubCmd = 0x04 + 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 = 0xC1 + self.SubCmd = 0x04 + return + + def GetLength(self): + return sizeof(tagCMExitCrossRealm) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C1 04 主动退出跨服 //tagCMExitCrossRealm: Cmd:%s, SubCmd:%s '''\ @@ -14970,5 +16504,5 @@ return DumpString -m_NAtagCMRecoverMergePKWin=tagCMRecoverMergePKWin() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMRecoverMergePKWin.Cmd,m_NAtagCMRecoverMergePKWin.SubCmd))] = m_NAtagCMRecoverMergePKWin \ No newline at end of file +m_NAtagCMExitCrossRealm=tagCMExitCrossRealm() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExitCrossRealm.Cmd,m_NAtagCMExitCrossRealm.SubCmd))] = m_NAtagCMExitCrossRealm \ No newline at end of file -- Gitblit v1.8.0