From ff605c7a895524d29abd2badfb38ad3f26fa8a1c Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期六, 22 十二月 2018 15:07:52 +0800 Subject: [PATCH] 5303 【后端】【1.4】仙盟宴会传功修改,开始答题时间修改 --- ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 690 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 624 insertions(+), 66 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py index 6b0bc08..294b874 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): @@ -3065,6 +3132,114 @@ m_NAtagCGGotoMergeServer=tagCGGotoMergeServer() ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCGGotoMergeServer.Cmd,m_NAtagCGGotoMergeServer.SubCmd))] = m_NAtagCGGotoMergeServer + + +#------------------------------------------------------ +# 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 #------------------------------------------------------ @@ -5494,8 +5669,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 +5684,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 +5699,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 @@ -8738,6 +8930,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 #------------------------------------------------------ @@ -14839,58 +15245,6 @@ #------------------------------------------------------ -#C1 03 领取奖励表奖励 #tagMSGetReward - -class tagMSGetReward(Structure): - _pack_ = 1 - _fields_ = [ - ("Cmd", c_ubyte), - ("SubCmd", c_ubyte), - ("RewardType", c_ubyte), #奖励表奖励类型 - ] - - def __init__(self): - self.Clear() - self.Cmd = 0xC1 - self.SubCmd = 0x03 - 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 = 0x03 - self.RewardType = 0 - return - - def GetLength(self): - return sizeof(tagMSGetReward) - - def GetBuffer(self): - return string_at(addressof(self), self.GetLength()) - - def OutputString(self): - DumpString = '''//C1 03 领取奖励表奖励 //tagMSGetReward: - Cmd:%s, - SubCmd:%s, - RewardType:%d - '''\ - %( - self.Cmd, - self.SubCmd, - self.RewardType - ) - return DumpString - - -m_NAtagMSGetReward=tagMSGetReward() -ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMSGetReward.Cmd,m_NAtagMSGetReward.SubCmd))] = m_NAtagMSGetReward - - -#------------------------------------------------------ #C1 08 玩家执行膜拜 #tagPlayerMergeWorship class tagPlayerMergeWorship(Structure): @@ -14939,6 +15293,210 @@ #------------------------------------------------------ +# C1 02 跨服PK购买次数 #tagCMCrossRealmPKBuy + +class tagCMCrossRealmPKBuy(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC1 + 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 = 0xC1 + self.SubCmd = 0x02 + return + + def GetLength(self): + return sizeof(tagCMCrossRealmPKBuy) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C1 02 跨服PK购买次数 //tagCMCrossRealmPKBuy: + Cmd:%s, + SubCmd:%s + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMCrossRealmPKBuy=tagCMCrossRealmPKBuy() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKBuy.Cmd,m_NAtagCMCrossRealmPKBuy.SubCmd))] = m_NAtagCMCrossRealmPKBuy + + +#------------------------------------------------------ +# C1 03 跨服PK领取奖励 #tagCMCrossRealmPKGetAward + +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.Cmd = 0xC1 + self.SubCmd = 0x03 + 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 = 0x03 + self.AwardType = 0 + self.AwardData = 0 + return + + def GetLength(self): + return sizeof(tagCMCrossRealmPKGetAward) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C1 03 跨服PK领取奖励 //tagCMCrossRealmPKGetAward: + Cmd:%s, + SubCmd:%s, + AwardType:%d, + AwardData:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.AwardType, + self.AwardData + ) + return DumpString + + +m_NAtagCMCrossRealmPKGetAward=tagCMCrossRealmPKGetAward() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKGetAward.Cmd,m_NAtagCMCrossRealmPKGetAward.SubCmd))] = m_NAtagCMCrossRealmPKGetAward + + +#------------------------------------------------------ +# C1 01 跨服PK匹配 #tagCMCrossRealmPKMatch + +class tagCMCrossRealmPKMatch(Structure): + _pack_ = 1 + _fields_ = [ + ("Cmd", c_ubyte), + ("SubCmd", c_ubyte), + ("Type", c_ubyte), # 0-取消匹配; 1-进行匹配 + ] + + def __init__(self): + self.Clear() + self.Cmd = 0xC1 + 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 = 0xC1 + self.SubCmd = 0x01 + self.Type = 0 + return + + def GetLength(self): + return sizeof(tagCMCrossRealmPKMatch) + + def GetBuffer(self): + return string_at(addressof(self), self.GetLength()) + + def OutputString(self): + DumpString = '''// C1 01 跨服PK匹配 //tagCMCrossRealmPKMatch: + Cmd:%s, + SubCmd:%s, + Type:%d + '''\ + %( + self.Cmd, + self.SubCmd, + self.Type + ) + return DumpString + + +m_NAtagCMCrossRealmPKMatch=tagCMCrossRealmPKMatch() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMCrossRealmPKMatch.Cmd,m_NAtagCMCrossRealmPKMatch.SubCmd))] = m_NAtagCMCrossRealmPKMatch + + +#------------------------------------------------------ +# 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 + '''\ + %( + self.Cmd, + self.SubCmd + ) + return DumpString + + +m_NAtagCMExitCrossRealm=tagCMExitCrossRealm() +ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMExitCrossRealm.Cmd,m_NAtagCMExitCrossRealm.SubCmd))] = m_NAtagCMExitCrossRealm + + +#------------------------------------------------------ # C1 11 跨服王者争霸押注 #tagCMMergeKingSupport class tagCMMergeKingSupport(Structure): -- Gitblit v1.8.0