From f55d9f3cd68b2e473005bec94c923305e047c697 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Tue, 2 Jan 2024 11:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E6=88=90=E9=99=90?= =?UTF-8?q?=E5=88=B6=E4=B8=BA=E5=8F=AA=E9=99=90=E5=88=B6=E8=8B=B1=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/hero/HeroLogic.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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) {