From 26b004932ae20d7887ffbb62eafa4db2730494c9 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 5 Jul 2021 18:49:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BC=A5=E7=BC=88=E4=B9=8B=E6=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/dao/UserMissionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index bec55bf1a..05ebed227 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -595,7 +595,7 @@ public class UserMissionManager extends MongoBase { if(treasureWeekCumulationData.expeditinoTimes!= 0 && mistyTripCumulationData.expeditinoTimes == 0){ mistyTripCumulationData.expeditinoTimes = treasureWeekCumulationData.expeditinoTimes; } - if(sevenHappyCumulationData.expeditinoTimes!= 0 && sevenHappyCumulationData.expeditinoTimes == 0){ + if(sevenHappyCumulationData.expeditinoTimes!= 0 && mistyTripCumulationData.expeditinoTimes == 0){ mistyTripCumulationData.expeditinoTimes = sevenHappyCumulationData.expeditinoTimes; } From 2ba57b1a4a58f282bd7dc4952fe9bc3fe548a18a Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Mon, 5 Jul 2021 19:33:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8D=E8=87=AA=E5=8A=A8=E6=94=B9=E5=8F=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/mission/main/MistyTripMissionType.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MistyTripMissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MistyTripMissionType.java index 370f41e7d..13f0abd7c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MistyTripMissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/main/MistyTripMissionType.java @@ -6,11 +6,13 @@ import com.ljsd.jieling.logic.dao.CumulationData; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.MissionLoigc; import com.ljsd.jieling.logic.mission.MissionState; +import com.ljsd.jieling.logic.mission.MissionType; import com.ljsd.jieling.logic.mission.data.AbstractDataManager; import com.ljsd.jieling.logic.mission.data.BaseDataManager; import com.ljsd.jieling.logic.mission.data.DataManagerDistributor; import config.SJourneyWithWind; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -30,6 +32,12 @@ public class MistyTripMissionType extends AbstractMissionType{ @Override public void calCumulationDataResult(User user, CumulationData.Result result, List missionStateChangeInfos, CumulationData cumulationData) throws Exception { List sTaskConfigs = SJourneyWithWind.getsTaskConfigByTypeMap(result.subType.getMissionTypeValue()); + if (sTaskConfigs == null) { + if(result.subType == MissionType.LOGIN_TIMES){ + //解决新旧版本 更新状态不自动改变问题 + sTaskConfigs = new ArrayList(SJourneyWithWind.config.values()); + } + } if (sTaskConfigs == null) { return; } From d3425b731f19df6e8de2cc2a919d53b5a781929b Mon Sep 17 00:00:00 2001 From: duhui Date: Tue, 6 Jul 2021 09:30:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BF=83=E6=84=BF=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E6=A6=82=E7=8E=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 7701a87bf..d9979d773 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -450,9 +450,8 @@ public class HeroLogic{ if (map.isEmpty() || weight == 0){ return item; } - - int sum = map.values().stream().mapToInt(Integer::intValue).sum(); - int randomInt = MathUtils.randomInt(sum); + + int randomInt = MathUtils.randomInt(weight); // 遍历权重 for (Map.Entry entry : map.entrySet()) { @@ -476,7 +475,7 @@ public class HeroLogic{ return result; } // 权重递减 - anInt-=entry.getValue(); + randomInt-=entry.getValue(); } return item; }