From 6d25ccf7d7a582ab861e4b9dc0a38cb6cbf21588 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 16 六月 2023 09:43:44 +0800
Subject: [PATCH] 提升机状态读取

---
 src/main/java/com/zy/common/utils/NavigateSolution.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 89046a8..acb56a2 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -21,10 +21,13 @@
         this.map = data;
     }
 
-    public NavigateSolution(String mapType) {
-        //杞藉叆鍦板浘
-        NavigateMapData mapData = new NavigateMapData();
-        int[][] data = mapData.getData(mapType);
+    public NavigateSolution(Integer mapType,Integer lev) {
+        //杞藉叆鍦板浘鎸囧畾灞傞珮鍦板浘
+        NavigateMapData mapData = new NavigateMapData(lev);
+        int[][] data = mapData.getDataFromRedis(mapType);
+        if (data == null) {
+            data = mapData.getData(mapType);
+        }
         this.map = data;
     }
 
@@ -135,8 +138,8 @@
             }
         }
 
-        if (map[x][y] == 0 || map[x][y] == 3) {
-            //瀛愯建鍜屾瘝杞ㄦ墠鑳借繘琛屼笂涓嬬Щ鍔�
+        if (map[x][y] == 0 || map[x][y] == 3 || map[x][y] == 4 || map[x][y] == 5) {
+            //瀛愯建鍜屾瘝杞ㄣ�佽緭閫佺嚎銆佸厖鐢垫々鎵嶈兘杩涜涓婁笅绉诲姩
             if (is_valid(x + 1, y))
             {
                 NavigateNode node = new NavigateNode(x + 1, y);

--
Gitblit v1.9.1