From 17584ff95d8371a80bbdb67a89af032ba18d24f3 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 1 Nov 2021 13:59:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9D=90=E9=AA=91=E7=A2=8E=E7=89=87?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 373a9c912..9c64562c6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -566,6 +566,7 @@ public class ItemUtil { case GlobalItemType.SELECTSecretBox: case GlobalItemType.SpecialMonsterItem: case GlobalItemType.AllPowerful_DogFood: + case 28: itemType = GlobalItemType.ITEM; break; default: From fb5ec8ed1b5cfb6347690144328af91e1c079220 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 8 Nov 2021 01:49:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?yx=E6=8D=A2=E4=B8=80=E6=89=B9log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java index 8f54e3aec..c42227d61 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java @@ -232,15 +232,18 @@ public class CrossYuxulundaoLogic { //需要填充机器人 matchRival.forEach(n->{ arenaRank.add(Integer.valueOf(n.getValue())); }); arenaRank.addAll(SArenaRobotConfig.getSArenaRobotConfigsByRangeAndCount(con.getScoreLow1(),con.getScoreUp1(),5 - matchRival.size())); + arenaRank.forEach(n->{ LOGGER.info("yuxulundao:1 ---"+n.intValue());}); }else{ //随机出五个真人 List matchRivalList = new ArrayList(); matchRival.forEach(n->{matchRivalList.add(n.getValue());}); Collections.shuffle(matchRivalList); matchRivalList.subList(0,5).forEach(n->arenaRank.add(Integer.valueOf(n))); + arenaRank.forEach(n->{ LOGGER.info("yuxulundao:2 ---"+n.intValue());}); } }else{ arenaRank.addAll(SArenaRobotConfig.getSArenaRobotConfigsByRangeAndCount(con.getScoreLow1(),con.getScoreUp1(),5)); + arenaRank.forEach(n->{ LOGGER.info("yuxulundao:3 ---"+n.intValue());}); } //没有高分段机器人 从相近的里面取机器人 if(arenaRank.size() == 0){ @@ -248,6 +251,7 @@ public class CrossYuxulundaoLogic { SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); arenaRank.addAll(SArenaRobotConfig.getSArenaRobotConfigsByRangeAndCount(con.getScoreLow1(),con.getScoreUp1(),5)); if(arenaRank.size()>= 5){ + arenaRank.forEach(n->{ LOGGER.info("yuxulundao:4 ---"+n.intValue());}); break; } } From f1b2737821e2f94d0b1e830b34b84363b3b4990c Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 2 Nov 2021 14:41:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93?= =?UTF-8?q?=E6=8D=A2=E4=B8=80=E6=89=B9log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java index c42227d61..0a5ab4798 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java @@ -227,6 +227,9 @@ public class CrossYuxulundaoLogic { Set> matchRival= RedisUtil.getInstence().getZsetRangeWithScores(RedisKey.CROSS_YUXULUNDAO_RANK_PERSON, Integer.toString(crossGroup),con.getScoreLow1(),con.getScoreUp1()); matchRival = matchRival.stream().filter(n->Integer.valueOf(n.getValue())!=user.getId()).collect(Collectors.toSet()); + LOGGER.info("yuxulundao player ID range from:"+con.getScoreLow1()+" to:"+con.getScoreUp1()); + LOGGER.info("yuxulundao player num "+ matchRival.size()); + LOGGER.info("yuxulundao player configid: "+ con.getId()+"redis score:"+myQuery.getCrossYuxulundaoNewScore()); if(matchRival.size() >0){ if(matchRival.size()<5){ //需要填充机器人 From 3a9f5a5777e156220df0e31fe3d17b21c4746b91 Mon Sep 17 00:00:00 2001 From: duhui Date: Thu, 4 Nov 2021 16:17:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 8ac3c8adb0058e0d37c28e0785e9a2cded32629e) --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 17ac2382a..8b40be5e7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -719,7 +719,9 @@ public class MapLogic { mapManager.setLastXY(lastXY); if(mapManager.getCurMapType()==2){ Item item = user.getItemManager().getItemMap().get(1); + LOGGER.info("^^^^^^^^玩家:{},无尽副本[行动力]消耗前:{},消耗数量:{}",uid,item.getItemNum(),cells.size()); ItemUtil.itemCost(user,new int[][]{{1,Math.min((int)item.getItemNum(),cells.size())}},BIReason.ENDLESS_CONSUME_EXECUTION,1); + LOGGER.info("^^^^^^^^玩家:{},无尽副本[行动力]消耗后:{}",uid,Optional.ofNullable(user.getItemManager().getItemMap().get(1)).map(Item::getItemNum).orElse(0L)); Set openCells = getOpenCells(mapManager.getCurMapId(),cells); mapManager.addEndlessOpenCell(openCells); Set walkCells = mapManager.getEndlessMapInfo().getOpenCell(); From 04c1840d881d77db128808bf6b9641205b87730e Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 10 Nov 2021 09:54:22 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit df45247e5f98dd253a9b8a1a55aee42ff2ffc07f) --- .../main/java/com/ljsd/jieling/logic/dao/UserManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 0508e1b34..ec63c796b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -234,11 +234,7 @@ public class UserManager { public static User getUserNotCache(int uid) { try { - User user = userMap.get(uid); - if (user != null) { - return user; - } - return MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), uid, User.class); + return getUserInMem(uid); }catch (Exception e){ LOGGER.error("UserManager::getUser:{} null, exception:{}",uid,e.getMessage()); } From bdd561d75f4186a0615b0adb9c7b2c329cdff056 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 10 Nov 2021 14:12:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E8=BE=BE=E4=BA=BA=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/ExpectRankActivity.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 308bf1564..5f3213721 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -36,6 +36,33 @@ class ExpectRankActivity extends AbstractActivity { } @Override + void updateProgressWithUser(User user, ActivityMission activityMission, int count) { + + if(SGlobalActivity.getsGlobalActivityMap().get(id).getType() == 70){ + //森罗幻境特殊处理 + if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ + MapManager mapManager = user.getMapManager(); + TrialInfo trialInfo = mapManager.getTrialInfo(); + //排除神秘关卡 + if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){ + activityMission.setV(trialInfo.getFloor()); + }else if(trialInfo.getFloor()>10000){ + activityMission.setV(trialInfo.getFloor()-10000); + } + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); + }else{ + activityMission.setV(count + activityMission.getV()); + } + }else { + activityMission.setV(count + activityMission.getV()); + if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ +// String key = RedisKey.getKey(RedisKey.EXPERT_RANK, String.valueOf(id), false); +// RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), activityMission.getV()); + RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV()); + } + } + } + /*@Override void updateProgressWithUser(User user, ActivityMission activityMission, int count) { if(SGlobalActivity.getsGlobalActivityMap().get(id).getOpenRanking()==1){ @@ -55,7 +82,7 @@ class ExpectRankActivity extends AbstractActivity { }else{ activityMission.setV(count + activityMission.getV()); } - } + }*/ @Override