From 985bdf70fd0022733f75bf2106e69c6de77c26b1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 28 十一月 2025 17:29:51 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(卑弥呼所有技能;技能表增加字段Buff保留-BuffRetain,支持死亡保留、复活保留;增加触发方式42-大回合开始时(死亡后有效);增加属性ID 73复活生命加成、74复活怒气加成;优化效果6014-支持失败次数额外概率;优化死亡、复活时的buff处理;)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
index 7900f53..2d66655 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossFamilyGCZ.py
@@ -249,9 +249,8 @@
         return True
     
     def SetPlayerInCity(self, playerID, serverGroupID):
-        if playerID in self.inCityPlayerIDList:
-            return
-        self.inCityPlayerIDList.append(playerID)
+        if playerID not in self.inCityPlayerIDList:
+            self.inCityPlayerIDList.append(playerID)
         Sync_FamilyGCZBatCityInfo(self.zoneID, self.batType, self.groupNum, self.cityID, toPlayerServerDict={playerID:serverGroupID})
         return
     
@@ -494,9 +493,8 @@
         return newCity
     
     def SetPlayerInScene(self, playerID, serverGroupID):
-        if playerID in self.inBatScenePlayerIDList:
-            return
-        self.inBatScenePlayerIDList.append(playerID)
+        if playerID not in self.inBatScenePlayerIDList:
+            self.inBatScenePlayerIDList.append(playerID)
         Sync_FamilyGCZBatSceneInfo(self.zoneID, self.batType, self.groupNum, toPlayerServerDict={playerID:serverGroupID})
         return
     
@@ -1476,7 +1474,8 @@
     guessRankMax = IpyGameDataPY.GetFuncCfg("FamilyGCZGuess", 2)
     billboardMgr = PyDataManager.GetCrossBillboardManager()
     scoreBillObj = billboardMgr.GetCrossBillboard(ShareDefine.Def_CBT_FamilyGCZScore, zoneID)
-    for index in range(guessRankMax):
+    guessCnt = min(scoreBillObj.GetCount(), guessRankMax)
+    for index in range(guessCnt):
         billData = scoreBillObj.At(index)
         familyID = billData.ID
         if familyID not in zone.familyGuessDict:

--
Gitblit v1.8.0