From 312ad1cd588051b38c31493931543bb3cfda5f2a Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 13 Dec 2021 12:04:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/map/JourneyMap.java | 3 +++ .../com/ljsd/jieling/handler/map/MapLogic.java | 15 ++++++++++++--- .../com/ljsd/jieling/handler/map/MapManager.java | 11 +++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java index 47a2113c6..a1eee8a26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/JourneyMap.java @@ -147,6 +147,7 @@ public class JourneyMap { .setFirst(v.isFirstPass()?1:0) .build(); response.addInfos(info); + response.setFinishNum(user.getMapManager().getJourneyFinishNum()); }); MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); } @@ -468,6 +469,8 @@ public class JourneyMap { // 逍遥游最终奖励埋点 if (pathType == 7){ ReportUtil.onReportEvent(user, ReportEventEnum.COMPLETE_TRAVEL.getType(), pathType, mapId); + int finishNum=user.getMapManager().getJourneyFinishNum()+1; + user.getMapManager().setJourneyFinishNum(finishNum); } } 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 18abb6334..ab3df9191 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 @@ -2170,9 +2170,18 @@ public class MapLogic { case 4: { int num = 0; Map equipConfig = STableManager.getConfig(SEquipConfig.class); - for (Map.Entry entry : user.getItemManager().getEquipBookMap().entrySet()) { - if (equipConfig.get(entry.getKey()).getStar() >= ints[1]) { - num++; + for (Map.Entry equipEntry : user.getItemManager().getItemMap().entrySet()) { + if (SItem.getsItemMap().get(equipEntry.getKey()).getItemType() == 3) { + if (equipConfig.get(equipEntry.getKey()).getStar() >= ints[1]) { + num+=equipEntry.getValue().getItemNum(); + } + } + } + for (Map.Entry stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) { + for (Map.Entry entry : stringHeroEntry.getValue().getEquipByPositionMap().entrySet()) { + if (equipConfig.get(entry.getValue()).getStar() >= ints[1]) { + num++; + } } } if (num < ints[2]) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 19cc239ea..499a3bf6f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -122,6 +122,8 @@ public class MapManager extends MongoBase { private Map journeyInfo = new HashMap<>(); + private int journeyFinishNum;//逍遥游通关次数 + private int currentJourneyId; private EndlessTreasureReward endlessTreasureReward = new EndlessTreasureReward(); @@ -878,6 +880,15 @@ public class MapManager extends MongoBase { updateString("journeyInfo",journeyInfo); } + public int getJourneyFinishNum() { + return journeyFinishNum; + } + + public void setJourneyFinishNum(int journeyFinishNum) { + this.journeyFinishNum = journeyFinishNum; + updateString("journeyFinishNum",journeyFinishNum); + } + public int getCurrentJourneyId() { return currentJourneyId; } From ce6b4d239bee4c5354ff21cf82ca0ba9e8e5f644 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 13 Dec 2021 14:55:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=B3=E5=8D=A1=E9=99=90=E5=88=B6?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 3 +++ 1 file changed, 3 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 ab3df9191..8caa42a79 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 @@ -2200,6 +2200,9 @@ public class MapLogic { for (Map.Entry stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) { if (stringHeroEntry.getValue().getOriginalLevel()>= ints[1]) { num++; + if (num >= ints[2]) { + break; + } } } if (num < ints[2]) {