diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java index afe4949ba..77bb0262e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java @@ -902,45 +902,38 @@ public class ItemLogic { int type = SComposeActivity.getTypeById(activityId,equipId); if(type == -1){ LOGGER.error("type找不到配置,活动id:{},装备id:{}",activityId,equipId); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.CFG_NULL); } SComposeBook config = SComposeBook.getBookById(type,equipId); if(config == null){ LOGGER.error("config找不到配置,type:{},装备id:{}",type,equipId); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.CFG_NULL); } - int[] itemC = config.getNeedCost(); - if(itemC[0] != itemId || itemC[1] != itemNum){ + int[][] itemC = config.getNeedCost(); + if(itemC[0][0] != itemId || itemC[0][1] != itemNum){ LOGGER.error("itemCost不匹配,item:{},num:{},conItem:{},conNum:{}",itemId,itemNum,itemC[0],itemC[1]); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.CFG_NULL); } ActivityMission misson = user.getActivityManager().getActivityMissionMap().get(activityId); if(misson == null){ LOGGER.error("misson为空,activityId:{}",activityId); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } ActivityProgressInfo progress = misson.getActivityMissionMap().get(type); if(progress == null){ LOGGER.error("progress为空,type:{}",type); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } if(progress.getProgrss() <= 0){ LOGGER.error("progress次数不足,num:{}",progress.getProgrss()); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT); } boolean itemCost = ItemUtil.itemCost(user, new int[][]{{equipId, 1},{itemId, itemNum}}, BIReason.EQUIP_UPLEVEL_COST, equipId); if(!itemCost){ LOGGER.error("item不足,equipId:{},itemId:{},itemNum:{}",equipId,itemId,itemNum); - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - CommonProto.Drop.Builder drop = ItemUtil.drop(user,new int[][]{{config.getGoalItems()[0],config.getGoalItems()[1]}},BIReason.EQUIP_UPLEVEL_REWARD); + CommonProto.Drop.Builder drop = ItemUtil.drop(user,new int[][]{{config.getGoalItems()[0][0],config.getGoalItems()[0][1]}},BIReason.EQUIP_UPLEVEL_REWARD); response.setResult(true); response.setDrop(drop); MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true);