Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
commit
f6431e2e0f
|
@ -211,6 +211,8 @@ public class MapLogic {
|
||||||
}
|
}
|
||||||
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo();
|
EndlessMapInfo endlessMapInfo = mapManager.getEndlessMapInfo();
|
||||||
if(endlessMapInfo.getSeason()!=endlessSeason){
|
if(endlessMapInfo.getSeason()!=endlessSeason){
|
||||||
|
//切换赛季清除信息
|
||||||
|
resetEndlessInfo();
|
||||||
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless);
|
TimeControllerOfFunction openTimeOfFuntionCacheByType = GlobalDataManaager.getInstance().getOpenTimeOfFuntionCacheByType(FunctionIdEnum.Endless);
|
||||||
StoreLogic.initOnsStoereWithTime(user,SEndlessMapConfig.sEndlessMapConfigMap.get(endlessMapId).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
|
StoreLogic.initOnsStoereWithTime(user,SEndlessMapConfig.sEndlessMapConfigMap.get(endlessMapId).getMapStoreId(),openTimeOfFuntionCacheByType.getStartTime(),openTimeOfFuntionCacheByType.getEndTime());
|
||||||
mapManager.updateEndlessSeason(endlessSeason);
|
mapManager.updateEndlessSeason(endlessSeason);
|
||||||
|
@ -218,8 +220,6 @@ public class MapLogic {
|
||||||
mapManager.endlessWalkCellSave(new HashSet<>());
|
mapManager.endlessWalkCellSave(new HashSet<>());
|
||||||
mapManager.endlessMapInfoSave(new HashMap<>());
|
mapManager.endlessMapInfoSave(new HashMap<>());
|
||||||
}else{
|
}else{
|
||||||
//切换赛季清除信息
|
|
||||||
resetEndlessInfo();
|
|
||||||
Map<Integer, Cell> endlessMapCellInfo = mapManager.getEndlessMapInfo().getMapInfo();
|
Map<Integer, Cell> endlessMapCellInfo = mapManager.getEndlessMapInfo().getMapInfo();
|
||||||
if(endlessMapCellInfo !=null&&endlessMapCellInfo.size()>0){
|
if(endlessMapCellInfo !=null&&endlessMapCellInfo.size()>0){
|
||||||
mapManager.setMapInfo(endlessMapCellInfo);
|
mapManager.setMapInfo(endlessMapCellInfo);
|
||||||
|
|
Loading…
Reference in New Issue