diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 128bbfd15..10aa7ff4d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -367,9 +367,11 @@ public class FightUtil { if (hero == null) { continue; } - Map heroAttributeMap = SEndlessHeroProp.propsMap.get(hero.getTemplateId()); - for(Map.Entry entry:heroAttributeMap.entrySet()){ - System.out.println("表拿到属性k:"+entry.getKey()+"-----v:"+entry.getValue()); + Map config = STableManager.getConfig(SEndlessHeroProp.class); + SEndlessHeroProp sEndlessHeroProp = config.get(hero.getTemplateId()); + Map heroAttributeMap = new HashMap<>(); + for(int[] prop:sEndlessHeroProp.getProps()){ + heroAttributeMap.put(prop[0],(long)prop[1]); } //士气额外加成 for(Map.Entry entry:moraleMap.entrySet()){ @@ -382,9 +384,6 @@ public class FightUtil { StringBuilder propertySb = new StringBuilder(); String heroSkill = HeroLogic.getInstance().getHeroSkills(user,hero,skillSb).toString(); heroSkill = heroSkill+moraleSkillBuilder.toString(); - for(Map.Entry entry:heroAttributeMap.entrySet()){ - System.out.println("属性k:"+entry.getKey()+"-----v:"+entry.getValue()); - } String property = HeroLogic.getInstance().getHeroPropertyBuilder(propertySb, hero.getTemplateId(),hero.getLevel(user.getHeroManager()), heroAttributeMap).toString(); CommonProto.FightUnitInfo heroFightInfo = CommonProto.FightUnitInfo .newBuilder() 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 534791a45..1d57c3584 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 @@ -793,7 +793,12 @@ public class HeroLogic{ continue; } - Map heroAllAttribute = SEndlessHeroProp.propsMap.get(hero.getTemplateId()); + Map config = STableManager.getConfig(SEndlessHeroProp.class); + SEndlessHeroProp sEndlessHeroProp = config.get(hero.getTemplateId()); + Map heroAllAttribute = new HashMap<>(); + for(int[] prop:sEndlessHeroProp.getProps()){ + heroAllAttribute.put(prop[0],(long)prop[1]); + } Map endlessHeroInfo = user.getMapManager().getEndlessMapInfo().getEndlessHeroInfo(); if(endlessHeroInfo!=null&& endlessHeroInfo.containsKey(heroInfo.getHeroId())){ int curHp = (int)(endlessHeroInfo.get(heroInfo.getHeroId()) /10000.00 * heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId()));