diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 82e802f8f..7c06bf51d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -464,7 +464,7 @@ public class MissionLoigc { //tofix zsx BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(missionTypeId)); if(missTypeData instanceof AbstractDataManager){ - return ((AbstractDataManager) missTypeData).getProcess(user,user.getUserMissionManager().getCumulationData(),missionSubType); + return ((AbstractDataManager) missTypeData).getProcess(user,cumulationData,missionSubType); } Integer count =0; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java index 7463bbd20..d192c912c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/RandomAllTypeTimes.java @@ -15,15 +15,15 @@ public class RandomAllTypeTimes extends AbstractDataManager { @Override public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { + int type =(int)parm[0]; + int count =(int)parm[1]; + data.card_random_type.put(0,data.card_random_type.getOrDefault(0, 0)+count); return new CumulationData.Result(missionType); } @Override public boolean isFinish(User user, CumulationData data, int[][] cfgValue, Object... parm) { - double sum = data.card_random_type.entrySet().stream() - .filter(integerIntegerEntry -> integerIntegerEntry.getKey() == 1 || integerIntegerEntry.getKey() == 4 || integerIntegerEntry.getKey() == 5) - .mapToDouble(Map.Entry::getValue).sum(); - return sum>=cfgValue[1][0]; + return data.card_random_type.getOrDefault(0, 0)>=cfgValue[1][0]; } @Override