From 83fb126a34c08f737b94c694524a701828901617 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 10:54:37 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(赛季信息封包删除下赛季时间信息)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 49cd1c6..03ace23 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -452,6 +452,7 @@
     equipPlaceList = [] # 有穿戴装备的装备位列表
     suitCntDict = {} #套装数量字典
     legendAttrDict = {} #所有传奇属性
+    equipScoreTotal = 0 #为解决装备评分、战力不一致的情况,装备战力改为由评分作为参数计算战力
     
     #玩家当前可装备的装备类型
     for equipIndex in xrange(playerEquip.GetCount()):
@@ -471,6 +472,7 @@
             continue
         
         equipPlaceList.append(equipIndex)
+        equipScoreTotal += ItemCommon.GetEquipGearScore(curEquip)
         
         #基础属性效果
         for i in range(0, curEquip.GetEffectCount()):
@@ -542,15 +544,10 @@
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Wash, allAttrListWash)
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_EquipOutOfPrint, allAttrListOutOfPrintEquip)
     
-    #计算装备基础属性附加战力
-    LV = curPlayer.GetLV()
-    Atk = baseEquipAttrDict.get(ShareDefine.Def_Effect_Atk, 0)
-    MinAtk = baseEquipAttrDict.get(ShareDefine.Def_Effect_MinAtk, 0) + Atk
-    MaxAtk = baseEquipAttrDict.get(ShareDefine.Def_Effect_MaxAtk, 0) + Atk
-    MaxHP = baseEquipAttrDict.get(ShareDefine.Def_Effect_MaxHP, 0)
-    Def = baseEquipAttrDict.get(ShareDefine.Def_Effect_Def, 0)
-    fightPowerEx = eval(IpyGameDataPY.GetFuncCompileCfg("FightpowerFormula", 2))
-    curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_Equip, fightPowerEx)
+    #计算装备基础属性附加战力 (目前组成: 评分战力 + ...)
+    equipFightPowerEx = eval(IpyGameDataPY.GetFuncCompileCfg("FightpowerFormula", 2))
+    #GameWorld.DebugLog("装备评分战力: equipScoreTotal=%s,equipFightPowerEx=%s" % (equipScoreTotal, equipFightPowerEx))
+    curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_Equip, equipFightPowerEx)
     return
 
 

--
Gitblit v1.8.0