From 12be80ecd33e26a29c0f7186bd1f200550eea15f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 21 八月 2024 18:59:56 +0800
Subject: [PATCH] 10223 10238 10241 【越南】【砍树】【主干】【港台】仙匣秘境、骑宠养成、古宝养成，修复本服活动同时开多个时活动榜单可能被重置的bug；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py | 201 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 141 insertions(+), 60 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
index 088920e..ed52c4b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.py
@@ -28,6 +28,7 @@
import PlayerFamily
import PyDataManager
import PlayerViewCache
+import IpyGameDataPY
import time
import random
@@ -35,11 +36,6 @@
Def_Key_BillboardSortTick = "BillboardSortTick_%s" # 排行榜是否排序tick，参数（排行榜类型）
Def_Key_BillboardNeedSort = "BillboardNeedSort_%s" # 排行榜是否需要排序，参数（排行榜类型）
-#需要每天记录到oss的排行榜类型
-Def_NoteOssBillboardTypeList = [
- ShareDefine.Def_BT_LV , #个人等级日榜
- ShareDefine.Def_BT_FightPower, #个人战斗力
- ]
#需要每天拷贝昨日榜单的排行榜类型字典
Def_NeedCopyYesterday_Dict = {
#昨日榜（拷贝） #今日榜（源数据）
@@ -47,8 +43,11 @@
def NoteOssBillboardInfoByDay():
## 每天记录排行榜信息到oss中
+ if GameWorld.IsCrossServer():
+ return
+ Def_NoteOssBillboardTypeList = IpyGameDataPY.GetFuncEvalCfg("BillboardSet", 1)
for billboardType in Def_NoteOssBillboardTypeList:
- DataRecordPack.DR_BillboardDataByDay(billboardType)
+ DataRecordPack.DR_BillboardData(billboardType, "OnDay")
return
def CopyBillboardOnDay():
@@ -141,9 +140,16 @@
type2 = oldBillBoardData.GetType2()
value1 = oldBillBoardData.GetValue1()
value2 = oldBillBoardData.GetValue2()
+ value3 = oldBillBoardData.GetValue3()
+ value4 = oldBillBoardData.GetValue4()
+ value5 = oldBillBoardData.GetValue5()
+ value6 = oldBillBoardData.GetValue6()
+ value7 = oldBillBoardData.GetValue7()
+ value8 = oldBillBoardData.GetValue8()
cmpValue = oldBillBoardData.GetCmpValue()
cmpValue2 = oldBillBoardData.GetCmpValue2()
cmpValue3 = oldBillBoardData.GetCmpValue3()
+ userData = oldBillBoardData.GetUserData()
#---获取排行榜信息---
billBoard, billBoardData = GetBillBoardData(newBillboardIndex, id, cmpValue)
@@ -160,9 +166,17 @@
billBoardData.SetType2(type2)
billBoardData.SetValue1(value1)
billBoardData.SetValue2(value2)
+ billBoardData.SetValue3(value3)
+ billBoardData.SetValue4(value4)
+ billBoardData.SetValue5(value5)
+ billBoardData.SetValue6(value6)
+ billBoardData.SetValue7(value7)
+ billBoardData.SetValue8(value8)
billBoardData.SetCmpValue(cmpValue)
billBoardData.SetCmpValue2(cmpValue2)
billBoardData.SetCmpValue3(cmpValue3)
+ billBoardData.SetUserData(userData)
+ billBoardData.SetDataLen(len(userData))
GameWorld.Log(" CopyBillboard newBillboardIndex=%s, oldBillboardIndex=%s" % (newBillboardIndex, oldBillboardIndex))
@@ -363,7 +377,7 @@
# BYTE Type; //类型 TBillboardType
# DWORD StartIndex; //查看的起始名次索引， 默认0
# BYTE WatchCnt; //查看条数，默认20，最大不超过100
-# BYTE IsWatchSelf; //是否查看自己名次前后，默认10条数据
+# DWORD WatchID; //查看指定ID名次前后，如玩家ID、家族ID等
#};
def Client_PYWatchBillboard(index, clientData, tick):
@@ -374,14 +388,14 @@
packType = clientData.Type
startIndex = clientData.StartIndex
watchCnt = clientData.WatchCnt
- isWatchSelf = clientData.IsWatchSelf
- if not __CheckWatchCD(curPlayer, packType, tick):
- return
+ watchID = clientData.WatchID
+ #if not __CheckWatchCD(curPlayer, packType, tick):
+ # return
- Sync_BillboardEx(curPlayer, packType, isWatchSelf, startIndex, watchCnt)
+ Sync_BillboardEx(curPlayer, packType, watchID, startIndex, watchCnt)
return
-def Sync_BillboardEx(curPlayer, bbType, isWatchSelf=False, startIndex=0, watchCnt=20):
+def Sync_BillboardEx(curPlayer, bbType, watchID=0, startIndex=0, watchCnt=20):
if bbType < 0 or bbType >= ShareDefine.Def_BT_Max:
return
@@ -390,12 +404,12 @@
GameWorld.ErrLog("找不到排行榜数据！bbType=%s" % (bbType))
return
- playerID = curPlayer.GetPlayerID()
+ #playerID = curPlayer.GetPlayerID()
count = billBoard.GetCount()
endIndex = 0
# 查看自己前后名次
- if isWatchSelf:
- playerIndex = billBoard.IndexOfByID(playerID)
+ if watchID:
+ playerIndex = billBoard.IndexOfByID(watchID)
if playerIndex != -1:
# 前5后4，首尾补足10条记录
endIndex = min(playerIndex + 5, count)
@@ -413,7 +427,7 @@
billBoardData = ChPyNetSendPack.tagPYBillboardData()
billBoardData.Clear()
- billBoardData.IsWatchSelf = isWatchSelf
+ billBoardData.WatchID = watchID
billBoardData.Type = bbType
billBoardData.Billboard = []
for index in xrange(startIndex, endIndex):
@@ -433,9 +447,17 @@
bbInfo.Type2 = bbData.GetType2()
bbInfo.Value1 = bbData.GetValue1()
bbInfo.Value2 = bbData.GetValue2()
+ bbInfo.Value3 = bbData.GetValue3()
+ bbInfo.Value4 = bbData.GetValue4()
+ bbInfo.Value5 = bbData.GetValue5()
+ bbInfo.Value6 = bbData.GetValue6()
+ bbInfo.Value7 = bbData.GetValue7()
+ bbInfo.Value8 = bbData.GetValue8()
bbInfo.CmpValue = bbData.GetCmpValue()
bbInfo.CmpValue2 = bbData.GetCmpValue2()
bbInfo.CmpValue3 = bbData.GetCmpValue3()
+ bbInfo.UserData = bbData.GetUserData()
+ bbInfo.DataLen = len(bbInfo.UserData)
billBoardData.Billboard.append(bbInfo)
@@ -458,13 +480,21 @@
bName2 = billInfoDict["Name2"]
value1 = billInfoDict["Value1"]
value2 = billInfoDict["Value2"]
+ value3 = billInfoDict.get("Value3", 0)
+ value4 = billInfoDict.get("Value4", 0)
+ value5 = billInfoDict.get("Value5", 0)
+ value6 = billInfoDict.get("Value6", 0)
+ value7 = billInfoDict.get("Value7", 0)
+ value8 = billInfoDict.get("Value8", 0)
cmpValue = billInfoDict["CmpValue"]
cmpValue2 = billInfoDict["CmpValue2"]
cmpValue3 = billInfoDict["CmpValue3"]
+ userData = billInfoDict.get("UserData", "")
if bType not in ShareDefine.BillboardTypeList:
return
#if not cmpValue and not cmpValue2 and not cmpValue3:
# return
+ kwargs = {"value3":value3, "value4":value4, "value5":value5, "value6":value6, "value7":value7, "value8":value8, "userData":userData}
#删除该数据
if cmpValue == -1:
@@ -485,9 +515,7 @@
gameWorld.SetDict(Def_Key_BillboardSortTick % bType, tick)
#GameWorld.DebugLog("更新排行榜：bType=%s,autoSort=%s,tick=%s,lastSortTick=%s,d=%s" % (bType, autoSort, tick, lastSortTick, tick - lastSortTick))
- UpdatePlayerBillboard(bID, bName, bName2, bType, bType2, value1, value2, cmpValue, autoSort, cmpValue2, cmpValue3)
- gameWorld.SetDict(Def_Key_BillboardNeedSort % bType, 1)
- #__UpdateBillboardSortState(gameWorld, bType, autoSort, isUpd)
+ UpdatePlayerBillboard(bID, bName, bName2, bType, bType2, value1, value2, cmpValue, autoSort, cmpValue2, cmpValue3, **kwargs)
exInfo = billInfoDict["ExInfo"]
# 以下为榜单附加特殊处理
@@ -508,29 +536,51 @@
job = playerJob % 10
if job in ShareDefine.JobFightPowerBillboardDict:
jobBType = ShareDefine.JobFightPowerBillboardDict[job]
- UpdatePlayerBillboard(bID, bName, bName2, jobBType, bType2, value1, value2, cmpValue, autoSort, cmpValue2)
- gameWorld.SetDict(Def_Key_BillboardNeedSort % jobBType, 1)
- #__UpdateBillboardSortState(gameWorld, jobBType, autoSort, isUpd)
+ UpdatePlayerBillboard(bID, bName, bName2, jobBType, bType2, value1, value2, cmpValue, autoSort, cmpValue2, **kwargs)
return
-def __UpdateBillboardSortState(gameWorld, bType, autoSort, isUpd):
- key = Def_Key_BillboardNeedSort % bType
- needSort = gameWorld.GetDictByKey(key)
- if not autoSort and isUpd and not needSort:
- gameWorld.SetDict(key, 1)
- elif autoSort and needSort:
- gameWorld.SetDict(key, 0)
-
- #GameWorld.DebugLog("__UpdateBillboardSortState：bType=%s,autoSort=%s,isUpd=%s,needSort=%s" % (bType, autoSort, isUpd, gameWorld.GetDictByKey(key)))
+def DelJobFightPowerBillboard(curPlayer, delJob):
+ ## 删除玩家对应职业战力榜 - 一般是玩家职业改变了，需要删除旧职业的职业战力榜单
+ if delJob not in ShareDefine.JobFightPowerBillboardDict:
+ return
+ jobBType = ShareDefine.JobFightPowerBillboardDict[delJob]
+ playerID = curPlayer.GetPlayerID()
+ billboardMgr = GameWorld.GetBillboard()
+ playerBillBoard = billboardMgr.FindBillboard(jobBType)
+ if not playerBillBoard:
+ return
+ if playerBillBoard.FindByID(playerID):
+ playerBillBoard.DeleteByID(playerID)
+ GameWorld.DebugLog("删除玩家职业战力榜单: delJob=%s,jobBType=%s" % (delJob, jobBType), playerID)
return
def GetBillboardOperateInfo(curPlayer):
# 排行榜中所保存的运营商相关信息
- platform = curPlayer.GetAccID()
- if platform in ["tencent"]:
- return curPlayer.GetOperateInfo()
- return platform
+ return curPlayer.GetFace()
+# platform = curPlayer.GetAccID()
+# if platform in ["tencent"]:
+# return curPlayer.GetOperateInfo()
+# return platform
+
+def UpdateFamilyBillboard(bType, familyBillInfo, cmpValue, cmpValue2=0):
+ ## 更新仙盟排行榜
+ if "id" not in familyBillInfo:
+ return
+ familyID = familyBillInfo["id"]
+ familyName = familyBillInfo["name"]
+ id2 = familyBillInfo["id2"]
+ name2 = familyBillInfo["name2"]
+ value1 = familyBillInfo["value1"]
+ value2 = familyBillInfo["value2"]
+ value3 = familyBillInfo["value3"]
+ value4 = familyBillInfo["value4"]
+ value5 = familyBillInfo["value5"]
+ type2 = 0
+ autoSort = True
+ UpdatePlayerBillboard(familyID, familyName, name2, bType, type2, value1, value2, cmpValue, autoSort, cmpValue2,
+ id2=id2, value3=value3, value4=value4, value5=value5)
+ return
def UpdatePlayerBillboardEx(curPlayer, playerID, bType, cmpValue, cmpValue2=0, cmpValue3=0, value1=0, value2=0, autoSort=False):
## 更新玩家排行榜
@@ -568,7 +618,14 @@
if bType in ShareDefine.BTValue1_OfficialRankList:
value1 = playerRealmLV
-
+
+ tick = GameWorld.GetGameWorld().GetTick()
+ gameWorld = GameWorld.GetGameWorld()
+ lastSortTick = gameWorld.GetDictByKey(Def_Key_BillboardSortTick % bType)
+ autoSort = ((tick - lastSortTick) >= 60000 or autoSort) # 1分钟强制排序一次
+ if autoSort:
+ gameWorld.SetDict(Def_Key_BillboardSortTick % bType, tick)
+
UpdatePlayerBillboard(playerID, playerName, playerOpInfo, bType, playerJob, value1, value2, cmpValue, autoSort, cmpValue2, cmpValue3)
return
@@ -604,8 +661,8 @@
# @param autoSort 是否自动排序
# @return 返回值无意义
# @remarks 更新角色排行榜.
-def UpdatePlayerBillboard(curPlayerID, curPlayerName, curPlayerOpInfo, billboardIndex, billboardType,
- value1, value2, cmpValue, autoSort = True, cmpValue2 = 0, cmpValue3 = 0):
+def UpdatePlayerBillboard(curPlayerID, name1, name2, billboardIndex, type2, value1, value2, cmpValue,
+ autoSort = True, cmpValue2 = 0, cmpValue3 = 0, **kwargs):
playerBillBoard, playerBillBoardData = GetBillBoardData(billboardIndex, curPlayerID, cmpValue, cmpValue2, cmpValue3)
@@ -614,46 +671,49 @@
return False
isNewData = playerBillBoardData.GetID2() == 0 # 是否是新增的数据
-
- # 值相同不更新
- if not isNewData and playerBillBoardData.GetValue1() == value1 and playerBillBoardData.GetValue2() == value2 \
- and playerBillBoardData.GetCmpValue() == cmpValue and playerBillBoardData.GetCmpValue2() == cmpValue2:
- GameWorld.DebugLog("更新排行榜值相同不更新! index=%s,type2=%s,value1=%s,value2=%s,cmpValue=%s,cmpValue2==%s,cmpValue3==%s"
- % (billboardIndex, billboardType, value1, value2, cmpValue, cmpValue2, cmpValue3), curPlayerID)
- opInfo = playerBillBoardData.GetName2()
- if opInfo != str(curPlayerOpInfo):
- playerBillBoardData.SetName2(str(curPlayerOpInfo))
- GameWorld.DebugLog(" 更新operatInfo=%s" % curPlayerOpInfo, curPlayerID)
- return False
-
- # 没设置值默认为时间time，先上榜的排前面
+ cmpValueChange = isNewData or playerBillBoardData.GetCmpValue() != cmpValue or playerBillBoardData.GetCmpValue2() != cmpValue2 \
+ or (cmpValue3 and playerBillBoardData.GetCmpValue3() != cmpValue3)
if cmpValue3 == 0:
- # 时间权值仅在比较值变更的情况下才更新, 防止其他附属值更新时导致比较值相同的玩家名次间会变动的问题
- if isNewData or playerBillBoardData.GetCmpValue() != cmpValue or playerBillBoardData.GetCmpValue2() != cmpValue2:
+ if cmpValueChange:
+ # 时间权值仅在比较值变更的情况下才更新, 防止其他附属值更新时导致比较值相同的玩家名次间会变动的问题
calcTime = GameWorld.ChangeTimeStrToNum("2080-01-01 00:00:00")
cmpValue3 = max(0, calcTime - int(time.time())) # 比较值3如果没指定值则默认存当前更新的time
-
+ else:
+ cmpValue3 = playerBillBoardData.GetCmpValue3()
+
#设置排行榜数据
playerBillBoardData.SetType(billboardIndex)
#附属类型
- playerBillBoardData.SetType2(billboardType)
+ playerBillBoardData.SetType2(type2)
playerBillBoardData.SetID(curPlayerID)
- playerBillBoardData.SetID2(curPlayerID)
- playerBillBoardData.SetName1(curPlayerName)
- playerBillBoardData.SetName2(str(curPlayerOpInfo))
+ playerBillBoardData.SetID2(kwargs.get("id2", curPlayerID))
+ playerBillBoardData.SetName1(name1)
+ playerBillBoardData.SetName2(str(name2))
#SetValue1存储空间为Word
playerBillBoardData.SetValue1(value1)
#SetValue2存储空间为DWord
playerBillBoardData.SetValue2(value2)
+ playerBillBoardData.SetValue3(kwargs.get("value3", 0))
+ playerBillBoardData.SetValue4(kwargs.get("value4", 0))
+ playerBillBoardData.SetValue5(kwargs.get("value5", 0))
+ playerBillBoardData.SetValue6(kwargs.get("value6", 0))
+ playerBillBoardData.SetValue7(kwargs.get("value7", 0))
+ playerBillBoardData.SetValue8(kwargs.get("value8", 0))
+ playerBillBoardData.SetUserData(kwargs.get("userData", ""))
+ playerBillBoardData.SetDataLen(len(playerBillBoardData.GetUserData()))
playerBillBoardData.SetCmpValue(cmpValue)
playerBillBoardData.SetCmpValue2(cmpValue2)
if cmpValue3 > 0:
playerBillBoardData.SetCmpValue3(cmpValue3)
+
+ GameWorld.DebugLog("更新排行榜值 index=%s,type2=%s,value1=%s,value2=%s,cmpValue=%s,cmpValue2==%s,cmpValue3==%s,isNewData=%s,cmpValueChange=%s,%s"
+ % (billboardIndex, type2, value1, value2, cmpValue, cmpValue2, cmpValue3, isNewData, cmpValueChange, kwargs), curPlayerID)
+ if not cmpValueChange:
+ return True
- GameWorld.DebugLog("更新排行榜值 index=%s,type2=%s,value1=%s,value2=%s,cmpValue=%s,cmpValue2==%s,cmpValue3==%s,isNewData=%s"
- % (billboardIndex, billboardType, value1, value2, cmpValue, cmpValue2, cmpValue3, isNewData), curPlayerID)
if not autoSort:
#不自动排序
+ GameWorld.GetGameWorld().SetDict(Def_Key_BillboardNeedSort % billboardIndex, 1) # 设置需要下次查看需要先排序
return True
#重新排序排行榜
@@ -818,3 +878,24 @@
return
+def UpdateBillboardFace(curPlayer):
+ ## 更新排行榜中的玩家头像
+
+ curPlayerID = curPlayer.GetID()
+ curFace = curPlayer.GetFace()
+
+ billboardMgr = GameWorld.GetBillboard()
+ for billboardIndex in ShareDefine.BillboardTypeList:
+ billBoard = billboardMgr.FindBillboard(billboardIndex)
+ if not billBoard:
+ #找不到这类型排行榜
+ continue
+
+ playerBillBoardData = billBoard.FindByID(curPlayerID)
+ if not playerBillBoardData:
+ #该玩家没有在排行榜上
+ continue
+
+ playerBillBoardData.SetName2(str(curFace))
+
+ return
--
Gitblit v1.8.0