From 76a11c5216c6996e0ab266b63cf3a424d6561ba1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 18 三月 2026 14:47:43 +0800
Subject: [PATCH] 526 【挑战】PVP群英榜-后端(修复被挑战记录中没有对方ServerID问题;优化在榜上时已有匹配记录不包含自己名次时强制重刷匹配;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
index a8324eb..bbf5e15 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -779,8 +779,7 @@
         PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_HeroCall, treasureCount)
         PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_HeroCall, treasureCount)
         heroCallCnt = GetHeroCallCnt(curPlayer)
-        if OpenServerActivity.GetOSAState(curPlayer, ShareDefine.Def_BT_OSA_HeroCall) == 1:
-            PlayerBillboard.UpdatePlayerBillboard(curPlayer, ShareDefine.Def_BT_OSA_HeroCall, heroCallCnt)
+        OpenServerActivity.UpdOSA_HeroCallBillboard(curPlayer, heroCallCnt)
         PlayerSuccess.UptateSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHeroCall, heroCallCnt)
         
     PlayerActLunhuidian.AddLunhuidianValue(curPlayer, PlayerActLunhuidian.AwardType_Treasure, treasureType, treasureCount)
@@ -889,7 +888,9 @@
     GameWorld.DebugLog("    公共免费心愿次数! gridNum=%s,wishLibID=%s,preOutTotal=%s,canFreeCnt=%s" 
                        % (gridNum, wishLibID, preOutTotal, canFreeCnt), playerID)
     
-    if preOutTotal >= canFreeCnt:
+    if treasureType in TreasureType_HeroCallList and PlayerGoldInvest.GetInvestState(curPlayer, ChConfig.InvestType_Month):
+        GameWorld.DebugLog("    月卡特权心愿免费")
+    elif preOutTotal >= canFreeCnt:
         if not curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TreasureWishUseItem % (treasureType, wishLibID)):
             GameWorld.DebugLog("    玩家心愿卡未启用,走默认随机规则! gridNum=%s,wishLibID=%s" % (gridNum, wishLibID), playerID)
             return

--
Gitblit v1.8.0