From 61bae8814450e86b1851cb892086b7081a675ff1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 六月 2024 16:08:13 +0800
Subject: [PATCH] 10185 【越南】【港台】【主干】BOSS凭证修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py |   51 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py
index edc857d..24cc467 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.py
@@ -67,7 +67,7 @@
     
     return True
 
-def UpdatePlayerBillboard(curPlayer, bType, cmpValue, cmpValue2=0, cmpValue3=0, value1=0, value2=0, exInfo=[], autoSort=False):
+def UpdatePlayerBillboard(curPlayer, bType, cmpValue, cmpValue2=0, cmpValue3=0, value1=0, value2=0, exInfo=[], autoSort=False, **kwargs):
     ## 更新玩家排行榜
     
     #if not cmpValue and not cmpValue2 and not cmpValue3:
@@ -83,18 +83,33 @@
     if bType in ShareDefine.BTValue1_OfficialRankList:
         value1 = curPlayer.GetOfficialRank()
     GameServer_UpdateBillboard(bType, playerJob, playerID, playerName, playerOpInfo,
-                               value1, value2, cmpValue, cmpValue2, cmpValue3, 0, exInfo, autoSort)
+                               value1, value2, cmpValue, cmpValue2, cmpValue3, 0, exInfo, autoSort, **kwargs)
     return
 
-def GameServer_UpdateBillboard(bType, bType2, bID, bName, bName2, value1, value2, cmpValue, cmpValue2=0, cmpValue3=0, bID2=0, exInfo=[], autoSort=False):
-    sendMsg = "%s" % ({"Type":bType, "Type2":bType2, "ID":bID, "ID2":bID2, "Name1":bName, "Name2":bName2, "ExInfo":exInfo,
-                       "Value1":value1, "Value2":value2, "CmpValue":cmpValue, "CmpValue2":cmpValue2, "CmpValue3":cmpValue3, "autoSort":autoSort}) 
+def GameServer_UpdateBillboard(bType, bType2, bID, bName, bName2, value1, value2, cmpValue, cmpValue2=0, cmpValue3=0, bID2=0, exInfo=[], autoSort=False, **kwargs):
+    bData = {"Type":bType, "Type2":bType2, "ID":bID, "ID2":bID2, "Name1":bName, "Name2":bName2, "ExInfo":exInfo, 
+             "Value1":value1, "Value2":value2, "CmpValue":cmpValue, "CmpValue2":cmpValue2, "CmpValue3":cmpValue3, "autoSort":autoSort}
+    if "value3" in kwargs:
+        bData["Value3"] = kwargs["value3"]
+    if "value4" in kwargs:
+        bData["Value4"] = kwargs["value4"]
+    if "value5" in kwargs:
+        bData["Value5"] = kwargs["value5"]
+    if "value6" in kwargs:
+        bData["Value6"] = kwargs["value6"]
+    if "value7" in kwargs:
+        bData["Value7"] = kwargs["value7"]
+    if "value8" in kwargs:
+        bData["Value8"] = kwargs["value8"]
+    if "userData" in kwargs:
+        bData["UserData"] = kwargs["userData"]
+    sendMsg = "%s" % (bData) 
     GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "UpdateBillboard", sendMsg, len(sendMsg))
     GameWorld.DebugLog("同步GameServer排行榜:bType=%s,cmpValue=%s, %s" % (bType, cmpValue, sendMsg), bID)
     return
 
 def UpdatePlayerCrossBillboard(curPlayer, bType, groupValue1, cmpValue, cmpValue2=0, cmpValue3=0, value1=0, value2=0, 
-                               groupValue2=0):
+                               groupValue2=0, **kwargs):
     ## 更新玩家跨服排行榜
     
     #if not cmpValue and not cmpValue2 and not cmpValue3:
@@ -111,14 +126,28 @@
         value1 = curPlayer.GetOfficialRank()
     id2 = 0
     GameServer_UpdateCrossBillboard(bType, groupValue1, playerID, playerName, playerOpInfo, playerJob, value1, value2, 
-                                    cmpValue, cmpValue2, cmpValue3, groupValue2, id2)
+                                    cmpValue, cmpValue2, cmpValue3, groupValue2, id2, **kwargs)
     return
 
 def GameServer_UpdateCrossBillboard(bType, groupValue1, dataID, name1, name2, type2, value1, value2, cmpValue, 
-                                    cmpValue2=0, cmpValue3=0, groupValue2=0, id2=0):
-    sendMsg = "%s" % ({"Type":bType, "GroupValue1":groupValue1, "Type2":type2, "ID":dataID, "ID2":id2, "Name1":name1, "Name2":name2,
-                       "Value1":value1, "Value2":value2, "CmpValue":cmpValue, "CmpValue2":cmpValue2, "CmpValue3":cmpValue3,
-                       "GroupValue2":groupValue2}) 
+                                    cmpValue2=0, cmpValue3=0, groupValue2=0, id2=0, **kwargs):
+    bData = {"Type":bType, "GroupValue1":groupValue1, "Type2":type2, "ID":dataID, "ID2":id2, "Name1":name1, "Name2":name2, 
+             "Value1":value1, "Value2":value2, "CmpValue":cmpValue, "CmpValue2":cmpValue2, "CmpValue3":cmpValue3, "GroupValue2":groupValue2}
+    if "value3" in kwargs:
+        bData["Value3"] = kwargs["value3"]
+    if "value4" in kwargs:
+        bData["Value4"] = kwargs["value4"]
+    if "value5" in kwargs:
+        bData["Value5"] = kwargs["value5"]
+    if "value6" in kwargs:
+        bData["Value6"] = kwargs["value6"]
+    if "value7" in kwargs:
+        bData["Value7"] = kwargs["value7"]
+    if "value8" in kwargs:
+        bData["Value8"] = kwargs["value8"]
+    if "userData" in kwargs:
+        bData["UserData"] = kwargs["userData"]
+    sendMsg = "%s" % (bData) 
     GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "UpdateCrossBillboard", sendMsg, len(sendMsg))
     GameWorld.DebugLog("同步GameServer跨服排行榜:bType=%s,groupValue1=%s,groupValue2=%s,cmpValue=%s, %s" 
                        % (bType, groupValue1, groupValue2, cmpValue, sendMsg), dataID)

--
Gitblit v1.8.0