关卡：吊桥

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
     }
 ]