From abbd8e67dfce5e600409e7db3e72a8da1a5854fb Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Mon, 5 Aug 2024 18:37:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E7=8E=8B2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 11 +++++------ .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 1 + 2 files changed, 6 insertions(+), 6 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 bc28af91f..a93af5a52 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 @@ -1544,8 +1544,7 @@ public class HeroLogic { if (consumeMaterialInfoByPosition == null) { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } - CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); - checkAndUpdateConsumeHero(user, heroId, consumeMaterialInfoByPosition, consumeMaterialsList, drop); + CommonProto.Drop.Builder drop = checkAndUpdateConsumeHero(user, heroId, consumeMaterialInfoByPosition, consumeMaterialsList); ItemUtil.itemCost(user, consumeMaterial, BIReason.UP_HEROSTAR_CONSUME, targetHero.getTemplateId()); rankUpHeroExecute(user, targetHero); user.getHeroManager().addHeroStar(targetHero.getTemplateId(), targetHero.getStar()); @@ -7571,7 +7570,7 @@ public class HeroLogic { Map map = shenWang.getConsumeMaterialInfoOfPositionByLv().get(targetLv); CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder(); if (map != null){ - checkAndUpdateConsumeHero(user, heroId, map, request.getConsumeMaterialsList(), drop); + drop = checkAndUpdateConsumeHero(user, heroId, map, request.getConsumeMaterialsList()); } ItemUtil.itemCost(user, shenWang.getNeedItem(), BIReason.SHENWANG_UP_LV_COST, 0); hero.setShenwangLv(targetLv); @@ -7588,7 +7587,7 @@ public class HeroLogic { * @param consumeMaterialsList * @throws Exception */ - public void checkAndUpdateConsumeHero(User user, String heroId, Map consumeMaterialInfoByPosition, List consumeMaterialsList, CommonProto.Drop.Builder drop) throws Exception { + public CommonProto.Drop.Builder checkAndUpdateConsumeHero(User user, String heroId, Map consumeMaterialInfoByPosition, List consumeMaterialsList) throws Exception { HeroManager heroManager = user.getHeroManager(); Hero targetHero = heroManager.getHero(heroId); SCHero scHero = SCHero.getSCHero(targetHero.getTemplateId()); @@ -7680,10 +7679,10 @@ public class HeroLogic { LOGGER.error("hero num not enough"); throw new ErrorCodeException(ErrorCode.HERO_UN_MATCH); } - //改成归元获得,同时返还法宝获得 - drop = consumeBackDrop(user, removeHeroIds); // 消耗道具 ItemUtil.itemCost(user, removeItemMap, BIReason.COMPLEX_EQUIP_CONSUME, 0); + //改成归元获得,同时返还法宝获得 + return consumeBackDrop(user, removeHeroIds); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 93cad1748..c26f44f9c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -434,6 +434,7 @@ public class CBean2Proto { .addAllGiftEquipIds(hero.getHeroGiftEquipList()) .addAllPotential(toBeanPotential(hero)) .setTraining(getTrainingProto(hero)) + .setShenwangLv(hero.getShenwangLv()) .build(); }