From cdb001b8065cf4bcfe63b82bf8c03ae48b362e7b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 19 三月 2026 12:02:09 +0800
Subject: [PATCH] 493 【活动内容】武将登场-服务端(招募武将非首次获得不广播设定仅针对常规招募;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 60938e7..9b175c2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -802,7 +802,7 @@
         if gridNum in notifyGridNumList and notifyKeyDict:
             notifyKey = notifyKeyDict.get(gridNum, notifyKeyDict.get(0, ""))
             if itemObj.GetType() == ChConfig.Def_ItemType_Hero:
-                if PlayerHero.GetHeroActivite(curPlayer, itemID):
+                if treasureType in TreasureType_HeroCallList and PlayerHero.GetHeroActivite(curPlayer, itemID):
                     notifyKey = ""
                     GameWorld.DebugLog("招募武将非首次获得的不广播了! itemID=%s" % itemID, playerID)
                 elif notifyKey:
@@ -888,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