From c69a35c87860659271cbb58d0b0f13a9c65cdb35 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 04 一月 2026 14:44:17 +0800
Subject: [PATCH] 389 流向记录(增加主线装备分解流向支持:根据当前祝福等级取倒数x个品质记录;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py |   59 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
index eb1b7c0..a1b55ec 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -640,7 +640,7 @@
     lineupInfo = {"PlayerID":playerID, "FightPower":lineup.fightPower, "ShapeType":lineup.shapeType, "Hero":heroDict}
     return lineupInfo
 
-def GetNPCLineupInfo(lineupID, strongerLV=0, difficulty=0):
+def GetNPCLineupInfo(lineupID, strongerLV=0, difficulty=0, isLog=True):
     ## 获取NPC阵容信息
     # @param lineupID: 阵容ID
     # @param npcLV: 成长NPC等级
@@ -662,7 +662,7 @@
         npcID = getattr(ipyData, "GetPosNPCID%s" % posNum)()
         if not npcID:
             continue
-        battleDict = GetNPCBattleDict(ipyData, npcID, strongerLV, difficulty)
+        battleDict = GetNPCBattleDict(ipyData, npcID, strongerLV, difficulty, isLog)
         if not battleDict:
             continue
         heroDict[str(posNum)] = battleDict
@@ -775,7 +775,7 @@
     lineupInfo = {"NPCLineupID":lineupID, "Hero":heroDict, "BossID":0, "BossPosView":0}
     return lineupInfo
     
-def GetNPCBattleDict(lineupIpyData, npcID, strongerLV=0, difficulty=0):
+def GetNPCBattleDict(lineupIpyData, npcID, strongerLV=0, difficulty=0, isLog=True):
     ## 获取NPC战斗相关字典,支持成长NPC
     # @param strongerLV: 成长等级
     # @param difficulty: 难度系数
@@ -786,19 +786,20 @@
     npcLV = npcData.GetLV()
     star, breakLV, awakeLV = 0, 0, 0
     
-    lvIpyData = None
+    reModelID = lineupIpyData.GetReModelID()
+    lvReIpyData = None
     heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) if heroID else None
     npcStronger = IpyGameDataPY.GetIpyGameDataNotLog("NPCStronger", npcID)
     if npcStronger and strongerLV:
-        lvIpyData = IpyGameDataPY.GetIpyGameData("PlayerLV", strongerLV)
-        if lvIpyData:
+        lvReIpyData = IpyGameDataPY.GetIpyGameData("LVReValue", reModelID, strongerLV)
+        if lvReIpyData:
             npcLV = strongerLV
-    if not lvIpyData:
-        lvIpyData = IpyGameDataPY.GetIpyGameData("PlayerLV", npcLV)
-    if lvIpyData:
-        star = lvIpyData.GetReHeroStar()
-        breakLV = lvIpyData.GetReHeroBreakLV()
-        awakeLV = lvIpyData.GetReHeroAwakeLV()
+    if not lvReIpyData:
+        lvReIpyData = IpyGameDataPY.GetIpyGameData("LVReValue", reModelID, npcLV)
+    if lvReIpyData:
+        star = lvReIpyData.GetReHeroStar()
+        breakLV = lvReIpyData.GetReHeroBreakLV()
+        awakeLV = lvReIpyData.GetReHeroAwakeLV()
     if heroIpyData:
         skinIDList = heroIpyData.GetSkinIDList()
         skinID = skinIDList[0] if skinIDList else 0
@@ -819,10 +820,10 @@
                 random.shuffle(randSkillIDExList)
                 randSkillIDExList = randSkillIDExList[:skillExCnt]
             skillIDList += randSkillIDExList
-            GameWorld.DebugLogEx("阵容boss技能: %s, 随机附加技能: %s", skillIDList, randSkillIDExList)
+            isLog and GameWorld.DebugLogEx("阵容boss技能: %s, 随机附加技能: %s", skillIDList, randSkillIDExList)
             
     # 成长怪属性
-    batAttrDict = GetNPCStrongerAttrDict(npcID, lvIpyData, npcStronger, difficulty)
+    batAttrDict = GetNPCStrongerAttrDict(npcID, lvReIpyData, npcStronger, difficulty, isLog)
     if not batAttrDict:
         batAttrDict = {ChConfig.AttrID_Atk:npcData.GetAtk(), ChConfig.AttrID_Def:npcData.GetDef(), ChConfig.AttrID_MaxHP:npcData.GetMaxHP(), 
                        ChConfig.AttrID_FinalDamPer:npcData.GetFinalDamPer(), ChConfig.AttrID_FinalDamPerDef:npcData.GetFinalDamPerDef(), 
@@ -849,7 +850,7 @@
                   "SkillIDList":skillIDList,
                   }
     
-    GameWorld.DebugLogEx("GetNPCBattleDict npcID=%s,strongerLV=%s,difficulty=%s,%s", npcID, strongerLV, difficulty, battleDict)
+    isLog and GameWorld.DebugLogEx("GetNPCBattleDict npcID=%s,strongerLV=%s,difficulty=%s,reModelID=%s,%s", npcID, strongerLV, difficulty, reModelID, battleDict)
     return battleDict
 
 def GetNPCHeroSkillIDList(heroID, heroIpyData, breakLV, awakeLV):
@@ -878,29 +879,29 @@
                 
     return skillIDList
 
-def GetNPCStrongerAttrDict(npcID, lvIpyData, npcStronger, difficulty):
+def GetNPCStrongerAttrDict(npcID, lvReIpyData, npcStronger, difficulty, isLog=True):
     ## 获取NPC成长属性
     # @param strongerLV: 成长等级
     # @param difficulty: 难度系数
     
     batAttrDict = {}
-    if not lvIpyData or not npcStronger or not difficulty:
+    if not lvReIpyData or not npcStronger or not difficulty:
         return batAttrDict
-    lv = lvIpyData.GetLV()
+    lv = lvReIpyData.GetLV()
     for attrID in ChConfig.CalcBattleAttrIDList:
         attrIpyData = IpyGameDataPY.GetIpyGameData("PlayerAttr", attrID)
         if not attrIpyData:
             continue
         attrName = attrIpyData.GetParameter()
-        if not hasattr(lvIpyData, "GetRe%s" % attrName):
+        if not hasattr(lvReIpyData, "GetRe%s" % attrName):
             continue
-        reValue = getattr(lvIpyData, "GetRe%s" % attrName)() # 基础参考值
+        reValue = getattr(lvReIpyData, "GetRe%s" % attrName)() # 基础参考值
         ratio = getattr(npcStronger, "Get%sRatio" % attrName)() if hasattr(npcStronger, "Get%sRatio" % attrName) else 1 # 属性系数
         attrValue = int(reValue * ratio * difficulty)
         batAttrDict[attrID] = attrValue
         #GameWorld.DebugLogEx("    attrID=%s,attrValue=%s,reValue=%s,ratio=%s,difficulty=%s", attrID, attrValue, reValue, ratio, difficulty)
         
-    GameWorld.DebugLogEx("NPC成长属性: npcID=%s,lv=%s,difficulty=%s,%s", npcID, lv, difficulty, batAttrDict)
+    isLog and GameWorld.DebugLogEx("NPC成长属性: npcID=%s,lv=%s,difficulty=%s,%s", npcID, lv, difficulty, batAttrDict)
     return batAttrDict
 
 def SummonLineupObjs(batLineup, faction, num, lineupInfo, reqPlayerID=0):
@@ -2193,13 +2194,15 @@
     if not os.path.exists(ReportDir):
         os.makedirs(ReportDir)
     else:
-        items = os.listdir(ReportDir)
-        for item in items:
-            fullPath = os.path.join(ReportDir, item)
-            try:
-                os.remove(fullPath)
-            except:
-                pass
+        isSaveOne = IpyGameDataPY.GetFuncCfg("TurnFightProcess", 2) # 个人战报是否只保留1份
+        if isSaveOne:
+            items = os.listdir(ReportDir)
+            for item in items:
+                fullPath = os.path.join(ReportDir, item)
+                try:
+                    os.remove(fullPath)
+                except:
+                    pass
             
     saveFilePath = os.path.join(ReportDir, "%s.tfr" % guid)
     GameWorld.DebugLogEx("战报路径=%s", saveFilePath)

--
Gitblit v1.8.0