Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
ffeb61578f
|
@ -832,6 +832,9 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
List<SAccomplishmentConfig> sAccomplishmentConfigs = SAccomplishmentConfig.getsAccomplishmentConfigByMapId(mapId);
|
List<SAccomplishmentConfig> sAccomplishmentConfigs = SAccomplishmentConfig.getsAccomplishmentConfigByMapId(mapId);
|
||||||
|
if( sAccomplishmentConfigs == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Map<Integer,Integer> missionProgress = new HashMap<>();
|
Map<Integer,Integer> missionProgress = new HashMap<>();
|
||||||
for(SAccomplishmentConfig sAccomplishmentConfig : sAccomplishmentConfigs){
|
for(SAccomplishmentConfig sAccomplishmentConfig : sAccomplishmentConfigs){
|
||||||
|
@ -849,6 +852,9 @@ public class MapLogic {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
MapMission mapMission = mapManager.getAllMissionProgress().get(mapId);
|
MapMission mapMission = mapManager.getAllMissionProgress().get(mapId);
|
||||||
|
if(mapMission == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
int addScore=0;
|
int addScore=0;
|
||||||
Map<Integer, Integer> allMissionProgress = mapMission.getAllMissionProgress();
|
Map<Integer, Integer> allMissionProgress = mapMission.getAllMissionProgress();
|
||||||
boolean needUpdate = false;
|
boolean needUpdate = false;
|
||||||
|
|
Loading…
Reference in New Issue