From fd537df92cbd2dc6ab093e24b31095824d832152 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 24 六月 2024 15:42:46 +0800
Subject: [PATCH] 10185 【越南】【港台】【主干】BOSS凭证修改(排行榜优化;跨服榜查看改为直接查跨服数据,支持分页查询;跨服凭证个人榜单最大调整为1000条,其他100;)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 0bc4cf4..70c2b23 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -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组合归为同组榜单数据
+    IsWatchSelf = 0    #(BYTE IsWatchSelf)
     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.IsWatchSelf,_pos = CommFunc.ReadBYTE(_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.IsWatchSelf = 0
         self.BillboardCount = 0
         self.CrossBillboardDataList = list()
         return
@@ -14970,6 +14987,7 @@
     def GetLength(self):
         length = 0
         length += self.Head.GetLength()
+        length += 1
         length += 1
         length += 1
         length += 1
@@ -14985,6 +15003,7 @@
         data = CommFunc.WriteBYTE(data, self.Type)
         data = CommFunc.WriteBYTE(data, self.GroupValue1)
         data = CommFunc.WriteBYTE(data, self.GroupValue2)
+        data = CommFunc.WriteBYTE(data, self.IsWatchSelf)
         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,
+                                IsWatchSelf:%d,
                                 BillboardCount:%d,
                                 CrossBillboardDataList:%s
                                 '''\
@@ -15004,6 +15024,7 @@
                                 self.Type,
                                 self.GroupValue1,
                                 self.GroupValue2,
+                                self.IsWatchSelf,
                                 self.BillboardCount,
                                 "..."
                                 )

--
Gitblit v1.8.0