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 31950e18e..1be125a2c 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 @@ -2548,6 +2548,8 @@ public class HeroLogic{ } heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),heroAllAttribute.get(GlobalsDef.HP_TYPE)); + //魂印战力保存 + heroAllAttribute.put(HeroAttributeEnum.EquipForce.getPropertyId(), (long) equipForce); return heroAllAttribute; } @@ -2685,16 +2687,16 @@ public class HeroLogic{ Map heroAllAttribute; heroAllAttribute = calHeroNotBufferAttribute(user, hero,true,teamId); //战力保存 - return calForce(heroAllAttribute); -// Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); -// for (int sign:soulEquipByPositionMap.values()){ -// SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(sign); -// if(sEquipConfig==null) { -// continue; -// } -// force+=sEquipConfig.getScore(); -// } -// return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId()); + int force = calForce(heroAllAttribute); + Map soulEquipByPositionMap = hero.getSoulEquipByPositionMap(); + for (int sign:soulEquipByPositionMap.values()){ + SEquipConfig sEquipConfig = STableManager.getConfig(SEquipConfig.class).get(sign); + if(sEquipConfig==null) { + continue; + } + force+=sEquipConfig.getScore(); + } + return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId()); }