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 6447d7c10..b49445f06 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 @@ -3826,7 +3826,7 @@ public class HeroLogic { } /** - * 英雄,灵兽合成 + * 英雄,灵兽,神兵合成 * * @param iSession * @param item @@ -3843,12 +3843,14 @@ public class HeroLogic { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } int composeNum = itemNum / sItem.getUsePerCount(); - SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); - if (composeNum <= 0 || composeNum > gameSetting.getHeroCompoundLimit()) { - throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); - } - if (hasHeroNum + composeNum > gameSetting.getHeroNumlimit()) { - throw new ErrorCodeException(ErrorCode.HERO_HERO_MAX); + if (sItem.getItemType() == GlobalItemType.CARD){ + SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); + if (composeNum <= 0 || composeNum > gameSetting.getHeroCompoundLimit()) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } + if (hasHeroNum + composeNum > gameSetting.getHeroNumlimit()) { + throw new ErrorCodeException(ErrorCode.HERO_HERO_MAX); + } } boolean result = ItemUtil.checkCost(user, sItem, itemNum, BIReason.COMPOS_HERO_CONSUME, itemId); if (!result) {