diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java index a4f69e102..559f73615 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/EspecialStarManager.java @@ -1,15 +1,26 @@ package com.ljsd.jieling.logic.mission.data; +import com.ljsd.jieling.logic.dao.Baubles; import com.ljsd.jieling.logic.dao.CumulationData; +import com.ljsd.jieling.logic.dao.EquipManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.MissionType; -import java.util.Map; +import java.util.HashMap; +import java.util.List; public class EspecialStarManager extends AbstractDataManager { @Override public boolean isFinish(User user, CumulationData data, int[][] cfgValue, Object... parm) { + EquipManager equipManager = user.getEquipManager(); + List baublesList = equipManager.getBaublesList(); + HashMap map = new HashMap<>(); + for (Baubles baubles : baublesList) { + int star = baubles.getLevel() / 10; + map.merge(star,1,Integer::sum); + } + data.setEspecialEquipStar(map); return data.getEspecialEquipStar(cfgValue[0][0]) >= cfgValue[1][0]; } @@ -20,14 +31,6 @@ public class EspecialStarManager extends AbstractDataManager { @Override public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { - int equipStar = ((int) parm[0])/10; - Map especialEquipStar = data.getEspecialEquipStar(); - - if(especialEquipStar.containsKey(equipStar)){ - especialEquipStar.merge(equipStar,1,Integer::sum); - }else{ - especialEquipStar.put(equipStar,1); - } return new CumulationData.Result(missionType); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/UpAllBaublesLvDataManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/UpAllBaublesLvDataManager.java index db0ad39cc..f2ace77ae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/UpAllBaublesLvDataManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/UpAllBaublesLvDataManager.java @@ -26,14 +26,14 @@ public class UpAllBaublesLvDataManager extends AbstractDataManager{ @Override public boolean isFinish(User user,CumulationData data, int[][] cfgValue, Object... parm) { - if(data.getBaubles_all_level() ==cfgValue[1][0]){ + if(data.getBaubles_all_level() == cfgValue[1][0]){ return true; } Map> teamPosForHero = user.getTeamPosManager().getTeamPosForHero(); HeroManager heroManager = user.getHeroManager(); EquipManager equipManager = user.getEquipManager(); for (Map.Entry> entry:teamPosForHero.entrySet()){ - List teamPosHeroInfos =entry.getValue(); + List teamPosHeroInfos = entry.getValue(); if(teamPosHeroInfos.size()!=6){ continue; }