ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossBattlefield.py
@@ -25,6 +25,7 @@
import GameWorldProcess
import NPCCustomRefresh
import DataRecordPack
import PlayerFuncTeam
import PlayerControl
import ShareDefine
import SkillCommon
@@ -892,6 +893,17 @@
    if callFaction:
        faction = callFaction # 召集阵营为固定阵营
        
    # 队伍同阵营
    teamID = PlayerFuncTeam.GetPlayerTeamID(playerID, ChConfig.Def_FBMapID_CrossBattlefield)
    if not faction and teamID:
        memIDList = PlayerFuncTeam.GetMemberIDList(teamID)
        for memID in memIDList:
            memBattleObj = GetBattlePlayerObj(memID)
            if memBattleObj.faction:
                faction = memBattleObj.faction
                GameWorld.Log("与队友同一阵营! playerID=%s,teamID=%s,faction=%s,memIDList=%s" % (playerID, teamID, faction, memIDList), fbPropertyID)
                break
    if not faction:
        jFactionObj = GetBattleFactionObj(ShareDefine.CampType_Justice)
        eFactionObj = GetBattleFactionObj(ShareDefine.CampType_Evil)
@@ -1762,6 +1774,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)
            killCnt, ckillCntInfo, killBossCnt, killScoreKing, killGuardCnt, auraScore, superItemAwardCnt, \
                factionBuffCollCnt, personBuffCollCnt, crystalCollCnt, wallCollCnt = \
                battleObj.killCount, battleObj.ckillCntInfo, battleObj.killBossCnt, battleObj.killScoreKing, battleObj.killGuardCnt, \
@@ -1769,13 +1782,13 @@
                battleObj.crystalCollCnt, battleObj.wallCollCnt
                
            playerInfo = [playerID, job, realmLV, name,
                          isWinner, faction, rank, score, highScoreToday, highScoreWeekTotal, enterCountWeek,
                          isWinner, faction, rank, score, highScoreToday, highScoreWeekTotal, enterCountWeek, teamID,
                          isCallOpen, isCalled, killCnt, ckillCntInfo, killBossCnt, killScoreKing, killGuardCnt, auraScore, superItemAwardCnt,
                          factionBuffCollCnt, personBuffCollCnt, crystalCollCnt, wallCollCnt]
            battlePlayerList.append(playerInfo)
            
            drPlayerList.append({"playerID":playerID, "accID":battleObj.accID, "fightPower":battleObj.fightPower,
                                 "score":score, "auraScore":auraScore, "wallCollCnt":wallCollCnt,
                                 "score":score, "auraScore":auraScore, "wallCollCnt":wallCollCnt, "teamID":teamID,
                                 "superItemAwardCnt":superItemAwardCnt, "superItemContribution":battleObj.superItemContribution})
            
            player = copyMapMgr.FindPlayerByID(playerID)