容错代码添加,心魔打点修改
parent
2cf701c6eb
commit
40f12ac7b6
|
@ -1779,18 +1779,15 @@ public class MapLogic {
|
||||||
crossInfo.getHeroIds().add(hero.getTemplateId());
|
crossInfo.getHeroIds().add(hero.getTemplateId());
|
||||||
}
|
}
|
||||||
|
|
||||||
List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId());
|
// List<TeamPosForPokenInfo> teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId());
|
||||||
if (teamPosForPokenInfos != null) {
|
// if (teamPosForPokenInfos != null) {
|
||||||
// 异妖
|
// // 异妖
|
||||||
crossInfo.getPokemons().clear();
|
// crossInfo.getPokemons().clear();
|
||||||
for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) {
|
// for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) {
|
||||||
Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId());
|
// Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId());
|
||||||
if (pokemon == null) {
|
//// crossInfo.getPokemons().add(pokemon.getId());
|
||||||
continue;
|
// }
|
||||||
}
|
// }
|
||||||
crossInfo.getPokemons().add(pokemon.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
crossInfo.setForces(heroForces);
|
crossInfo.setForces(heroForces);
|
||||||
SChallengeMapConfig sChallengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(mapManager.getCurMapId());
|
SChallengeMapConfig sChallengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(mapManager.getCurMapId());
|
||||||
|
@ -2373,7 +2370,7 @@ public class MapLogic {
|
||||||
List<Integer> itemNumList = new ArrayList<>();
|
List<Integer> itemNumList = new ArrayList<>();
|
||||||
itemDrop.forEach(item->{
|
itemDrop.forEach(item->{
|
||||||
itemIdList.add(item.getItemId());
|
itemIdList.add(item.getItemId());
|
||||||
itemIdList.add(item.getItemNum());
|
itemNumList.add(item.getItemNum());
|
||||||
});
|
});
|
||||||
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,"成功");
|
ReportUtil.onReportEvent(user,ReportEventEnum.COMPLETE_XINMO.getType(),checkFightId,sFloodConfig.getMonster(),MonsterUtil.getMonsterForce(new int[]{sFloodConfig.getMonster()}),new Date(),"",itemIdList,itemNumList,"成功");
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,14 +72,13 @@ public class EndlessMap extends AbstractMap{
|
||||||
}
|
}
|
||||||
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo();
|
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo();
|
||||||
//是否是新的周期
|
//是否是新的周期
|
||||||
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless);
|
if(endlessMapInfo.getSeason()!=MapLogic.endlessSeason){
|
||||||
if(endlessMapInfo.getSeason()!=openTimeOfFuntionCacheByType.getTimes()){
|
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless);
|
||||||
// StoreLogic.initOnsStoereWithTime(user, SEndlessMapConfig.sEndlessMapConfigMap.get(4001).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
|
// StoreLogic.initOnsStoereWithTime(user, SEndlessMapConfig.sEndlessMapConfigMap.get(4001).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
|
||||||
mapManager.updateEndlessSeason(openTimeOfFuntionCacheByType.getTimes());
|
mapManager.updateEndlessSeason(MapLogic.endlessSeason);
|
||||||
mapManager.updateEndlessMapId(0);
|
mapManager.updateEndlessMapId(0);
|
||||||
mapManager.endlessWalkCellSave(new HashSet<>());
|
mapManager.endlessWalkCellSave(new HashSet<>());
|
||||||
mapManager.endlessMapInfoSave(new HashMap<>());
|
mapManager.endlessMapInfoSave(new HashMap<>());
|
||||||
mapManager.setWalkCells(new HashSet<>());
|
|
||||||
//清除当前副本信息
|
//清除当前副本信息
|
||||||
|
|
||||||
//新创建地图
|
//新创建地图
|
||||||
|
@ -131,6 +130,12 @@ public class EndlessMap extends AbstractMap{
|
||||||
}
|
}
|
||||||
mapManager.setCurMapType(type);
|
mapManager.setCurMapType(type);
|
||||||
// mapEnterResponse.addHeroInfos();
|
// mapEnterResponse.addHeroInfos();
|
||||||
|
//容错代码
|
||||||
|
if(mapManager.getCurXY()==0){
|
||||||
|
SChallengeMapConfig challengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(mapManager.getCurMapId());
|
||||||
|
int xy = CellUtil.xy2Pos(challengeMapConfig.getPosition()[0], challengeMapConfig.getPosition()[1]);
|
||||||
|
mapManager.setCurXY(xy);
|
||||||
|
}
|
||||||
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
||||||
mapEnterResponse.addAllMapList(cells);
|
mapEnterResponse.addAllMapList(cells);
|
||||||
mapEnterResponse.addAllWakeCells(mapManager.getWalkCells() == null ? new ArrayList<>() : mapManager.getWalkCells());
|
mapEnterResponse.addAllWakeCells(mapManager.getWalkCells() == null ? new ArrayList<>() : mapManager.getWalkCells());
|
||||||
|
|
|
@ -145,6 +145,12 @@ public class TowerMap extends AbstractMap {
|
||||||
mapManager.setCurMapId(sTrialConfig.getMapId());
|
mapManager.setCurMapId(sTrialConfig.getMapId());
|
||||||
}
|
}
|
||||||
mapEnterResponse.setMapId(mapManager.getCurMapId());
|
mapEnterResponse.setMapId(mapManager.getCurMapId());
|
||||||
|
if(mapManager.getCurXY()==0){
|
||||||
|
//容错代码
|
||||||
|
SChallengeMapConfig challengeMapConfig = STableManager.getConfig(SChallengeMapConfig.class).get(mapManager.getCurMapId());
|
||||||
|
int xy = CellUtil.xy2Pos(challengeMapConfig.getPosition()[0], challengeMapConfig.getPosition()[1]);
|
||||||
|
mapManager.setCurXY(xy);
|
||||||
|
}
|
||||||
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
mapEnterResponse.setCurXY(mapManager.getCurXY());
|
||||||
// MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder()
|
// MapInfoProto.TowerCopyInfo towerCopyInfo = MapInfoProto.TowerCopyInfo.newBuilder()
|
||||||
// .setTower(mapManager.getTrialInfo().getFloor())
|
// .setTower(mapManager.getTrialInfo().getFloor())
|
||||||
|
|
Loading…
Reference in New Issue