From f16ee71a54bf8f903bee0b22b9dee728d5996abc Mon Sep 17 00:00:00 2001
From: lvxinran <lvxinran1997@163.com>
Date: Fri, 6 Sep 2019 20:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ljsd/jieling/util/ItemUtil.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
index 6e652f6a7..f95da210d 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
@@ -734,6 +734,7 @@ public class ItemUtil {
         }
         StringBuilder reward = new StringBuilder();
         List<CommonProto.Equip> equipList = new CopyOnWriteArrayList<>();
+        List<CommonProto.Equip> especialEquip = new CopyOnWriteArrayList<>();
         for (Map.Entry<Integer, Integer> entry : equipMap.entrySet()) {
             int count = entry.getValue();
             for (int i = 0; i < count; i++) {
@@ -745,7 +746,7 @@ public class ItemUtil {
                     }
                     continue;
                 }
-                addEquip(user, entry.getKey(), equipList);
+                addEquip(user, entry.getKey(), equipList,especialEquip);
                 KtEventUtils.onKtEvent(user, ParamEventBean.UserItemEvent,reason,GlobalsDef.addReason,entry.getKey(),1,-1);
             }
         }
@@ -755,6 +756,7 @@ public class ItemUtil {
             MailLogic.getInstance().sendMail(user.getId(), title, content, reward.toString(), nowTime, Global.MAIL_EFFECTIVE_TIME);
         }
         dropBuilder.addAllEquipId(equipList);
+        dropBuilder.addAllEspecialEquipId(especialEquip);
     }
 
     private static String getLimitReward(Map<Integer, Integer> equipMap) {
@@ -771,7 +773,7 @@ public class ItemUtil {
         return reward.toString();
     }
 
-    private static void addEquip(User user,int equipId ,List<CommonProto.Equip> equipList) throws Exception {
+    private static void addEquip(User user,int equipId ,List<CommonProto.Equip> equipList,List<CommonProto.Equip> especialEquipList) throws Exception {
         EquipManager equipManager = user.getEquipManager();
         int itemType = SItem.getsItemMap().get(equipId).getItemType();
         if(itemType==GlobalItemType.EQUIP){
@@ -786,6 +788,7 @@ public class ItemUtil {
             }
         }else if(itemType==GlobalItemType.ESPECIAL_EQUIP){
             EspecialEquip especialEquip = new EspecialEquip(user.getId(),equipId);
+            especialEquipList.add(CBean2Proto.getEquipProto(especialEquip));
             equipManager.addEspecialEquip(user,especialEquip);
         }