fix map mission cal

back_recharge
wangyuan 2019-11-25 17:29:11 +08:00
parent 3785d4c2f1
commit f4f4b87dc7
3 changed files with 17 additions and 10 deletions

View File

@ -57,7 +57,6 @@ public class CumulationData {
private int consumeGem ;
private Map<Integer,Integer> storyFightInfo =new HashMap<>(3);
private BitSet exploreFight = new BitSet(512);
public int buyGoldTimes; // 买金币次数
public int buyStaminaTimes; // 买金币次数
@ -256,9 +255,6 @@ public class CumulationData {
return sEquipQualityCount;
}
public void addExploreFight(int exploreFigtId){
exploreFight.set(exploreFigtId);
}
public void setStoryFightInfo(Map<Integer, Integer> storyFightInfo) {
this.storyFightInfo = storyFightInfo;
@ -267,8 +263,4 @@ public class CumulationData {
public Map<Integer, Integer> getStoryFightInfo() {
return storyFightInfo;
}
public BitSet getExploreFight() {
return exploreFight;
}
}

View File

@ -456,7 +456,18 @@ public class MissionLoigc {
}
break;
case GENERAL_STORY_PASS:
count = cumulationData.getExploreFight().get(missionSubType[0])?1:0;
Map<Integer, CrossInfo> crossInfoGenMap = user.getMapManager().getCrossInfoMap();
for(Map.Entry<Integer,CrossInfo> item : crossInfoGenMap.entrySet()){
CrossInfo value = item.getValue();
if(value.getStars().contains(MapLogic.STAR_1)){
Integer fightId = item.getKey();
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId);
if(sChallengeConfig.getType() == 1 && sChallengeConfig.getMapId() == missionSubType[0]){
count++;
break;
}
}
}
break;
case HERO_STORY_PASS:
Map<Integer, CrossInfo> crossInfoMap = user.getMapManager().getCrossInfoMap();
@ -467,6 +478,7 @@ public class MissionLoigc {
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId);
if(sChallengeConfig.getType() == 3 && sChallengeConfig.getDifficultType() == missionSubType[0] && sChallengeConfig.getMapId() == missionSubType[1]){
count++;
break;
}
}
}

View File

@ -26,7 +26,10 @@ public class FightDataManager implements BaseDataManager{
data.heroStoryTimes+=fightTimes;
result = new CumulationData.Result(missionType);
}else if(missionType == MissionType.GENERAL_STORY_PASS){
data.addExploreFight(fightId);
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId);
if(sChallengeConfig.getType() == 1){
result = new CumulationData.Result(missionType);
}
result = new CumulationData.Result(missionType);
}else if(missionType == MissionType.HERO_STORY_PASS){
SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(fightId);