From 736f0f77848f217db1b3a76693cd8289cb5e03ea Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 八月 2025 19:16:28 +0800
Subject: [PATCH] 16 卡牌服务端(功能开启删除不需要字段;支持任务开启功能;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
index bf3a1e4..3b72be5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -514,9 +514,9 @@
         
         # 突破潜能
         breakAttrDict = {}
-        awakeIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
-        if awakeIpyDataList:
-            for breakIpyData in awakeIpyDataList:
+        breakIpyDataList = IpyGameDataPY.GetIpyGameDataList("HeroBreak", heroID)
+        if breakIpyDataList:
+            for breakIpyData in breakIpyDataList:
                 if breakIpyData.GetBreakLV() > breakLV:
                     break
                 attrIDList = breakIpyData.GetAttrIDList()
@@ -614,6 +614,7 @@
     baseAttrFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 1)
     otherAttrFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 2)
     fightPowerFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 3)
+    skillFPFormula = IpyGameDataPY.GetFuncCfg("HeroAttrFormula", 4)
     
     lvAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_LV)
     equipAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_MainEquip)
@@ -632,6 +633,12 @@
     GameWorld.DebugLog("    主公等级属性=%s" % lvAttrDict, playerID)
     GameWorld.DebugLog("    主公装备属性=%s" % equipAttrDict, playerID)
     GameWorld.DebugLog("    主公图鉴属性=%s" % bookAttrDict, playerID)
+    
+    PlayerLV = curPlayer.GetLV()
+    OfficialLV = curPlayer.GetOfficialRank()
+    GameWorld.DebugLog("    PlayerLV=%s,OfficialLV=%s" % (PlayerLV, OfficialLV), playerID)
+    
+    fpRatioIpyData = IpyGameDataPY.GetIpyGameData("FightPowerRatio", OfficialLV)
     
     lineupFightPower = 0 # 阵容总战力
     InitAddPer, LVAddPer, BreakLVAddPer, StarAddPer = InitAddPer / 10000.0, LVAddPer / 10000.0, BreakLVAddPer / 10000.0, StarAddPer / 10000.0
@@ -698,15 +705,20 @@
             
             attrIpyData = IpyGameDataPY.GetIpyGameData("PlayerAttr", attrID)
             attrName = attrIpyData.GetParameter() if attrIpyData else "%s" % attrID
+            attrRatioName = "%sRatio" % attrName
+            ratioValue = 0
+            if attrValue and hasattr(fpRatioIpyData, "Get%s" % attrRatioName):
+                ratioValue = getattr(fpRatioIpyData, "Get%s" % attrRatioName)()
             fightPowerParamDict[attrName] = attrValue
+            fightPowerParamDict[attrRatioName] = ratioValue
             if attrValue:
                 lineupHero.heroBatAttrDict[attrID] = attrValue
                 logAttrDict["%s-%s" % (attrID, attrName)] = attrValue
-                
+            
         # 计算战力
         fightPower = FormulaControl.Eval("fightPowerFormula", fightPowerFormula, fightPowerParamDict)
         
-        GameWorld.DebugLog("    fightPower=%s,heroSkillIDList=%s" % (fightPower, lineupHero.heroSkillIDList), playerID)
+        GameWorld.DebugLog("    heroID=%s,fightPower=%s,heroSkillIDList=%s" % (heroID, fightPower, lineupHero.heroSkillIDList), playerID)
         skillTypeIDDict = {}
         for skillID in lineupHero.heroSkillIDList:
             skillData = IpyGameDataPY.GetIpyGameData("Skill", skillID)
@@ -727,7 +739,9 @@
         for skillData in skillTypeIDDict.values():
             skillID = skillData.GetSkillID()
             lineupHero.heroSkillIDList.append(skillID)
-            skillFightPower += skillData.GetFightPower()
+            paramDict = {"SkillPower":skillData.GetFightPower(), "PlayerLV":PlayerLV, "OfficialLV":OfficialLV}
+            sFightPower = FormulaControl.Eval("skillFPFormula", skillFPFormula, paramDict)
+            skillFightPower += sFightPower
         GameWorld.DebugLog("    skillFightPower=%s,heroSkillIDList=%s" % (skillFightPower, lineupHero.heroSkillIDList), playerID)
         
         # 最终战力
@@ -774,7 +788,7 @@
                     continue
                 lineupHero = lineup.GetLineupHero(posNum)
                 if lineupHero.heroBatAttrDict:
-                    batObj.UpdInitBatAttr(lineupHero.heroBatAttrDict)
+                    batObj.UpdInitBatAttr(lineupHero.heroBatAttrDict, lineupHero.heroSkillIDList)
     else:
         GameWorld.DebugLog("主阵容没有在战斗中,不需要处理", playerID)
         

--
Gitblit v1.8.0