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 |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 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 c530ab9..9b175c2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTreasure.py
@@ -59,11 +59,11 @@
 TreasureType_Gubao, # 古宝寻宝 5
 ) = range(1, 1 + 5)
 
-TreasureType_HeroComm = 11 # 英雄招募 - 普通
+#TreasureType_HeroComm = 11 # 英雄招募 - 普通
 TreasureType_HeroHigh = 12 # 英雄招募 - 高级
 TreasureType_HeroScore = 13 # 英雄招募 - 积分
 #武将招募的所有类型
-TreasureType_HeroCallList = [TreasureType_HeroComm, TreasureType_HeroHigh, TreasureType_HeroScore]
+TreasureType_HeroCallList = [TreasureType_HeroHigh, TreasureType_HeroScore]
 
 #活动寻宝类型
 ActType_HeroAppear = 1 # 武将登场
@@ -137,6 +137,25 @@
                 for gridNum in hourseIpyData.GetAtLeastCntLimitInfo().items():
                     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureAtleastCnt % (treasureType, gridNum), 0)
                     
+    Sync_TreasureInfo(curPlayer, treasureTypeList)
+    return
+
+def ResetLifeCardLucky(curPlayer):
+    treasureTypeList = []
+    for treasureType in TreasureType_HeroCallList:
+        if treasureType in treasureTypeList:
+            continue
+        houseList = IpyGameDataPY.GetIpyGameDataList("TreasureHouse", treasureType)
+        if not houseList:
+            continue
+        for hourseIpyData in houseList:
+            if hourseIpyData.GetLuckyItemRateInfoEx():
+                PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_TreasureLuck % (treasureType), 0)
+                treasureTypeList.append(treasureType)
+                GameWorld.DebugLog("开通永久卡重置武将招募永久卡幸运值! treasureType=%s" % treasureType)
+                break
+    if not treasureTypeList:
+        return
     Sync_TreasureInfo(curPlayer, treasureTypeList)
     return
 
@@ -760,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)
@@ -784,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:
@@ -870,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