diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java index 4771cc7ed..1ae2e81b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java @@ -214,7 +214,7 @@ public class CrossServiceLogic { if (collect.isEmpty()){ continue; } - Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, true, teamId); + Map attribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero, false, teamId); arenaOfHero.putAttributeMapByTeam(teamId,attribute); } return arenaOfHero; 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 7a60d3328..bab98690f 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 @@ -774,10 +774,16 @@ public class PlayerLogic { Map heroNotBufferAttribute = hero.getAttributeMapByTeam().getOrDefault(teamId,new HashMap<>()); for(Map.Entry item : heroNotBufferAttribute.entrySet()){ - builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue().intValue()).build()); + int id = item.getKey(); + int values = item.getValue().intValue(); + if (id == 53 || id == 57 || id == 58){ + values = item.getValue().intValue()-10000; + } + builder.addSpecialEffects(CommonProto.SpecialEffects.newBuilder().setPropertyId(id).setPropertyValue(values).build()); } Map jewels = query.getHeroManager().getJewels(); for(String equipId : hero.getJewelInfo()){ + heroBuilder.addJewels(equipId); builder.addEquip(CBean2Proto.getEquipProto(jewels.get(equipId))); } for(int equipId : hero.getEquipByPositionMap().values()){