From f198885f31c9c7eb19eb28adce562e39e64d581c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 七月 2025 16:23:11 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(属性计算、战斗力计算;新角色初始给默认装备、默认阵容武将;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
index 1448a6f..7be08cf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
@@ -25,11 +25,11 @@
 import GameWorldProcess
 import NPCCustomRefresh
 import DataRecordPack
-import PlayerFuncTeam
 import PlayerControl
 import ShareDefine
 import SkillCommon
 import SkillShell
+import DBDataMgr
 import BuffSkill
 import ChConfig
 import AICommon
@@ -898,9 +898,10 @@
         faction = callFaction # 召集阵营为固定阵营
         
     # 队伍同阵营
-    teamID = PlayerFuncTeam.GetPlayerTeamID(playerID, ChConfig.Def_FBMapID_CrossBattlefield)
-    if not faction and teamID:
-        memIDList = PlayerFuncTeam.GetMemberIDList(teamID)
+    teamID = DBDataMgr.GetFuncTeamMgr().GetPlayerTeamID(playerID, ChConfig.Def_FBMapID_CrossBattlefield)
+    funcTeam = DBDataMgr.GetFuncTeamMgr().GetFuncTeam(teamID)
+    if not faction and teamID and funcTeam:
+        memIDList = funcTeam.GetMemberIDList()
         for memID in memIDList:
             memBattleObj = GetBattlePlayerObj(memID)
             if memBattleObj.faction:
@@ -1780,7 +1781,7 @@
             
             isCallOpen = 1 if playerID in worldObj.callOpenPlayerInfo else 0 # 是否召集进入的
             isCalled = 1 if (playerID in allCallPlayerIDList and not isCallOpen) else 0 # 是否被召集的
-            teamID = PlayerFuncTeam.GetPlayerTeamID(playerID, ChConfig.Def_FBMapID_CrossBattlefield)
+            teamID = DBDataMgr.GetFuncTeamMgr().GetPlayerTeamID(playerID, ChConfig.Def_FBMapID_CrossBattlefield)
             killCnt, ckillCntInfo, killBossCnt, killScoreKing, killGuardCnt, auraScore, superItemAwardCnt, \
                 factionBuffCollCnt, personBuffCollCnt, crystalCollCnt, wallCollCnt = \
                 battleObj.killCount, battleObj.ckillCntInfo, battleObj.killBossCnt, battleObj.killScoreKing, battleObj.killGuardCnt, \

--
Gitblit v1.8.0