From 5dfc9bf567fdf69a0ee8899c4966ce64b4cfe5ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 三月 2026 12:07:54 +0800
Subject: [PATCH] 547 【红颜系统】新增红颜-服务端(新增激活方式8-定军阁层;新增红颜特殊效果5-遣散/吞噬额外返还;统一A801、0320物品获得标记;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.py
index c1697cc..595418a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Arena.py
@@ -76,11 +76,6 @@
     
     return True, funcLineID
 
-def GetFBPlayerLineupID(curPlayer, mapID, funcLineID):
-    ## 获取玩家使用的攻防阵容ID
-    # @return: 攻击方阵容ID, 防守方阵容ID
-    return ShareDefine.Lineup_ArenaAtk, ShareDefine.Lineup_ArenaDef
-
 def OnTurnFightAward(curPlayer, guid, mapID, funcLineID, winFaction, statMsg, dateStr, reqData, awardDict):
     ## 回合战斗结算奖励
     if not curPlayer:
@@ -191,7 +186,7 @@
     PlayerArena.SetRecLV(recData, tagViewCache.GetLV() if tagViewCache else 1)
     # 名字、变更积分 +-、战力
     # 战力统一记录防守阵容
-    fightPower = TurnAttack.GetCacheLineupFightPower(tagViewCache, ShareDefine.Lineup_ArenaDef) if tagViewCache else 0
+    fightPower = TurnAttack.GetCacheLineupFightPower(tagViewCache, ShareDefine.BatPreset_ArenaDef) if tagViewCache else 0
     tagPlayerName = tagViewCache.GetPlayerName() if tagViewCache else ""
     recData.SetUserData({"Name":tagPlayerName, "AddScore":atkAddScore, "FightPower":fightPower})
     # 攻击方仅在积分变更或者初始积分时更新榜单
@@ -229,7 +224,7 @@
     PlayerArena.SetRecRealmLV(recData, curPlayer.GetOfficialRank())
     PlayerArena.SetRecLV(recData, curPlayer.GetLV())
     # 名字、变更积分 +-、战力
-    fightPower = TurnAttack.GetPlayerLineupFightPower(curPlayer, ShareDefine.Lineup_ArenaAtk)
+    fightPower = TurnAttack.GetPlayerLineupFightPower(curPlayer)
     recData.SetUserData({"Name":curPlayer.GetPlayerName(), "AddScore":-defDecScore, "FightPower":fightPower})
     if defDecScore: # 防守方仅变更时更新
         PlayerBillboard.UpdateBillboardByID(tagPlayerID, ShareDefine.Def_BT_Arena, updScore)

--
Gitblit v1.8.0