Merge remote-tracking branch 'origin/skwcs' into skwcs

野心家

2023-10-09 7ba995f514c6d20a59cc69afa05110110e9b2de5

 src/main/java/com/zy/common/utils/NavigateSolution.java

@@ -22,12 +22,12 @@
        this.map = data;
    }

    public NavigateSolution(Integer mapType, Integer lev, List<int[]> whitePoints) {
    public NavigateSolution(Integer mapType, Integer lev, List<int[]> whitePoints, List<int[]> shuttlePoints) {
        //载入地图指定层高地图
        NavigateMapData mapData = new NavigateMapData(lev);
        int[][] data = mapData.getDataFromRedis(mapType, whitePoints);
        int[][] data = mapData.getDataFromRedis(mapType, whitePoints, shuttlePoints);
        if (data == null) {
            data = mapData.getData(mapType, whitePoints);
            data = mapData.getData(mapType, whitePoints, shuttlePoints);
        }
        this.map = data;
    }