From a56918a674da7299955e14d64620331d7d741034 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 31 Dec 2021 13:39:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E5=8A=9F=E8=83=BD1.?= =?UTF-8?q?1.8=E3=80=91=201=E3=80=81=E8=A3=85=E5=A4=87=E5=BC=BA=E5=8C=96?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=98=E5=8A=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 770d6be77..15ba97ff8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2781,13 +2781,17 @@ public class HeroLogic { int[][] property = sEquipConfig.getProperty(); Map propertyValueByIdMap = new HashMap<>(); for (int[] prop : property) { - int buff = 0; - // 家园装备强化属性 - int strongeId = Optional.ofNullable(intensifyMap.get(sEquipConfig.getPosition())).orElse(0); - buff += Optional.ofNullable(strengthenMap.get(strongeId)).map(SEquipStrengthen::getRate).orElse(0); - // 突破 - buff += Optional.ofNullable(rankUpMap.get(homeRankUp)).map(v -> v.getRate()[sEquipConfig.getPosition() - 1]).orElse(0); - long value = prop[1] + (long) prop[1] / 100 *buff; + long value = prop[1]; + SPropertyConfig config = SPropertyConfig.getsPropertyConfigByPID(prop[0]); + // 家园装备强化属性,只增加基础属性 + if (config != null && config.getStyle() == 1){ + double buff = 0; + int strongId = Optional.ofNullable(intensifyMap.get(sEquipConfig.getPosition())).orElse(0); + buff += Optional.ofNullable(strengthenMap.get(strongId)).map(SEquipStrengthen::getRate).orElse(0); + // 突破 + buff += Optional.ofNullable(rankUpMap.get(homeRankUp)).map(v -> v.getRate()[sEquipConfig.getPosition() - 1]).orElse(0); + value = value + (long) Math.ceil(buff/100*value); + } propertyValueByIdMap.put(prop[0], value); } combinedAttribute(propertyValueByIdMap, heroAllAttribute);