diff --git a/serverlogic/src/main/java/com/ljsd/CoreService.java b/serverlogic/src/main/java/com/ljsd/CoreService.java index edf379d83..8fb144dd3 100644 --- a/serverlogic/src/main/java/com/ljsd/CoreService.java +++ b/serverlogic/src/main/java/com/ljsd/CoreService.java @@ -214,7 +214,7 @@ public class CoreService implements RPCRequestIFace.Iface { if (collect.isEmpty()){ continue; } - Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId); + Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId); if(arenaOfHero.getAttributeMapByTeam() == null){ arenaOfHero.setAttributeMapByTeam(new HashMap<>()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 74b6386df..b57c693a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -1164,6 +1164,7 @@ public class PlayerLogic { } CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().setLevel(rpcHero.getLevel()).setEspecialEquipLevel(rpcHero.getEspecialEquipLevel()).setStar(rpcHero.getStar()).setId(rpcHero.getId()).setHeroId(rpcHero.getTemplateId()).setBreakId(rpcHero.getBreakId()).setStarBreakId(rpcHero.getStarBreakId()); PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); + Map heroNotBufferAttribute = rpcHero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); @@ -1204,16 +1205,14 @@ public class PlayerLogic { public PlayerInfoProto.ViewHeroInfoResponse viewCrossHeroInfoMyserver(int uid,String heroId,int teamId) throws Exception{ User user = UserManager.getUser(uid); Hero hero= user.getHeroManager().getHero(heroId); - //ArenaOfUser query = CrossServiceLogic.getInstance().query(uid); - //Map heroes = query.getHeroManager().getHeros(); - //ArenaOfHero hero = heroes.get(heroId); if(hero == null){ throw new ErrorCodeException(ErrorCode.newDefineCode("hero no")); } CommonProto.Hero.Builder heroBuilder = CommonProto.Hero.newBuilder().setLevel(hero.getLevel(user.getHeroManager())).setEspecialEquipLevel(hero.getEspecialEquipLevel()).setStar(hero.getStar()).setId(hero.getId()).setHeroId(hero.getTemplateId()).setBreakId(hero.getBreakId()).setStarBreakId(hero.getStarBreakId()); PlayerInfoProto.ViewHeroInfoResponse.Builder builder = PlayerInfoProto.ViewHeroInfoResponse.newBuilder(); - //Map heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); - Map heroNotBufferAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId); + + + Map heroNotBufferAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId); for(Map.Entry item : heroNotBufferAttribute.entrySet()){ int id = item.getKey(); int values = item.getValue().intValue(); @@ -1222,13 +1221,13 @@ public class PlayerLogic { } builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); } + + Map jewels = new HashMap<>(); Map equipMap = user.getEquipManager().getEquipMap(); // 魂宝灵宝 Map heroMap = user.getHeroManager().getHeroMap(); - //Map jewels = new HashMap<>(); - //Map equipMap = user.getEquipManager().getEquipMap(); heroMap.values().forEach(v-> v.getJewelInfo().forEach(v2->{ PropertyItem item = equipMap.get(v2); jewels.put(v2,item);