From 4d08e5e0cebe84cc46ff82d5c43c8b7e4f42e340 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 13 May 2019 18:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/item/WorkShopLogic.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 1c038a067..62379cabe 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 @@ -122,7 +122,7 @@ public class WorkShopLogic { return result; } - private boolean checkIsUnlock(int optType,int type,WorkShopController workShopController,int[] openRules){ + private boolean checkIsUnlock(int optType,int type,WorkShopController workShopController,int[] openRules,int functionId){ int openType = openRules[0]; int openParm = openRules[1]; if(openType == GlobalsDef.LEVLE_LOCK){ @@ -140,7 +140,7 @@ public class WorkShopLogic { } if(openType == GlobalsDef.BLUE_LOCK){ List openIds = workShopController.getOpenBlueStateMap().get(optType); - if(openIds == null || !openIds.contains(openParm)){ + if(openIds == null || !openIds.contains(functionId)){ return false; } } @@ -221,7 +221,7 @@ public class WorkShopLogic { int uid = session.getUid(); User user = UserManager.getUser(uid); SWorkShopFoundationConfig sWorkShopFoundationConfig = SWorkShopFoundationConfig.getShopFoundationConfigMap().get(materialId); - if(!checkIsUnlock(GlobalsDef.WORK_BASE_TYPE,sWorkShopFoundationConfig.getType(),user.getWorkShopController(),sWorkShopFoundationConfig.getOpenRules())){ + if(!checkIsUnlock(GlobalsDef.WORK_BASE_TYPE,sWorkShopFoundationConfig.getType(),user.getWorkShopController(),sWorkShopFoundationConfig.getOpenRules(),sWorkShopFoundationConfig.getId())){ MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开"); return; } @@ -252,7 +252,7 @@ public class WorkShopLogic { int uid=session.getUid(); User user = UserManager.getUser(uid); SWorkShopEquipmentConfig sWorkShopEquipmentConfig = SWorkShopEquipmentConfig.getsWorkShopEquipmentConfigMap().get(equipTid); - if(!checkIsUnlock(GlobalsDef.WORK_CREATE_TYPE,sWorkShopEquipmentConfig.getType(),user.getWorkShopController(),sWorkShopEquipmentConfig.getOpenRules())){ + if(!checkIsUnlock(GlobalsDef.WORK_CREATE_TYPE,sWorkShopEquipmentConfig.getType(),user.getWorkShopController(),sWorkShopEquipmentConfig.getOpenRules(),sWorkShopEquipmentConfig.getId())){ MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,"未开"); return; }