From 4b86edcecbf424b53a82e1a6d43208ab42e87ed5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 29 Apr 2019 16:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A0=A1=E9=AA=8C=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/Equip.java | 4 ++++ .../main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java index 660835f7c..c9347e1dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java @@ -120,6 +120,10 @@ public class Equip extends MongoBase { for(Map.Entry item : result.entrySet()){ int propertyId = item.getKey(); int value = item.getValue(); + if(propertyValueByIdMap.containsKey(propertyId)){ + propertyValueByIdMap.put(propertyId,propertyValueByIdMap.get(propertyId)+value); + continue; + } if(secondValueByIdMap.containsKey(propertyId)){ secondValueByIdMap.put(propertyId,secondValueByIdMap.get(propertyId)+value); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index f587a7a4e..5d7862219 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -250,9 +250,8 @@ public class WorkShopLogic { User user = UserManager.getUser(uid); SWorkShopEquipmentConfig sWorkShopEquipmentConfig = SWorkShopEquipmentConfig.getsWorkShopEquipmentConfigMap().get(equipTid); if(!checkIsUnlock(GlobalsDef.WORK_CREATE_TYPE,sWorkShopEquipmentConfig.getType(),user.getWorkShopController(),sWorkShopEquipmentConfig.getOpenRules())){ - // MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开"); - // return; - LOGGER.error("不匹配"); + MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开"); + return } int runesNum = sWorkShopEquipmentConfig.getRunesNum(); int[][] specialRunes = sWorkShopEquipmentConfig.getSpecialRunes();