diff --git a/shared/resource/jsons/dic_zyz_job_walk.json b/shared/resource/jsons/dic_zyz_job_walk.json
index fa40ba23f..9c916ee79 100644
--- a/shared/resource/jsons/dic_zyz_job_walk.json
+++ b/shared/resource/jsons/dic_zyz_job_walk.json
@@ -94,7 +94,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 2,
@@ -191,7 +193,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 3,
@@ -288,7 +292,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 4,
@@ -385,7 +391,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 5,
@@ -482,7 +490,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 6,
@@ -579,7 +589,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 7,
@@ -676,7 +688,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 8,
@@ -773,7 +787,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 9,
@@ -870,7 +886,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 10,
@@ -967,7 +985,9 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     },
     {
         "id": 15,
@@ -1064,6 +1084,8 @@
         "91": 1,
         "92": 1,
         "93": 1,
-        "94": 1
+        "94": 1,
+        "95": 255,
+        "96": 1
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_map_terrain.json b/shared/resource/jsons/dic_zyz_map_terrain.json
index 2df6b1c0a..3e3632a9f 100644
--- a/shared/resource/jsons/dic_zyz_map_terrain.json
+++ b/shared/resource/jsons/dic_zyz_map_terrain.json
@@ -562,7 +562,7 @@
     {
         "mapid": 71,
         "name": "号角",
-        "seid": "60710&",
+        "seid": "60710&60711",
         "description": "我方占据的号角",
         "spine": "haojiao_blue",
         "transparent": 1
@@ -570,7 +570,7 @@
     {
         "mapid": 72,
         "name": "号角",
-        "seid": "60720&",
+        "seid": "60721&60722",
         "description": "无人占据的号角",
         "spine": "haojiao_hui",
         "transparent": 1
@@ -578,7 +578,7 @@
     {
         "mapid": 73,
         "name": "号角",
-        "seid": "60730&",
+        "seid": "60730&60731",
         "description": "敌军占据的号角",
         "spine": "haojiao_red",
         "transparent": 1
@@ -750,5 +750,24 @@
         "description": "敌军占据的兵营",
         "spine": "bingying_red",
         "transparent": 1
+<<<<<<< Updated upstream
+=======
+    },
+    {
+        "mapid": 95,
+        "name": "吊桥(升)",
+        "seid": "&",
+        "description": "升起的吊桥",
+        "spine": "diaoqiao_close",
+        "transparent": 1
+    },
+    {
+        "mapid": 96,
+        "name": "吊桥",
+        "seid": "&",
+        "description": "吊桥",
+        "spine": "diaoqiao_open",
+        "transparent": 1
+>>>>>>> Stashed changes
     }
 ]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_zyz_terrain_eff.json b/shared/resource/jsons/dic_zyz_terrain_eff.json
index 2c421d81f..fc16ef2d2 100644
--- a/shared/resource/jsons/dic_zyz_terrain_eff.json
+++ b/shared/resource/jsons/dic_zyz_terrain_eff.json
@@ -88,6 +88,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 1
     },
     {
@@ -179,6 +187,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 2
     },
     {
@@ -270,6 +286,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 3
     },
     {
@@ -361,6 +385,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 4
     },
     {
@@ -452,6 +484,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 5
     },
     {
@@ -543,6 +583,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 6
     },
     {
@@ -634,6 +682,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 7
     },
     {
@@ -725,6 +781,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 8
     },
     {
@@ -816,6 +880,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 9
     },
     {
@@ -907,6 +979,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 10
     },
     {
@@ -998,6 +1078,14 @@
         "86": 100,
         "87": 100,
         "88": 100,
+        "89": 100,
+        "90": 100,
+        "91": 100,
+        "92": 100,
+        "93": 100,
+        "94": 100,
+        "95": 100,
+        "96": 100,
         "id": 15
     }
 ]
\ No newline at end of file