From 2a51cb6da7388c654d52c42326af13accac5b98b Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Fri, 26 Aug 2022 13:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E8=BA=AB=E5=8D=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TransformationUpGradeHandler.java          | 18 +++++++-----------
 .../UpOrDownTransformationHandler.java         | 18 +++++++++---------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java
index ec6dab3c0..52618801c 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/TransformationUpGradeHandler.java
@@ -63,7 +63,7 @@ public class TransformationUpGradeHandler extends BaseHandler<HeroInfoProto.Tran
             }
             int[][] costItem = {{curConfig.getExp()[0], curConfig.getExp()[1]}};
             if (!ItemUtil.itemCost(user, costItem, BIReason.TRANSFORMATION_CARD_LEVEL_COST, 1)) {
-                return;
+                throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
             }
             info.setLevel(info.getLevel() + 1);
             user.getHeroManager().putTransformationList(info);
@@ -89,21 +89,17 @@ public class TransformationUpGradeHandler extends BaseHandler<HeroInfoProto.Tran
                 num = changingCard.getStarUpCost()[info.getStar()][1];
                 quantity = changingCard.getStarUpCost()[info.getStar()][0];
             }
-            for(Object itemId:costMap.keySet().toArray()){
-                int itemid = (int)itemId;
-                SItem sItem = SItem.getsItemMap().get(itemid);
+            for (Integer itemId : costMap.keySet()) {
+                SItem sItem = SItem.getsItemMap().get(itemId);
                 if(sItem == null || sItem.getQuantity() != quantity){
-                    MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.TransformationUpGradeResponse.getNumber(), builder.build(), true);
-                    return;
+                    throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
                 }
             }
-            if(costMap.values().stream().mapToInt(Integer::intValue).sum() != num ){
-                MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.TransformationUpGradeResponse.getNumber(), builder.build(), true);
-                return;
+            if(costMap.values().size() < num){
+                throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
             }
             if (!ItemUtil.itemCost(user, costMap, BIReason.TRANSFORMATION_CARD_STAR_COST, 1)) {
-                MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.TransformationUpGradeResponse.getNumber(), builder.build(), true);
-                return;
+                throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
             }
             if (info != null) {
                 info.setStar(info.getStar() + 1);
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java
index 0cde5257d..ee8f8f76c 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/transformation/UpOrDownTransformationHandler.java
@@ -69,23 +69,23 @@ public class UpOrDownTransformationHandler extends BaseHandler<HeroInfoProto.UpO
             info.setIndex(index);
         }
         else {
-            // 激活变身卡需要消耗道具
+            // 激活变身卡
             if (info == null){
                 int[][] costItem = {{changingCard.getCardId(),1}};
-                ItemUtil.itemCost(user,costItem, BIReason.TRANSFORMATION_CARD_COST,1);
-            }
-            // 激活或者卸下变身卡
-            if(info == null){
+                boolean cost = ItemUtil.itemCost(user, costItem, BIReason.TRANSFORMATION_CARD_COST, 1);
+                if (!cost){
+                    throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH,"激活变身卡道具不足");
+                }
                 info = new TransformationInfo(id, 0, 0);
                 info.setLevel(1);
                 info.setStar(0);
                 //激活给变身之力
-                CommonProto.Drop.Builder drop = CommonProto.Drop.newBuilder();
                 int[][] dropItem = {changingCard.getExp()};
-
-                ItemUtil.drop(user, dropItem, drop, BIReason.TRANSFORMATION_CARD_ACTIVATION);
+                CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItem, BIReason.TRANSFORMATION_CARD_ACTIVATION);
                 builder.setDrop(drop);
-            }else {
+            }
+            // 卸下变身卡
+            else {
                 info.setStatus(0);
                 info.setIndex(0);
             }