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 0091ee1eb..4fe4d0c04 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 @@ -2659,7 +2659,7 @@ public class HeroLogic { //英雄皮肤加成 记得判断皮肤过期 int skin = hero.getSkin(); if (skin != 0) { - Map skinInfo = user.getHeroManager().getSkinInfo(); + Map skinInfo = heroManager.getSkinInfo(); SHeroSkin sHeroSkin = SHeroSkin.skinMapByType.get(skin); if (sHeroSkin != null && sHeroSkin.getMonomerProperty() != null && sHeroSkin.getMonomerProperty().length > 0) { if (skinInfo.containsKey(skin) && (skinInfo.get(skin) == -1 || skinInfo.get(skin) > TimeUtils.nowInt())) { @@ -2689,7 +2689,7 @@ public class HeroLogic { combinedAttribute(SPlayerHeadIcon.getHeadIconMap().get(entry.getKey()).getUnlockProperty(), heroAllAttribute); } //四象心法加成 - for (Map.Entry entry : user.getHeroManager().getSixiangDataMap().entrySet()) { + for (Map.Entry entry :heroManager.getSixiangDataMap().entrySet()) { if (scHero.getProfession() != entry.getKey()) { continue; } @@ -2697,22 +2697,22 @@ public class HeroLogic { Map propertyMap = entry.getValue().propertyMap; int[][] propArr = ItemUtil.mapToArray(propertyMap); combinedAttribute(propArr, heroAllAttribute); - if (user.getHeroManager().getSixiangPropUpMap().containsKey(entry.getKey())) { + if (heroManager.getSixiangPropUpMap().containsKey(entry.getKey())) { //进阶属性 - Map upStarPropertyMap = user.getHeroManager().getSixiangPropUpMap().get(entry.getKey()); + Map upStarPropertyMap = heroManager.getSixiangPropUpMap().get(entry.getKey()); int[][] upStarProp = ItemUtil.mapToArray(upStarPropertyMap); combinedAttribute(upStarProp, heroAllAttribute); } } ///四象心法共鸣属性加成 - if (user.getHeroManager().GetSiXiangGongMingLv() > 0) { - SFourQuadrantConfig fourConfig = SFourQuadrantConfig.configByStrtMap.get(user.getHeroManager().GetSiXiangGongMingLv()); + if (heroManager.GetSiXiangGongMingLv() > 0) { + SFourQuadrantConfig fourConfig = SFourQuadrantConfig.configByStrtMap.get(heroManager.GetSiXiangGongMingLv()); combinedAttribute(fourConfig.getPropResonance(), heroAllAttribute); } ///四象心法技能属性加成 Map skillPropertyMap = new HashMap<>(); - for (Map.Entry entry : user.getHeroManager().getSixiangDataMap().entrySet()) { + for (Map.Entry entry : heroManager.getSixiangDataMap().entrySet()) { if (entry.getValue().level > 0) { SFourQuadrantConfig fourConfig = SFourQuadrantConfig.configByStrtMap.get(entry.getValue().level); int[] skillAddProp = fourConfig.getSkill()[entry.getKey() - 1]; @@ -2723,25 +2723,36 @@ public class HeroLogic { combinedAttribute(skillProp, heroAllAttribute); //英雄好感度属性加成 - if (user.getHeroManager().getHeroLikablePropAddMap().containsKey(scHero.getId())) { - int[][] likableProp = ItemUtil.mapToArray(user.getHeroManager().getHeroLikablePropAddMap().get(scHero.getId())); + if (heroManager.getHeroLikablePropAddMap().containsKey(scHero.getId())) { + int[][] likableProp = ItemUtil.mapToArray(heroManager.getHeroLikablePropAddMap().get(scHero.getId())); combinedAttribute(likableProp, heroAllAttribute); } //英雄总好感度属性加成 - if (user.getHeroManager().getAllLikablePropAddMap().size() > 0) { - int[][] allLikableProp = ItemUtil.mapToArray(user.getHeroManager().getAllLikablePropAddMap()); + if (heroManager.getAllLikablePropAddMap().size() > 0) { + int[][] allLikableProp = ItemUtil.mapToArray(heroManager.getAllLikablePropAddMap()); combinedAttribute(allLikableProp, heroAllAttribute); } ///法宝之魂属性加成 - for (Map.Entry faBaoSoulEntry : user.getHeroManager().getFaBaoSoulMap().entrySet()) { + for (Map.Entry faBaoSoulEntry :heroManager.getFaBaoSoulMap().entrySet()) { STrump trumpConfig = STrump.sTrumpMap.get(faBaoSoulEntry.getKey()); STrumpLevelupPool lvUpProps = STrumpLevelupPool.levelPoolMap.get(trumpConfig.getLvupPool()).get(faBaoSoulEntry.getValue()); combinedAttribute(lvUpProps.getLvupProps(), heroAllAttribute); } + ///命格属性加成 + for (Map.Entry> lifeGridMapEntry : heroManager.getLifeGridMap().entrySet()) { + for (Map.Entry entry : lifeGridMapEntry.getValue().entrySet()) { + int lifeStoneId=entry.getValue(); + if (lifeStoneId>0){ + SGemConfig sGemConfig=STableManager.getConfig(SGemConfig.class).get(lifeStoneId); + combinedAttribute(sGemConfig.getProperty(), heroAllAttribute); + } + } + } + // 身外化身加成 - Map transformationList = user.getHeroManager().getTransformationList(); + Map transformationList = heroManager.getTransformationList(); Map changingCardMap = STableManager.getConfig(SChangingCard.class); int[][] arrayValue = SSpecialConfig.getTwiceArrayValue(SSpecialConfig.PER_CHANGING_CART_PROP); for (TransformationInfo info : transformationList.values()) { @@ -2756,7 +2767,7 @@ public class HeroLogic { //装备总战力评分 int equipForce = 0; - Iterator> iterator = hero.getEquipByHongmengPositionMap(user.getHeroManager()).entrySet().iterator(); + Iterator> iterator = hero.getEquipByHongmengPositionMap(heroManager).entrySet().iterator(); // 套装list初始化 ArrayList suiteNumList = new ArrayList<>(); while (iterator.hasNext()) {