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 4dd7bf8d2..d7f85fa6a 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 @@ -1525,9 +1525,7 @@ public class HeroLogic { //判断编队 for (HeroInfoProto.ConsumeMaterial consumeMaterial1 : consumeMaterialsList) { List heroIdsList = new ArrayList<>(); - consumeMaterial1.getHeroIdsList().stream() - .filter(v -> v.getType() == 1) - .forEach(v -> heroIdsList.add(v.getItemId())); + consumeMaterial1.getHeroIdsList().stream().filter(v -> v.getType() == 1).forEach(v -> heroIdsList.add(v.getItemId())); ErrorCode err = null; if (!heroIdsList.isEmpty()) { err = ItemLogic.getInstance().checkHeroResolve(heroIdsList, user); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index 31ef62225..23dbb730c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -484,8 +484,9 @@ public class ItemLogic { for (String id : heroIdsList) { Hero hero = user.getHeroManager().getHero(id); + Training training = hero.getTraining(); int maxLv = STrain.getMaxLv(hero.getTemplateId()); - if (hero.getTraining().getLv() == maxLv){ + if (training.getLv() == maxLv){ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE, "特训满级英雄无法分解"); } } @@ -533,6 +534,9 @@ public class ItemLogic { if (hero.getIsLock() == 1) { return ErrorCode.ITEM_DECOMPOSE_HERO_LOCK; } + if (hero.getTraining().getIsTraining() == 1){ + return ErrorCode.HERO_UN_MATCH; + } if(teamCheck){ int[] teamId = SSpecialConfig.getOnceArrayValue(SSpecialConfig.HERO_RESOLVE_LICENCE); boolean battleArray = HeroLogic.getInstance().isBattleArray(user, heroId, teamId);