From b55482bd0fa065e34c74ebdac70c5eb5cdf16ed7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 23 五月 2025 15:59:37 +0800
Subject: [PATCH] 10367 【越南】【英语】【BT】【砍树】仙盟攻城战-服务端(修复玩家活动公示期至第1轮战备期间未重登可能导致重登后玩家活动被重置的bug; 修复没有触发轮次变更重置逻辑;)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py                  |    2 +-
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActFamilyGCZ.py |    7 +++----
 PySysDB/生成IpyGameDataPY/config.ini                                                               |    4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git "a/PySysDB/\347\224\237\346\210\220IpyGameDataPY/config.ini" "b/PySysDB/\347\224\237\346\210\220IpyGameDataPY/config.ini"
index 3ea7d1d..8011664 100644
--- "a/PySysDB/\347\224\237\346\210\220IpyGameDataPY/config.ini"
+++ "b/PySysDB/\347\224\237\346\210\220IpyGameDataPY/config.ini"
@@ -1,5 +1,5 @@
 [config]
 
 ; 项目根路径
-CodeProjectPath1 = E:\SnxxServerCode\ServerPython
-CodeProjectPath2 = E:\Git\SnxxServerCode\ServerPython
+CodeProjectPath1 = D:\SnxxServerCode\ServerPython
+CodeProjectPath2 = D:\Git\SnxxServerCode\ServerPython
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
index 7056651..beff53f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
@@ -3121,7 +3121,7 @@
     for playerID, pActInfo in playerActInfo.items():
         if not PlayerControl.GetDBPlayerAccIDByID(playerID):
             # 非本服玩家
-            return
+            continue
         curPlayer = playerManager.FindPlayerByID(playerID)
         if curPlayer:
             MapServer_QueryPlayerResult(curPlayer, "FamilyGCZPlayerActInfo", pActInfo)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActFamilyGCZ.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActFamilyGCZ.py
index 64d3b20..187d5bb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActFamilyGCZ.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActFamilyGCZ.py
@@ -110,10 +110,6 @@
     state = actInfo.get(ShareDefine.ActKey_State, 0)
     if not playerActID and not playerZoneID:
         GameWorld.DebugLog("仙盟攻城战活动玩家没有活动数据不需要重置! playerZoneID=%s,playerActID=%s" % (playerZoneID, playerActID), playerID)
-        if state:
-            roundNum, _ = GetRoundState(state)
-            if roundNum and roundNum != playerRoundNum:
-                __doPlayerRoundChange(curPlayer, playerRoundNum, roundNum)
         return
     
     ipyDataDict = actInfo.get(ShareDefine.ActKey_IpyDataInfo, {})
@@ -121,6 +117,9 @@
     
     if state and playerActID == actID and playerZoneID == zoneID:
         GameWorld.DebugLog("仙盟攻城战活动玩家正常活动中不需要重置! playerZoneID=%s,playerActID=%s,state=%s" % (playerZoneID, playerActID, state), playerID)
+        roundNum, _ = GetRoundState(state)
+        if roundNum and roundNum != playerRoundNum:
+            __doPlayerRoundChange(curPlayer, playerRoundNum, roundNum)
         return
     GameWorld.DebugLog("仙盟攻城战活动玩家重置End! zoneID=%s,actID=%s,playerZoneID=%s,playerActID=%s,state=%s" 
                        % (zoneID, actID, playerZoneID, playerActID, state), playerID)

--
Gitblit v1.8.0