SnxxServerCode.git

			@@ -4608,7 +4608,7 @@

			class tagPYBillboardData(Structure):
			Head = tagHead()
			IsWatchSelf = 0 #(BYTE IsWatchSelf)
			WatchID = 0 #(DWORD WatchID)//查看指定ID名次前后，如玩家ID、家族ID等
			BillboardCount = 0 #(BYTE BillboardCount)
			Type = 0 #(BYTE Type)//排行榜类型
			Billboard = list() #(vector<tagPYBillboardInfo> Billboard)//size = BillboardCount
			@@ -4623,7 +4623,7 @@
			def ReadData(self, _lpData, _pos=0, _Len=0):
			self.Clear()
			_pos = self.Head.ReadData(_lpData, _pos)
			self.IsWatchSelf,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.WatchID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.BillboardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.Type,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			for i in range(self.BillboardCount):
			@@ -4637,7 +4637,7 @@
			self.Head.Clear()
			self.Head.Cmd = 0xA9
			self.Head.SubCmd = 0xA2
			self.IsWatchSelf = 0
			self.WatchID = 0
			self.BillboardCount = 0
			self.Type = 0
			self.Billboard = list()
			@@ -4646,7 +4646,7 @@
			def GetLength(self):
			length = 0
			length += self.Head.GetLength()
			length += 1
			length += 4
			length += 1
			length += 1
			for i in range(self.BillboardCount):
			@@ -4657,7 +4657,7 @@
			def GetBuffer(self):
			data = ''
			data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
			data = CommFunc.WriteBYTE(data, self.IsWatchSelf)
			data = CommFunc.WriteDWORD(data, self.WatchID)
			data = CommFunc.WriteBYTE(data, self.BillboardCount)
			data = CommFunc.WriteBYTE(data, self.Type)
			for i in range(self.BillboardCount):
			@@ -4667,14 +4667,14 @@
			def OutputString(self):
			DumpString = '''
			Head:%s,
			IsWatchSelf:%d,
			WatchID:%d,
			BillboardCount:%d,
			Type:%d,
			Billboard:%s
			'''\
			%(
			self.Head.OutputString(),
			self.IsWatchSelf,
			self.WatchID,
			self.BillboardCount,
			self.Type,
			"..."
			@@ -14778,7 +14778,9 @@
			# C0 07 跨服排行榜信息 #tagGCCrossBillboardInfo

			class tagGCCrossBillboardData(Structure):
			OrderIndex = 0 #(WORD OrderIndex)//名次索引，0代表第一名
			ID = 0 #(DWORD ID)
			ID2 = 0 #(DWORD ID2)
			Name1 = "" #(char Name1[33])//名字1，用来显示排序对象名字
			Name2 = "" #(char Name2[33])//名字2
			Type2 = 0 #(BYTE Type2)//附加类型，用来表示排序对象的类型，比如，玩家所属职业门派，宠物类型等
			@@ -14803,7 +14805,9 @@

			def ReadData(self, _lpData, _pos=0, _Len=0):
			self.Clear()
			self.OrderIndex,_pos = CommFunc.ReadWORD(_lpData, _pos)
			self.ID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.ID2,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.Name1,_pos = CommFunc.ReadString(_lpData, _pos,33)
			self.Name2,_pos = CommFunc.ReadString(_lpData, _pos,33)
			self.Type2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			@@ -14823,7 +14827,9 @@
			return _pos

			def Clear(self):
			self.OrderIndex = 0
			self.ID = 0
			self.ID2 = 0
			self.Name1 = ""
			self.Name2 = ""
			self.Type2 = 0
			@@ -14844,6 +14850,8 @@

			def GetLength(self):
			length = 0
			length += 2
			length += 4
			length += 4
			length += 33
			length += 33
			@@ -14866,7 +14874,9 @@

			def GetBuffer(self):
			data = ''
			data = CommFunc.WriteWORD(data, self.OrderIndex)
			data = CommFunc.WriteDWORD(data, self.ID)
			data = CommFunc.WriteDWORD(data, self.ID2)
			data = CommFunc.WriteString(data, 33, self.Name1)
			data = CommFunc.WriteString(data, 33, self.Name2)
			data = CommFunc.WriteBYTE(data, self.Type2)
			@@ -14887,7 +14897,9 @@

			def OutputString(self):
			DumpString = '''
			OrderIndex:%d,
			ID:%d,
			ID2:%d,
			Name1:%s,
			Name2:%s,
			Type2:%d,
			@@ -14906,7 +14918,9 @@
			UserData:%s
			'''\
			%(
			self.OrderIndex,
			self.ID,
			self.ID2,
			self.Name1,
			self.Name2,
			self.Type2,
			@@ -14932,6 +14946,7 @@
			Type = 0 #(BYTE Type)//榜单类型
			GroupValue1 = 0 #(BYTE GroupValue1)// 分组值1
			GroupValue2 = 0 #(BYTE GroupValue2)// 分组值2，与分组值1组合归为同组榜单数据
			WatchID = 0 #(DWORD WatchID)//查看指定ID名次前后，如玩家ID、家族ID等
			BillboardCount = 0 #(BYTE BillboardCount)
			CrossBillboardDataList = list() #(vector<tagGCCrossBillboardData> CrossBillboardDataList)
			data = None
			@@ -14948,6 +14963,7 @@
			self.Type,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.GroupValue1,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.GroupValue2,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			self.WatchID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.BillboardCount,_pos = CommFunc.ReadBYTE(_lpData, _pos)
			for i in range(self.BillboardCount):
			temCrossBillboardDataList = tagGCCrossBillboardData()
			@@ -14963,6 +14979,7 @@
			self.Type = 0
			self.GroupValue1 = 0
			self.GroupValue2 = 0
			self.WatchID = 0
			self.BillboardCount = 0
			self.CrossBillboardDataList = list()
			return
			@@ -14973,6 +14990,7 @@
			length += 1
			length += 1
			length += 1
			length += 4
			length += 1
			for i in range(self.BillboardCount):
			length += self.CrossBillboardDataList[i].GetLength()
			@@ -14985,6 +15003,7 @@
			data = CommFunc.WriteBYTE(data, self.Type)
			data = CommFunc.WriteBYTE(data, self.GroupValue1)
			data = CommFunc.WriteBYTE(data, self.GroupValue2)
			data = CommFunc.WriteDWORD(data, self.WatchID)
			data = CommFunc.WriteBYTE(data, self.BillboardCount)
			for i in range(self.BillboardCount):
			data = CommFunc.WriteString(data, self.CrossBillboardDataList[i].GetLength(), self.CrossBillboardDataList[i].GetBuffer())
			@@ -14996,6 +15015,7 @@
			Type:%d,
			GroupValue1:%d,
			GroupValue2:%d,
			WatchID:%d,
			BillboardCount:%d,
			CrossBillboardDataList:%s
			'''\
			@@ -15004,6 +15024,7 @@
			self.Type,
			self.GroupValue1,
			self.GroupValue2,
			self.WatchID,
			self.BillboardCount,
			"..."
			)
			@@ -23959,6 +23980,7 @@
			PassGradeCnt = 0 #(BYTE PassGradeCnt)//星级值对应个数, 每个key存9个lineID
			PassGrade = list() #(vector<DWORD> PassGrade)//副本线路对应星级值列表
			EnterCntTotal = 0 #(DWORD EnterCntTotal)//累计进入次数
			PassLineID = 0 #(DWORD PassLineID)//已过关到的lineID
			data = None

			def __init__(self):
			@@ -23976,6 +23998,7 @@
			value,_pos=CommFunc.ReadDWORD(_lpData,_pos)
			self.PassGrade.append(value)
			self.EnterCntTotal,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			self.PassLineID,_pos = CommFunc.ReadDWORD(_lpData, _pos)
			return _pos

			def Clear(self):
			@@ -23986,6 +24009,7 @@
			self.PassGradeCnt = 0
			self.PassGrade = list()
			self.EnterCntTotal = 0
			self.PassLineID = 0
			return

			def GetLength(self):
			@@ -23996,6 +24020,7 @@
			length += 2
			length += 1
			length += 4 * self.PassGradeCnt
			length += 4
			length += 4

			return length
			@@ -24010,6 +24035,7 @@
			for i in range(self.PassGradeCnt):
			data = CommFunc.WriteDWORD(data, self.PassGrade[i])
			data = CommFunc.WriteDWORD(data, self.EnterCntTotal)
			data = CommFunc.WriteDWORD(data, self.PassLineID)
			return data

			def OutputString(self):
			@@ -24020,7 +24046,8 @@
			ItemAddCnt:%d,
			PassGradeCnt:%d,
			PassGrade:%s,
			EnterCntTotal:%d
			EnterCntTotal:%d,
			PassLineID:%d
			'''\
			%(
			self.FBID,
			@@ -24029,7 +24056,8 @@
			self.ItemAddCnt,
			self.PassGradeCnt,
			"...",
			self.EnterCntTotal
			self.EnterCntTotal,
			self.PassLineID
			)
			return DumpString