From fed5fcf59b9bb3c22633188285a684bed51229ba Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 27 Dec 2021 14:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E5=8A=9F=E8=83=BD1.?= =?UTF-8?q?0.4=E3=80=91=E6=97=A5=E5=BF=97=E5=AE=8C=E5=96=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/home/HomeLogic.java | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 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 2e916a32b..aaab2953d 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 @@ -65,12 +65,12 @@ public class HomeLogic { // 建筑信息验证 ArchitectureInfo info = user.getPlayerInfoManager().getArchitectureInfoMap().get(id); if (info == null) { - LOGGER.error("浮生门,玩家信息,建筑id不存在:{}", id); + LOGGER.error("浮生门建筑升级,数据库内找不到建筑poolId:{}", id); continue; } SHomeLandLevel landLevel = config.get(info.getId()); if (landLevel == null){ - LOGGER.error("浮生门,表信息,建筑id不存在:{}", info.getId()); + LOGGER.error("浮生门建筑升级,策划表内找不到建筑levelId:{}", info.getId()); continue; } //升级前置条件 @@ -78,26 +78,26 @@ public class HomeLogic { if (rule != null){ ArchitectureInfo info1 = user.getPlayerInfoManager().getArchitectureInfoMap().get(rule[0]); if (info1 == null){ - LOGGER.error("浮生门,前置建筑未解锁,升级的建筑:{},前置建筑:{}",id,rule[0]); + LOGGER.error("浮生门建筑升级,前置建筑未解锁,升级建筑levelId:{},前置建筑poolId:{}",id,rule[0]); continue; } int level = Optional.ofNullable(config.get(info1.getId())).map(SHomeLandLevel::getlevel).orElse(0); if (level < rule[1]){ - LOGGER.error("浮生门,前置建筑等级不足,升级的建筑:{},前置建筑等级:{}",id,level); + LOGGER.error("浮生门建筑升级,前置建筑等级不足,升级建筑levelId:{},前置建筑levelId:{}",id,info1.getId()); continue; } } // 最高等级 int maxId = config.values().stream().filter(v->v.getPoolID()==landLevel.getPoolID()).mapToInt(SHomeLandLevel::getlevel).max().orElse(0); if (info.getId() == maxId) { - LOGGER.error("浮生门,建筑等级最高,id:{}", info.getId()); + LOGGER.error("浮生门建筑升级,建筑等级最高,id:{}", info.getId()); continue; } // 需要消耗的道具 int[][] items = landLevel.getCost(); boolean cost = ItemUtil.checkCostLong(user, items, 1); if (!cost) { - LOGGER.error("浮生门,建筑升级要求道具不足,id:{}", info.getId()); + LOGGER.error("浮生门建筑升级,建筑升级要求道具不足,建筑levelId:{},道具要求:{}", info.getId(),Arrays.toString(items)); continue; } // 普通升级 @@ -136,7 +136,7 @@ public class HomeLogic { int[][] cost1 = {{Integer.parseInt(stringValue[1]), (int) count}}; boolean itemCost = ItemUtil.itemCost(user, cost1, BIReason.ARCHITECTURE_IMMEDIATELY_UP_LEVEL, 0); if (!itemCost){ - LOGGER.error("浮生门,立刻升级失败,道具不足,id:{}", info.getId()); + LOGGER.error("浮生门建筑升级,立刻升级失败,道具不足,建筑levelId:{},道具要求:{}", info.getId(),Arrays.toString(cost1)); continue; } } @@ -200,7 +200,7 @@ public class HomeLogic { else { ArchitectureInfo info = infoMap.get(poolId); if (info == null){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"当前玩家未解锁改建筑,id:"+poolId); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"当前玩家未解锁改建筑,poolId:"+poolId); } oneArchitectureEarnings(user,info,nowInt,drop); } @@ -220,13 +220,13 @@ public class HomeLogic { Map config = STableManager.getConfig(SHomeLandLevel.class); SHomeLandLevel homeLandLevel = config.get(info.getId()); if (homeLandLevel == null) { - LOGGER.error("建筑收获,表id不存,id:{}", info.getId()); + LOGGER.error("建筑收获,策划表id找不到,levelId:{}", info.getId()); return; } Map homeLandMap = STableManager.getConfig(SHomeLand.class); SHomeLand sHomeLand = homeLandMap.get(homeLandLevel.getPoolID()); if (sHomeLand == null || sHomeLand.getType() == 2){ - LOGGER.error("功能类建筑不能收获,id:{}", info.getId()); + LOGGER.error("建筑收获,功能类建筑不能收获,levelId:{}", info.getId()); return; } // 收益时间/分 @@ -243,7 +243,7 @@ public class HomeLogic { // 获取已获得的数量 long itemNum = Optional.ofNullable(user.getItemManager().getItem(itemId)).map(Item::getItemNum).orElse(0L); if (totalMax != 0 && itemNum >= totalMax) { - LOGGER.error("家园资源物品到达上限,id:{}", itemId); + LOGGER.error("建筑收获,家园资源物品到达上限,levelId:{},道具id:{},道具数量:{}",info.getId(),itemId,itemNum); return; } // 可领取的数量,总上限 @@ -274,7 +274,7 @@ public class HomeLogic { */ private void oneLandEarnings(User user, LandInfo info, int nowInt, CommonProto.Drop.Builder drop) throws Exception { if (info.getEndTime() > nowInt || info.getEndTime() == 0){ - LOGGER.error("地块奖励不可领取,id:{}",info.getId()); + LOGGER.error("栖云阁,地块奖励不可领取,地块id:{}",info.getId()); return; } info.setHeroTid(0); @@ -294,7 +294,7 @@ public class HomeLogic { User user = UserManager.getUser(session.getUid()); LandInfo landInfo = user.getPlayerInfoManager().getLandInfoMap().get(proto.getId()); if (landInfo == null){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块未解锁,id:"+proto.getId()); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块未解锁,地块id:"+proto.getId()); } HashSet agos = user.getPlayerInfoManager().getHeroDispatchAgos(); PlayerInfoProto.WanderDispatchResponse.Builder builder = PlayerInfoProto.WanderDispatchResponse.newBuilder(); @@ -303,15 +303,15 @@ public class HomeLogic { // 普通派遣 if (type == 1){ if (landInfo.getEndTime() != 0){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块已存在派遣英雄,id:"+proto.getId()); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块已存在派遣英雄,地块id:"+proto.getId()); } if (agos.contains(proto.getHeroTid())){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"一个英雄一天只能派遣一次,id:"+proto.getHeroTid()); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"一个英雄一天只能派遣一次,heroTid:"+proto.getHeroTid()); } // 验证特权次数 boolean countBol = PlayerLogic.getInstance().checkAndUpdate(user, proto.getPrivilageTypeId(),1); if (!countBol){ - throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT,"次数不足,id:"+proto.getId()); + throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT,"次数不足,地块id:"+proto.getId()); } user.getPlayerInfoManager().addHeroDispatchAgos(proto.getHeroTid()); // TODO: 2021/12/20 派遣时间 @@ -325,15 +325,15 @@ public class HomeLogic { // 立即完成 if (type == 2){ if (landInfo.getEndTime() != 0){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块已存在派遣英雄,id:"+proto.getId()); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"地块已存在派遣英雄,地块id:"+proto.getId()); } if (agos.contains(proto.getHeroTid())){ - throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"一个英雄一天只能派遣一次,id:"+proto.getHeroTid()); + throw new ErrorCodeException(ErrorCode.SERVER_DEFINE,"一个英雄一天只能派遣一次,heroTid:"+proto.getHeroTid()); } // 验证特权次数 boolean countBol = PlayerLogic.getInstance().checkAndUpdate(user, proto.getPrivilageTypeId(),1); if (!countBol){ - throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT,"次数不足,id:"+proto.getId()); + throw new ErrorCodeException(ErrorCode.REFRESH_WHEL_TIME_NOT,"次数不足,地块id:"+proto.getId()); } user.getPlayerInfoManager().addHeroDispatchAgos(proto.getHeroTid()); // TODO: 2021/12/20 奖励