From bf334b4166d13318f1ef5ef561a8ca333126b03d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 十二月 2018 19:30:51 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（匹配时间单位改为秒）
---
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 1045 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 880 insertions(+), 165 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 6301999..be4d3de 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -5810,162 +5810,6 @@
#------------------------------------------------------
-# B3 11 助战记录列表 #tagGCHelpBattleRecordList
-
-class tagGCHelpBattleRecord(Structure):
- CallPlayerID = 0 #(DWORD CallPlayerID)// 邀请助战的玩家ID
- NameLen = 0 #(BYTE NameLen)
- CallPlayerName = "" #(String CallPlayerName)// 邀请助战的玩家名，size = NameLen
- MapID = 0 #(DWORD MapID)
- FuncLineID = 0 #(BYTE FuncLineID)
- XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 增加的仙缘币，0代表已达上限
- Relation = 0 #(BYTE Relation)// 当时的关系：0-无，1-好友，2-盟友
- VIPLV = 0 #(BYTE VIPLV)// 当时的VIP等级
- data = None
-
- def __init__(self):
- self.Clear()
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
- self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
- self.FuncLineID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.XianyuanCoinAdd,_pos = CommFunc.ReadWORD(_lpData, _pos)
- self.Relation,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- self.VIPLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- return _pos
-
- def Clear(self):
- self.CallPlayerID = 0
- self.NameLen = 0
- self.CallPlayerName = ""
- self.MapID = 0
- self.FuncLineID = 0
- self.XianyuanCoinAdd = 0
- self.Relation = 0
- self.VIPLV = 0
- return
-
- def GetLength(self):
- length = 0
- length += 4
- length += 1
- length += len(self.CallPlayerName)
- length += 4
- length += 1
- length += 2
- length += 1
- length += 1
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteDWORD(data, self.CallPlayerID)
- data = CommFunc.WriteBYTE(data, self.NameLen)
- data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
- data = CommFunc.WriteDWORD(data, self.MapID)
- data = CommFunc.WriteBYTE(data, self.FuncLineID)
- data = CommFunc.WriteWORD(data, self.XianyuanCoinAdd)
- data = CommFunc.WriteBYTE(data, self.Relation)
- data = CommFunc.WriteBYTE(data, self.VIPLV)
- return data
-
- def OutputString(self):
- DumpString = '''
- CallPlayerID:%d,
- NameLen:%d,
- CallPlayerName:%s,
- MapID:%d,
- FuncLineID:%d,
- XianyuanCoinAdd:%d,
- Relation:%d,
- VIPLV:%d
- '''\
- %(
- self.CallPlayerID,
- self.NameLen,
- self.CallPlayerName,
- self.MapID,
- self.FuncLineID,
- self.XianyuanCoinAdd,
- self.Relation,
- self.VIPLV
- )
- return DumpString
-
-
-class tagGCHelpBattleRecordList(Structure):
- Head = tagHead()
- RecordCount = 0 #(WORD RecordCount)// 记录数
- RecordList = list() #(vector<tagGCHelpBattleRecord> RecordList)
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xB3
- self.Head.SubCmd = 0x11
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.RecordCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
- for i in range(self.RecordCount):
- temRecordList = tagGCHelpBattleRecord()
- _pos = temRecordList.ReadData(_lpData, _pos)
- self.RecordList.append(temRecordList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xB3
- self.Head.SubCmd = 0x11
- self.RecordCount = 0
- self.RecordList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 2
- for i in range(self.RecordCount):
- length += self.RecordList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteWORD(data, self.RecordCount)
- for i in range(self.RecordCount):
- data = CommFunc.WriteString(data, self.RecordList[i].GetLength(), self.RecordList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- RecordCount:%d,
- RecordList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.RecordCount,
- "..."
- )
- return DumpString
-
-
-m_NAtagGCHelpBattleRecordList=tagGCHelpBattleRecordList()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCHelpBattleRecordList.Head.Cmd,m_NAtagGCHelpBattleRecordList.Head.SubCmd))] = m_NAtagGCHelpBattleRecordList
-
-
-#------------------------------------------------------
#B3 01 添加社交对象 #tagGCAddSocialPlayer
class tagGCAddSocialPlayer(Structure):
@@ -8200,6 +8044,463 @@
m_NAtagGCTeamMemFuncDataList=tagGCTeamMemFuncDataList()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCTeamMemFuncDataList.Head.Cmd,m_NAtagGCTeamMemFuncDataList.Head.SubCmd))] = m_NAtagGCTeamMemFuncDataList
+
+
+#------------------------------------------------------
+# C0 01 跨服PK匹配成功 #tagGCCrossRealmPKMatchOK
+
+class tagGCCrossRealmPKMatchPlayer(Structure):
+ PlayerID = 0 #(DWORD PlayerID)
+ NameLen = 0 #(BYTE NameLen)
+ PlayerName = "" #(String PlayerName)// 跨服名字
+ Job = 0 #(BYTE Job)
+ LV = 0 #(WORD LV)
+ MaxHP = 0 #(DWORD MaxHP)// 默认满血
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.PlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.Job,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.LV,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.MaxHP,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ return _pos
+
+ def Clear(self):
+ self.PlayerID = 0
+ self.NameLen = 0
+ self.PlayerName = ""
+ self.Job = 0
+ self.LV = 0
+ self.MaxHP = 0
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 4
+ length += 1
+ length += len(self.PlayerName)
+ length += 1
+ length += 2
+ length += 4
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteDWORD(data, self.PlayerID)
+ data = CommFunc.WriteBYTE(data, self.NameLen)
+ data = CommFunc.WriteString(data, self.NameLen, self.PlayerName)
+ data = CommFunc.WriteBYTE(data, self.Job)
+ data = CommFunc.WriteWORD(data, self.LV)
+ data = CommFunc.WriteDWORD(data, self.MaxHP)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ PlayerID:%d,
+ NameLen:%d,
+ PlayerName:%s,
+ Job:%d,
+ LV:%d,
+ MaxHP:%d
+ '''\
+ %(
+ self.PlayerID,
+ self.NameLen,
+ self.PlayerName,
+ self.Job,
+ self.LV,
+ self.MaxHP
+ )
+ return DumpString
+
+
+class tagGCCrossRealmPKMatchOK(Structure):
+ Head = tagHead()
+ RoomID = 0 #(WORD RoomID)// 房间ID
+ NameLen = 0 #(BYTE NameLen)
+ PlayerName = "" #(String PlayerName)// 跨服名字
+ MatchPlayerCount = 0 #(BYTE MatchPlayerCount)
+ MatchPlayer = list() #(vector<tagGCCrossRealmPKMatchPlayer> MatchPlayer)// 匹配到的玩家
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x01
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.RoomID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.PlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.MatchPlayerCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.MatchPlayerCount):
+ temMatchPlayer = tagGCCrossRealmPKMatchPlayer()
+ _pos = temMatchPlayer.ReadData(_lpData, _pos)
+ self.MatchPlayer.append(temMatchPlayer)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x01
+ self.RoomID = 0
+ self.NameLen = 0
+ self.PlayerName = ""
+ self.MatchPlayerCount = 0
+ self.MatchPlayer = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 2
+ length += 1
+ length += len(self.PlayerName)
+ length += 1
+ for i in range(self.MatchPlayerCount):
+ length += self.MatchPlayer[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteWORD(data, self.RoomID)
+ data = CommFunc.WriteBYTE(data, self.NameLen)
+ data = CommFunc.WriteString(data, self.NameLen, self.PlayerName)
+ data = CommFunc.WriteBYTE(data, self.MatchPlayerCount)
+ for i in range(self.MatchPlayerCount):
+ data = CommFunc.WriteString(data, self.MatchPlayer[i].GetLength(), self.MatchPlayer[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ RoomID:%d,
+ NameLen:%d,
+ PlayerName:%s,
+ MatchPlayerCount:%d,
+ MatchPlayer:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.RoomID,
+ self.NameLen,
+ self.PlayerName,
+ self.MatchPlayerCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagGCCrossRealmPKMatchOK=tagGCCrossRealmPKMatchOK()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCCrossRealmPKMatchOK.Head.Cmd,m_NAtagGCCrossRealmPKMatchOK.Head.SubCmd))] = m_NAtagGCCrossRealmPKMatchOK
+
+
+#------------------------------------------------------
+# C0 03 跨服PK战斗结果 #tagGCCrossRealmPKOverInfo
+
+class tagGCCrossRealmPKOverInfo(Structure):
+ Head = tagHead()
+ TimeStr = "" #(char TimeStr[19])// 结算时间，格式 yyyy-MM-dd HH:mm:ss
+ OverType = 0 #(BYTE OverType)// 0-正常，1-有人离线
+ WinnerID = 0 #(DWORD WinnerID)// 胜方ID
+ RoundCount = 0 #(BYTE RoundCount)// PK回合数
+ RoundWinnerID = list() #(vector<DWORD> RoundWinnerID)// 回合获胜ID列表
+ AddScore = 0 #(WORD AddScore)// 本场加分
+ Score = 0 #(WORD Score)// 当前积分
+ DanLV = 0 #(BYTE DanLV)// 当前段位
+ CWinCnt = 0 #(WORD CWinCnt)// 当前连胜数
+ TagNameLen = 0 #(BYTE TagNameLen)
+ TagName = "" #(String TagName)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x03
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.TimeStr,_pos = CommFunc.ReadString(_lpData, _pos,19)
+ self.OverType,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.WinnerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.RoundCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.RoundCount):
+ value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
+ self.RoundWinnerID.append(value)
+ self.AddScore,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Score,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.DanLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.CWinCnt,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.TagNameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.TagName,_pos = CommFunc.ReadString(_lpData, _pos,self.TagNameLen)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x03
+ self.TimeStr = ""
+ self.OverType = 0
+ self.WinnerID = 0
+ self.RoundCount = 0
+ self.RoundWinnerID = list()
+ self.AddScore = 0
+ self.Score = 0
+ self.DanLV = 0
+ self.CWinCnt = 0
+ self.TagNameLen = 0
+ self.TagName = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 19
+ length += 1
+ length += 4
+ length += 1
+ length += 4 * self.RoundCount
+ length += 2
+ length += 2
+ length += 1
+ length += 2
+ length += 1
+ length += len(self.TagName)
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteString(data, 19, self.TimeStr)
+ data = CommFunc.WriteBYTE(data, self.OverType)
+ data = CommFunc.WriteDWORD(data, self.WinnerID)
+ data = CommFunc.WriteBYTE(data, self.RoundCount)
+ for i in range(self.RoundCount):
+ data = CommFunc.WriteDWORD(data, self.RoundWinnerID[i])
+ data = CommFunc.WriteWORD(data, self.AddScore)
+ data = CommFunc.WriteWORD(data, self.Score)
+ data = CommFunc.WriteBYTE(data, self.DanLV)
+ data = CommFunc.WriteWORD(data, self.CWinCnt)
+ data = CommFunc.WriteBYTE(data, self.TagNameLen)
+ data = CommFunc.WriteString(data, self.TagNameLen, self.TagName)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ TimeStr:%s,
+ OverType:%d,
+ WinnerID:%d,
+ RoundCount:%d,
+ RoundWinnerID:%s,
+ AddScore:%d,
+ Score:%d,
+ DanLV:%d,
+ CWinCnt:%d,
+ TagNameLen:%d,
+ TagName:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.TimeStr,
+ self.OverType,
+ self.WinnerID,
+ self.RoundCount,
+ "...",
+ self.AddScore,
+ self.Score,
+ self.DanLV,
+ self.CWinCnt,
+ self.TagNameLen,
+ self.TagName
+ )
+ return DumpString
+
+
+m_NAtagGCCrossRealmPKOverInfo=tagGCCrossRealmPKOverInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCCrossRealmPKOverInfo.Head.Cmd,m_NAtagGCCrossRealmPKOverInfo.Head.SubCmd))] = m_NAtagGCCrossRealmPKOverInfo
+
+
+#------------------------------------------------------
+# C0 04 跨服PK赛季信息 #tagGCCrossRealmPKSeason
+
+class tagGCCrossRealmPKSeason(Structure):
+ Head = tagHead()
+ ZoneCount = 0 #(BYTE ZoneCount)// 所有赛区个数
+ ZoneIDList = list() #(vector<BYTE> ZoneIDList)// 所有赛区列表
+ ZoneID = 0 #(BYTE ZoneID)// 所属赛区ID
+ SeasonID = 0 #(WORD SeasonID)// 当前赛季ID
+ StartDate = "" #(char StartDate[10])// 开始日期 yyyy-MM-dd
+ EndDate = "" #(char EndDate[10])// 结束日期 yyyy-MM-dd
+ EndTime = "" #(char EndTime[5])// 赛季结算时间，赛季奖励该时间后才可领取 hh:mm
+ NextStartDate = "" #(char NextStartDate[10])// 下赛季开始日期 yyyy-MM-dd
+ NextEndDate = "" #(char NextEndDate[10])// 下赛季结束日期 yyyy-MM-dd
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x04
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.ZoneCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ for i in range(self.ZoneCount):
+ value,_pos=CommFunc.ReadBYTE(_lpData,_pos)
+ self.ZoneIDList.append(value)
+ self.ZoneID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.SeasonID,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.StartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.EndTime,_pos = CommFunc.ReadString(_lpData, _pos,5)
+ self.NextStartDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ self.NextEndDate,_pos = CommFunc.ReadString(_lpData, _pos,10)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xC0
+ self.Head.SubCmd = 0x04
+ self.ZoneCount = 0
+ self.ZoneIDList = list()
+ self.ZoneID = 0
+ self.SeasonID = 0
+ self.StartDate = ""
+ self.EndDate = ""
+ self.EndTime = ""
+ self.NextStartDate = ""
+ self.NextEndDate = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 1
+ length += 1 * self.ZoneCount
+ length += 1
+ length += 2
+ length += 10
+ length += 10
+ length += 5
+ length += 10
+ length += 10
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteBYTE(data, self.ZoneCount)
+ for i in range(self.ZoneCount):
+ data = CommFunc.WriteBYTE(data, self.ZoneIDList[i])
+ data = CommFunc.WriteBYTE(data, self.ZoneID)
+ data = CommFunc.WriteWORD(data, self.SeasonID)
+ data = CommFunc.WriteString(data, 10, self.StartDate)
+ data = CommFunc.WriteString(data, 10, self.EndDate)
+ data = CommFunc.WriteString(data, 5, self.EndTime)
+ data = CommFunc.WriteString(data, 10, self.NextStartDate)
+ data = CommFunc.WriteString(data, 10, self.NextEndDate)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ ZoneCount:%d,
+ ZoneIDList:%s,
+ ZoneID:%d,
+ SeasonID:%d,
+ StartDate:%s,
+ EndDate:%s,
+ EndTime:%s,
+ NextStartDate:%s,
+ NextEndDate:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.ZoneCount,
+ "...",
+ self.ZoneID,
+ self.SeasonID,
+ self.StartDate,
+ self.EndDate,
+ self.EndTime,
+ self.NextStartDate,
+ self.NextEndDate
+ )
+ return DumpString
+
+
+m_NAtagGCCrossRealmPKSeason=tagGCCrossRealmPKSeason()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCCrossRealmPKSeason.Head.Cmd,m_NAtagGCCrossRealmPKSeason.Head.SubCmd))] = m_NAtagGCCrossRealmPKSeason
+
+
+#------------------------------------------------------
+# C0 02 跨服PK开始匹配 #tagGCCrossRealmPKStartMatch
+
+class tagGCCrossRealmPKStartMatch(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ]
+
+ 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
+ return
+
+ def GetLength(self):
+ return sizeof(tagGCCrossRealmPKStartMatch)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// C0 02 跨服PK开始匹配 //tagGCCrossRealmPKStartMatch:
+ Cmd:%s,
+ SubCmd:%s
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd
+ )
+ return DumpString
+
+
+m_NAtagGCCrossRealmPKStartMatch=tagGCCrossRealmPKStartMatch()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagGCCrossRealmPKStartMatch.Cmd,m_NAtagGCCrossRealmPKStartMatch.SubCmd))] = m_NAtagGCCrossRealmPKStartMatch
#------------------------------------------------------
@@ -12500,6 +12801,73 @@
m_NAtagMCFuncOpenStateList=tagMCFuncOpenStateList()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCFuncOpenStateList.Head.Cmd,m_NAtagMCFuncOpenStateList.Head.SubCmd))] = m_NAtagMCFuncOpenStateList
+
+
+#------------------------------------------------------
+# A3 1E 玩家聚魂孔信息 #tagMCGatherSoulHoleInfo
+
+class tagMCGatherSoulHoleInfo(Structure):
+ Head = tagHead()
+ Count = 0 #(BYTE Count)// 孔信息数
+ GatherSoulDataList = list() #(vector<DWORD> GatherSoulDataList)// 孔数据信息, 数据与背包数据相同
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xA3
+ self.Head.SubCmd = 0x1E
+ 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.GatherSoulDataList.append(value)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xA3
+ self.Head.SubCmd = 0x1E
+ self.Count = 0
+ self.GatherSoulDataList = 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.GatherSoulDataList[i])
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ Count:%d,
+ GatherSoulDataList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.Count,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCGatherSoulHoleInfo=tagMCGatherSoulHoleInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCGatherSoulHoleInfo.Head.Cmd,m_NAtagMCGatherSoulHoleInfo.Head.SubCmd))] = m_NAtagMCGatherSoulHoleInfo
#------------------------------------------------------
@@ -17010,6 +17378,7 @@
("APosY", c_ushort),
("BPosX", c_ushort),
("BPosY", c_ushort),
+ ("Angle", c_ushort),
]
def __init__(self):
@@ -17026,6 +17395,7 @@
self.APosY = 0
self.BPosX = 0
self.BPosY = 0
+ self.Angle = 0
return
def GetLength(self):
@@ -17039,13 +17409,15 @@
APosX:%d,
APosY:%d,
BPosX:%d,
- BPosY:%d
+ BPosY:%d,
+ Angle:%d
'''\
%(
self.APosX,
self.APosY,
self.BPosX,
- self.BPosY
+ self.BPosY,
+ self.Angle
)
return DumpString
@@ -24643,10 +25015,14 @@
Head = tagHead()
MapID = 0 #(DWORD MapID)
FuncLineID = 0 #(BYTE FuncLineID)
- XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 增加的仙缘币，0代表已达上限
+ Relation = 0 #(BYTE Relation)// 当时的关系：0-无，1-好友，2-盟友
+ RelationCoinAdd = 0 #(BYTE RelationCoinAdd)// 社交关系总加成
+ XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 实际增加的仙缘币
+ Reason = 0 #(BYTE Reason)//仙缘币为0时的原因：1-助战次数上限；2-每日获得上限
CallPlayerID = 0 #(DWORD CallPlayerID)// 助战的玩家ID，有值时代表真实助战，没有值时为自己打的
NameLen = 0 #(BYTE NameLen)
CallPlayerName = "" #(String CallPlayerName)// 助战的玩家名，size = NameLen
+ IsSweep = 0 #(BYTE IsSweep)// 是否扫荡
data = None
def __init__(self):
@@ -24660,10 +25036,14 @@
_pos = self.Head.ReadData(_lpData, _pos)
self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.FuncLineID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.Relation,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.RelationCoinAdd,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.XianyuanCoinAdd,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Reason,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.IsSweep,_pos = CommFunc.ReadBYTE(_lpData, _pos)
return _pos
def Clear(self):
@@ -24673,10 +25053,14 @@
self.Head.SubCmd = 0x08
self.MapID = 0
self.FuncLineID = 0
+ self.Relation = 0
+ self.RelationCoinAdd = 0
self.XianyuanCoinAdd = 0
+ self.Reason = 0
self.CallPlayerID = 0
self.NameLen = 0
self.CallPlayerName = ""
+ self.IsSweep = 0
return
def GetLength(self):
@@ -24684,10 +25068,14 @@
length += self.Head.GetLength()
length += 4
length += 1
+ length += 1
+ length += 1
length += 2
+ length += 1
length += 4
length += 1
length += len(self.CallPlayerName)
+ length += 1
return length
@@ -24696,10 +25084,14 @@
data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
data = CommFunc.WriteDWORD(data, self.MapID)
data = CommFunc.WriteBYTE(data, self.FuncLineID)
+ data = CommFunc.WriteBYTE(data, self.Relation)
+ data = CommFunc.WriteBYTE(data, self.RelationCoinAdd)
data = CommFunc.WriteWORD(data, self.XianyuanCoinAdd)
+ data = CommFunc.WriteBYTE(data, self.Reason)
data = CommFunc.WriteDWORD(data, self.CallPlayerID)
data = CommFunc.WriteBYTE(data, self.NameLen)
data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
+ data = CommFunc.WriteBYTE(data, self.IsSweep)
return data
def OutputString(self):
@@ -24707,19 +25099,27 @@
Head:%s,
MapID:%d,
FuncLineID:%d,
+ Relation:%d,
+ RelationCoinAdd:%d,
XianyuanCoinAdd:%d,
+ Reason:%d,
CallPlayerID:%d,
NameLen:%d,
- CallPlayerName:%s
+ CallPlayerName:%s,
+ IsSweep:%d
'''\
%(
self.Head.OutputString(),
self.MapID,
self.FuncLineID,
+ self.Relation,
+ self.RelationCoinAdd,
self.XianyuanCoinAdd,
+ self.Reason,
self.CallPlayerID,
self.NameLen,
- self.CallPlayerName
+ self.CallPlayerName,
+ self.IsSweep
)
return DumpString
@@ -25086,6 +25486,7 @@
("SubCmd", c_ubyte),
("ObjID", c_int), # 助战实例ID
("PlayerID", c_int), # 助战镜像ID,大于1小于100代表机器人,如果是机器人前端按顺序自己记录对应实例ID代表已召唤
+ ("Job", c_ubyte), # 职业
]
def __init__(self):
@@ -25104,6 +25505,7 @@
self.SubCmd = 0x06
self.ObjID = 0
self.PlayerID = 0
+ self.Job = 0
return
def GetLength(self):
@@ -25117,13 +25519,15 @@
Cmd:%s,
SubCmd:%s,
ObjID:%d,
- PlayerID:%d
+ PlayerID:%d,
+ Job:%d
'''\
%(
self.Cmd,
self.SubCmd,
self.ObjID,
- self.PlayerID
+ self.PlayerID,
+ self.Job
)
return DumpString
@@ -25141,6 +25545,7 @@
("Cmd", c_ubyte),
("SubCmd", c_ubyte),
("IsOK", c_ubyte), #是否成功
+ ("IsLogin", c_ubyte), #是否登录同步已登记
]
def __init__(self):
@@ -25158,6 +25563,7 @@
self.Cmd = 0xB2
self.SubCmd = 0x05
self.IsOK = 0
+ self.IsLogin = 0
return
def GetLength(self):
@@ -25170,12 +25576,14 @@
DumpString = '''// B2 05 助战登记结果 //tagMCHelpBattleCheckInResult:
Cmd:%s,
SubCmd:%s,
- IsOK:%d
+ IsOK:%d,
+ IsLogin:%d
'''\
%(
self.Cmd,
self.SubCmd,
- self.IsOK
+ self.IsOK,
+ self.IsLogin
)
return DumpString
@@ -25359,6 +25767,169 @@
m_NAtagMCHelpBattleList=tagMCHelpBattleList()
ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCHelpBattleList.Head.Cmd,m_NAtagMCHelpBattleList.Head.SubCmd))] = m_NAtagMCHelpBattleList
+
+
+#------------------------------------------------------
+# B2 11 助战记录列表 #tagMCHelpBattleRecordList
+
+class tagMCHelpBattleRecord(Structure):
+ CallPlayerID = 0 #(DWORD CallPlayerID)// 邀请助战的玩家ID
+ NameLen = 0 #(BYTE NameLen)
+ CallPlayerName = "" #(String CallPlayerName)// 邀请助战的玩家名，size = NameLen
+ MapID = 0 #(DWORD MapID)
+ FuncLineID = 0 #(BYTE FuncLineID)
+ XianyuanCoinAdd = 0 #(WORD XianyuanCoinAdd)// 增加的仙缘币，0代表已达上限
+ Relation = 0 #(BYTE Relation)// 当时的关系：0-无，1-好友，2-盟友
+ VIPLV = 0 #(BYTE VIPLV)// 当时的VIP等级
+ HelpTime = "" #(char HelpTime[19])// 助战时间yyyy-MM-dd hh:mm:ss
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ self.CallPlayerID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.NameLen,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.CallPlayerName,_pos = CommFunc.ReadString(_lpData, _pos,self.NameLen)
+ self.MapID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
+ self.FuncLineID,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.XianyuanCoinAdd,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ self.Relation,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.VIPLV,_pos = CommFunc.ReadBYTE(_lpData, _pos)
+ self.HelpTime,_pos = CommFunc.ReadString(_lpData, _pos,19)
+ return _pos
+
+ def Clear(self):
+ self.CallPlayerID = 0
+ self.NameLen = 0
+ self.CallPlayerName = ""
+ self.MapID = 0
+ self.FuncLineID = 0
+ self.XianyuanCoinAdd = 0
+ self.Relation = 0
+ self.VIPLV = 0
+ self.HelpTime = ""
+ return
+
+ def GetLength(self):
+ length = 0
+ length += 4
+ length += 1
+ length += len(self.CallPlayerName)
+ length += 4
+ length += 1
+ length += 2
+ length += 1
+ length += 1
+ length += 19
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteDWORD(data, self.CallPlayerID)
+ data = CommFunc.WriteBYTE(data, self.NameLen)
+ data = CommFunc.WriteString(data, self.NameLen, self.CallPlayerName)
+ data = CommFunc.WriteDWORD(data, self.MapID)
+ data = CommFunc.WriteBYTE(data, self.FuncLineID)
+ data = CommFunc.WriteWORD(data, self.XianyuanCoinAdd)
+ data = CommFunc.WriteBYTE(data, self.Relation)
+ data = CommFunc.WriteBYTE(data, self.VIPLV)
+ data = CommFunc.WriteString(data, 19, self.HelpTime)
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ CallPlayerID:%d,
+ NameLen:%d,
+ CallPlayerName:%s,
+ MapID:%d,
+ FuncLineID:%d,
+ XianyuanCoinAdd:%d,
+ Relation:%d,
+ VIPLV:%d,
+ HelpTime:%s
+ '''\
+ %(
+ self.CallPlayerID,
+ self.NameLen,
+ self.CallPlayerName,
+ self.MapID,
+ self.FuncLineID,
+ self.XianyuanCoinAdd,
+ self.Relation,
+ self.VIPLV,
+ self.HelpTime
+ )
+ return DumpString
+
+
+class tagMCHelpBattleRecordList(Structure):
+ Head = tagHead()
+ RecordCount = 0 #(WORD RecordCount)// 记录数
+ RecordList = list() #(vector<tagMCHelpBattleRecord> RecordList)
+ data = None
+
+ def __init__(self):
+ self.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x11
+ return
+
+ def ReadData(self, _lpData, _pos=0, _Len=0):
+ self.Clear()
+ _pos = self.Head.ReadData(_lpData, _pos)
+ self.RecordCount,_pos = CommFunc.ReadWORD(_lpData, _pos)
+ for i in range(self.RecordCount):
+ temRecordList = tagMCHelpBattleRecord()
+ _pos = temRecordList.ReadData(_lpData, _pos)
+ self.RecordList.append(temRecordList)
+ return _pos
+
+ def Clear(self):
+ self.Head = tagHead()
+ self.Head.Clear()
+ self.Head.Cmd = 0xB2
+ self.Head.SubCmd = 0x11
+ self.RecordCount = 0
+ self.RecordList = list()
+ return
+
+ def GetLength(self):
+ length = 0
+ length += self.Head.GetLength()
+ length += 2
+ for i in range(self.RecordCount):
+ length += self.RecordList[i].GetLength()
+
+ return length
+
+ def GetBuffer(self):
+ data = ''
+ data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
+ data = CommFunc.WriteWORD(data, self.RecordCount)
+ for i in range(self.RecordCount):
+ data = CommFunc.WriteString(data, self.RecordList[i].GetLength(), self.RecordList[i].GetBuffer())
+ return data
+
+ def OutputString(self):
+ DumpString = '''
+ Head:%s,
+ RecordCount:%d,
+ RecordList:%s
+ '''\
+ %(
+ self.Head.OutputString(),
+ self.RecordCount,
+ "..."
+ )
+ return DumpString
+
+
+m_NAtagMCHelpBattleRecordList=tagMCHelpBattleRecordList()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCHelpBattleRecordList.Head.Cmd,m_NAtagMCHelpBattleRecordList.Head.SubCmd))] = m_NAtagMCHelpBattleRecordList
#------------------------------------------------------
@@ -26774,6 +27345,150 @@
#------------------------------------------------------
+# C1 02 跨服PK玩家奖励记录 #tagMCCrossRealmPKAwardState
+
+class tagMCCrossRealmPKAwardState(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("DayPKCountAwardState", c_int), # 每日匹配次数奖励记录，二进制位存储是否已领取，按匹配次数升序排序索引代表奖励位
+ ("DayWinCountAwardState", c_int), # 每日胜利次数奖励记录，二进制位存储是否已领取，按胜利次数升序排序索引代表奖励位
+ ("DanLVAwardState", c_int), # 段位达标奖励记录，二进制位存储是否已领取，按段位代表奖励位
+ ("SeasonAwardState", 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
+ self.DayPKCountAwardState = 0
+ self.DayWinCountAwardState = 0
+ self.DanLVAwardState = 0
+ self.SeasonAwardState = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCCrossRealmPKAwardState)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// C1 02 跨服PK玩家奖励记录 //tagMCCrossRealmPKAwardState:
+ Cmd:%s,
+ SubCmd:%s,
+ DayPKCountAwardState:%d,
+ DayWinCountAwardState:%d,
+ DanLVAwardState:%d,
+ SeasonAwardState:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.DayPKCountAwardState,
+ self.DayWinCountAwardState,
+ self.DanLVAwardState,
+ self.SeasonAwardState
+ )
+ return DumpString
+
+
+m_NAtagMCCrossRealmPKAwardState=tagMCCrossRealmPKAwardState()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossRealmPKAwardState.Cmd,m_NAtagMCCrossRealmPKAwardState.SubCmd))] = m_NAtagMCCrossRealmPKAwardState
+
+
+#------------------------------------------------------
+# C1 01 跨服PK玩家信息 #tagMCCrossRealmPKPlayerInfo
+
+class tagMCCrossRealmPKPlayerInfo(Structure):
+ _pack_ = 1
+ _fields_ = [
+ ("Cmd", c_ubyte),
+ ("SubCmd", c_ubyte),
+ ("Score", c_int), # 当前积分
+ ("DanLV", c_ubyte), # 当前段位
+ ("PKCount", c_ushort), # PK次数
+ ("WinCount", c_ushort), # 胜利次数
+ ("CWinCount", c_ushort), # 连胜次数
+ ("DayPKCount", c_ubyte), # 当日已PK次数
+ ("DayWinCount", c_ubyte), # 当日已胜利次数
+ ("DayBuyCount", c_ubyte), # 当日已购买次数
+ ]
+
+ 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.Score = 0
+ self.DanLV = 0
+ self.PKCount = 0
+ self.WinCount = 0
+ self.CWinCount = 0
+ self.DayPKCount = 0
+ self.DayWinCount = 0
+ self.DayBuyCount = 0
+ return
+
+ def GetLength(self):
+ return sizeof(tagMCCrossRealmPKPlayerInfo)
+
+ def GetBuffer(self):
+ return string_at(addressof(self), self.GetLength())
+
+ def OutputString(self):
+ DumpString = '''// C1 01 跨服PK玩家信息 //tagMCCrossRealmPKPlayerInfo:
+ Cmd:%s,
+ SubCmd:%s,
+ Score:%d,
+ DanLV:%d,
+ PKCount:%d,
+ WinCount:%d,
+ CWinCount:%d,
+ DayPKCount:%d,
+ DayWinCount:%d,
+ DayBuyCount:%d
+ '''\
+ %(
+ self.Cmd,
+ self.SubCmd,
+ self.Score,
+ self.DanLV,
+ self.PKCount,
+ self.WinCount,
+ self.CWinCount,
+ self.DayPKCount,
+ self.DayWinCount,
+ self.DayBuyCount
+ )
+ return DumpString
+
+
+m_NAtagMCCrossRealmPKPlayerInfo=tagMCCrossRealmPKPlayerInfo()
+ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCCrossRealmPKPlayerInfo.Cmd,m_NAtagMCCrossRealmPKPlayerInfo.SubCmd))] = m_NAtagMCCrossRealmPKPlayerInfo
+
+
+#------------------------------------------------------
#D2 01 跨服赛报名(上传数据)状态 #tagMergeWarRegisterState
class tagMergeWarRegisterState(Structure):
--
Gitblit v1.8.0