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/PlayerFamily.py |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
index f8f6636..6c501bb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.py
@@ -85,13 +85,26 @@
     return
 
 def __doFamilyOnHour():
+    
+    needHours = IpyGameDataPY.GetFuncCfg("FamilyLeaderAutoChange", 1)
+    priorityHours = IpyGameDataPY.GetFuncCfg("FamilyLeaderAutoChange", 2) # 优先传给离线不超过x小时的成员,一样按优先级
+    if GameWorld.IsMainServer() and not DBFamily.IsFamilyCross():
+        # 开服前X天会长离线Y小时触发自动转让,优先级高于数值1,格式 X|Y
+        openServerSet = IpyGameDataPY.GetFuncEvalCfg("FamilyLeaderAutoChange", 3)
+        befServerDay = openServerSet[0]
+        serverDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1
+        if serverDay <= befServerDay:
+            needHours = openServerSet[1]
+            priorityHours = openServerSet[2]
+            
+    GameWorld.DebugLog("自动传位时长设定: needHours=%s,priorityHours=%s" % (needHours, priorityHours))
     familyManager = DBDataMgr.GetFamilyMgr()
     for zoneID in familyManager.GetZoneIDListThisServer():
         zoneMgr = familyManager.GetZoneFamilyMgr(zoneID)
         for i in range(0, zoneMgr.GetCount()):
             family = zoneMgr.GetAt(i)
             #自动传位
-            __AutoChangeLeader(family)
+            __AutoChangeLeader(family, needHours, priorityHours)
     return
 
 def FamilyCrossCenterOnDay():
@@ -1334,7 +1347,7 @@
     CrossPlayer.FamilyNotify(familyID, "XW_JZ_AppointFamily", [memName, changeFamilyLV])
     return
 
-def __AutoChangeLeader(curFamily):
+def __AutoChangeLeader(curFamily, needHours, priorityHours):
     ## 自动传位
     leaderID = curFamily.GetLeaderID()
     leaderMem = curFamily.FindMember(leaderID)
@@ -1347,16 +1360,12 @@
     curTime = int(time.time())
     passTime = curTime - offTime
     passHours = passTime / 3600.0
-    needHours = IpyGameDataPY.GetFuncCfg("FamilyLeaderAutoChange", 1)
     if passHours < needHours:
         GameWorld.DebugLogEx("盟主离线未超过限制小时,不处理自动传位!familyID=%s,leaderID=%s,offTime=%s,passHours=%s < %s", 
                              familyID, leaderID, GameWorld.ChangeTimeNumToStr(offTime), passHours, needHours)
         return
     
-    priorityHours = IpyGameDataPY.GetFuncCfg("FamilyLeaderAutoChange", 1) # 优先传给离线不超过x小时的成员,一样按优先级
-    
     priorityList = []
-    commList = []
     for i in range(0, curFamily.GetCount()):
         member = curFamily.GetAt(i)
         if member.GetFmLV() == IPY_PlayerDefine.fmlLeader:
@@ -1375,22 +1384,16 @@
         fmLV = member.GetFmLV() # 职位
         contribTotal = member.GetContribTotal() # 总贡献
         
-        commList.append([fmLV, sortTime, contribTotal, member])
         if priorityHours and memPassHours <= priorityHours:
             priorityList.append([fmLV, sortTime, contribTotal, member])
             
-    if not priorityList and not commList:
-        # 没有可传位的目标成员
+    if not priorityList:
+        GameWorld.DebugLog("没有可传位的目标成员! familyID=%s" % familyID)
         return
     
-    toMember = None
-    if priorityList:
-        priorityList.sort(reverse=True)
-        toMember = priorityList[0][-1]
-    else:
-        commList.sort(reverse=True)
-        toMember = commList[0][-1]
-        
+    priorityList.sort(reverse=True)
+    toMember = priorityList[0][-1]
+    
     if not toMember:
         return
     
@@ -1932,7 +1935,7 @@
     curMember.SetContribTotal(contribTotal)
     GameWorld.DebugLog("增加成员贡献: familyID=%s,addContribValue=%s,contribDay=%s,contribTotal=%s" % (familyID, addContribValue, contribDay, contribTotal), playerID)
     
-    Broadcast_FamilyInfo(familyID, isSyncMem=False) # 成员贡献
+    Broadcast_FamilyInfo(familyID, changeMemIDList=[playerID]) # 成员贡献
     return
 
 ## ------------------------------------------------------------------------------------------------

--
Gitblit v1.8.0