diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java index a03053ad0..9096aabd4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/EspecialEquip.java @@ -12,7 +12,7 @@ public class EspecialEquip extends PropertyItem { super(); super.setId(KeyGenUtils.produceIdByModule(UUIDEnum.ESPECIAL_EQUIP, uid)); super.setEquipId(equipTid); - this.star = 8; + this.star = 3; } public EspecialEquip() { this.setRootCollection(User._COLLECTION_NAME); 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 04efe72df..cc266a753 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -735,6 +735,7 @@ public class ItemUtil { } StringBuilder reward = new StringBuilder(); List equipList = new CopyOnWriteArrayList<>(); + List especialEquip = new CopyOnWriteArrayList<>(); for (Map.Entry entry : equipMap.entrySet()) { int itemType = SItem.getsItemMap().get(entry.getKey()).getItemType(); if(itemType!=GlobalItemType.EQUIP){ @@ -750,7 +751,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); } } @@ -760,6 +761,7 @@ public class ItemUtil { MailLogic.getInstance().sendMail(user.getId(), title, content, reward.toString(), nowTime, Global.MAIL_EFFECTIVE_TIME); } dropBuilder.addAllEquipId(equipList); + dropBuilder.addAllEspecialEquipId(especialEquip); } public static void addSoulEquip(User user, Map equipMap, CommonProto.Drop.Builder dropBuilder,int reason) throws Exception { @@ -794,7 +796,7 @@ public class ItemUtil { return reward.toString(); } - private static void addEquip(User user,int equipId ,List equipList) throws Exception { + private static void addEquip(User user,int equipId ,List equipList,List especialEquipList) throws Exception { EquipManager equipManager = user.getEquipManager(); int itemType = SItem.getsItemMap().get(equipId).getItemType(); if(itemType==GlobalItemType.EQUIP){ @@ -809,6 +811,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); }else if(itemType==GlobalItemType.SOUL_MARK){ SoulEquip soulEquip = new SoulEquip(user.getId(),equipId);