diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index 893e54c7ec..55ce872748 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -243,29 +243,21 @@ function this.CalculateEquipWarForce(curEquip) for index, prop in pairs(mainAttribute) do local id = prop.propertyId local value = prop.propertyValue + -- + if propertyConfig[id].Style == 2 then + value = value / 100 + end if addAllProVal[id] then addAllProVal[id] = addAllProVal[id] + value else addAllProVal[id] = value end end - local powerEndVal = 0 - for i, v in pairs(addAllProVal) do - if v > 0 then - local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, i) - if curProConfigData then - if curProConfigData.Style == 1 then - powerEndVal = powerEndVal + v * HeroManager.heroPropertyScore[i] - else - powerEndVal = powerEndVal + v / 100 * HeroManager.heroPropertyScore[i] - end - end - end - end if curEquip and curEquip.Score > 0 then - powerEndVal = powerEndVal + curEquip.Score + addAllProVal[HeroProType.WarPower] = curEquip.Score end - return math.floor(powerEndVal) + local powerEndVal = HeroPowerManager.CalPower(addAllProVal) + return powerEndVal end -- 判断是否是新装备