From 7c19af673d797d558dd513a96efa17653163a4b5 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 29 Dec 2021 18:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E5=8A=9F=E8=83=BD1.?= =?UTF-8?q?1.2=E3=80=91=201=E3=80=81=E8=A3=85=E5=A4=87=E5=BC=BA=E5=8C=96?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/home/HomeLogic.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java index 2b4edae9f..5859a9d9f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/home/HomeLogic.java @@ -355,19 +355,16 @@ public class HomeLogic { int newUp = up+1; // 验证配置表 SEquipRankUp oldRankUp = config.get(up); - if (oldRankUp == null){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"突破等级不存在,当前突破等级:"+up); - } - SEquipRankUp equipRankUp = config.get(newUp); - if (equipRankUp == null){ - throw new ErrorCodeException(ErrorCode.LEVE_MAX,"突破等级不存在,新突破等级:"+newUp); + SEquipRankUp newRankUp = config.get(newUp); + if (oldRankUp == null || newRankUp == null){ + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"突破等级不存在,新突破等级:"+newUp); } // 强化等级验证 Map intensifyMap = user.getEquipManager().getEquipIntensifyMap(); Map map = STableManager.getConfig(SEquipStrengthen.class); for (Map.Entry entry : intensifyMap.entrySet()) { Integer level = Optional.ofNullable(map.get(entry.getValue())).map(SEquipStrengthen::getLevel).orElse(0); - if (level < equipRankUp.getLimit()){ + if (level < oldRankUp.getLimit()){ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"强化等级不足,位置:"+entry.getKey()+",当前等级:"+entry.getValue()); } } @@ -376,7 +373,7 @@ public class HomeLogic { if (!cost){ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } - user.getEquipManager().setEquipHomeRankUp(equipRankUp.getid()); + user.getEquipManager().setEquipHomeRankUp(newRankUp.getid()); } // 1-4 装备强化 if (type >= 1 && type <= 4){ @@ -386,25 +383,22 @@ public class HomeLogic { int newId = nowId + 1; // 校验配置表 SEquipStrengthen oldStrengthen = config.get(nowId); - if (oldStrengthen == null){ - throw new ErrorCodeException(ErrorCode.LEVE_MAX,"数据库等级不存在,当前等级:"+nowId); - } SEquipStrengthen newStrengthen = config.get(newId); - if (newStrengthen == null){ + if (oldStrengthen == null || newStrengthen == null){ throw new ErrorCodeException(ErrorCode.LEVE_MAX,"强化等级不存在,位置:"+type+",新等级:"+newId); } // 校验建筑等级 - ArchitectureInfo info = user.getPlayerInfoManager().getArchitectureInfoMap().get(newStrengthen.getLimit()[0]); + ArchitectureInfo info = user.getPlayerInfoManager().getArchitectureInfoMap().get(oldStrengthen.getLimit()[0]); if (info == null){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"建筑未解锁,建筑id:"+newStrengthen.getLimit()[0]); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"建筑未解锁,建筑id:"+oldStrengthen.getLimit()[0]); } SHomeLandLevel landLevel = levelMap.get(info.getId()); - if (landLevel == null || landLevel.getlevel() < newStrengthen.getLimit()[1]){ + if (landLevel == null || landLevel.getlevel() < oldStrengthen.getLimit()[1]){ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"建筑等级不足,位置:"+type+",新等级:"+newId); } // 校验突破等级 int homeRankUp = user.getEquipManager().getEquipHomeRankUp(); - if (newStrengthen.getLimit2() > homeRankUp){ + if (oldStrengthen.getLimit2() > homeRankUp){ throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"突破等级不足,位置:"+type+",当前突破等级:"+homeRankUp); } // 校验并消耗