From 750ff5ee6204bb088713b0ce10d53d05f22679e0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 16 一月 2026 19:32:27 +0800
Subject: [PATCH] 438 【方案】方案预设-服务端

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
index b00727a..7be66ef 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCache.py
@@ -24,7 +24,9 @@
 import IpyGameDataPY
 import IPY_GameWorld
 import PlayerOnline
+import PlayerPreset
 import PlayerBeauty
+import PlayerGubao
 import ShareDefine
 import TurnAttack
 import DBDataMgr
@@ -111,19 +113,6 @@
             return True
         
     return False
-
-def GetLineupFightPower(curCache, lineupID):
-    ## 获取查看缓存中某个阵容对应的战力
-    if not curCache:
-        return 0
-    plusDict = curCache.GetPlusDict()
-    if "Lineup" in plusDict:
-        lineupDict = plusDict["Lineup"]
-        if str(lineupID) in lineupDict:
-            lineupInfo = lineupDict[str(lineupID)]
-            if "FightPower" in lineupInfo:
-                return lineupInfo["FightPower"]
-    return curCache.GetFightPowerTotal()
 
 def FindBattleViewCache(playerID):
     ## 获取可战斗的玩家缓存
@@ -266,15 +255,40 @@
             continue
         equipDict["%s" % equipIndex] = {"ItemID":curEquip.GetItemTypeID(), "UserData":curEquip.GetUserData()}
         
-    # 阵容
-    lineupDict = {}
-    for lineupID in ShareDefine.NeedViewCacheLineupIDList:
-        lineupInfo = TurnAttack.GetPlayerLineupInfo(curPlayer, lineupID)
-        if not lineupInfo:
-            continue
-        lineupDict["%s" % lineupID] = lineupInfo
-        
     olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
+    
+    # 预设、阵容
+    batPresetDict = {} # 战斗预设方案组合 {"战斗功能预设":{"功能方案预设":功能预设ID, ...}, ...}
+    lineupDict, mgPresetDict = {}, {}
+    for batPresetType in ShareDefine.NeedCacheBatPresetList:
+        batPresetID = PlayerPreset.GetBatPresetID(curPlayer, batPresetType)
+        #武将方案包含在 lineupInfo 里了,所以不用再取武将预设方案
+        #heroPresetID = PlayerPreset.GetFuncPresetID(curPlayer, batPresetID, ShareDefine.FuncPreset_Hero)
+        mgPresetID = PlayerPreset.GetFuncPresetID(curPlayer, batPresetID, ShareDefine.FuncPreset_Mingge)
+        
+        # 战斗预设方案组合 {"战斗功能预设":{"功能方案预设":功能预设ID, ...}, ...}
+        batPresetDict["%s" % batPresetType] = {str(ShareDefine.FuncPreset_Battle):batPresetID,
+                                               str(ShareDefine.FuncPreset_Mingge):mgPresetID,
+                                               }
+        
+        lineupInfo = TurnAttack.GetPlayerLineupInfo(curPlayer, batPresetType)
+        if lineupInfo:
+            batPresetID = lineupInfo.get("BatPresetID", batPresetID)
+            if str(batPresetID) not in lineupDict:
+                lineupDict["%s" % batPresetID] = lineupInfo
+                
+        # 命格方案
+        attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Mingge, mgPresetID)
+        skillLVDict = olPlayer.GetCalcSpecInfo(ChConfig.Def_CalcAttr_Mingge, mgPresetID)
+        mgPresetDict["%s" % mgPresetID] = {"Attr":{str(k):v for k, v in attrDict.items()}, "Skill":skillLVDict}
+        
+    # 命格:感悟境界等级、属性、已激活意象效果和层数
+    minggeDict = {"GWLV":curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MGGanwuLV), "Preset":mgPresetDict}
+    
+    # 古宝:数量、属性
+    attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
+    actCnt = PlayerGubao.GetGubaoTotalCnt(curPlayer)
+    gubaoDict = {"Cnt":actCnt, "Attr":{str(k):v for k, v in attrDict.items()}}
     
     # 红颜
     attrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Beauty)
@@ -287,7 +301,8 @@
     classLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HorseClassLV)
     horseDict = {"LV":horseLV, "ClassLV":classLV, "Attr":{str(k):v for k, v in attrDict.items()}}
     
-    plusDict = {"Equip":equipDict, "Lineup":lineupDict, "Beauty":beautyDict, "Horse":horseDict}
+    plusDict = {"Equip":equipDict, "BatPreset":batPresetDict, "Lineup":lineupDict, "Mingge":minggeDict, 
+                "Beauty":beautyDict, "Horse":horseDict, "Gubao":gubaoDict}
     curCache.SetPlusDict(plusDict)
     
     return curCache

--
Gitblit v1.8.0