关卡：特技表更新冲突修复

shared/resource/jsons/dic_zyz_map_terrain.json

@@ -203,7 +203,7 @@
         "mapid": 26,
         "name": "箭塔",
         "seid": "60260&",
-        "description": "很平常的祭坛",
+        "description": "便于弓箭手驻扎的箭塔",
         "spine": "jianta",
         "transparent": 1
     },
@@ -750,11 +750,6 @@
         "description": "敌军占据的兵营",
         "spine": "bingying_red",
         "transparent": 1
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> Stashed changes
     },
     {
         "mapid": 95,
@@ -771,14 +766,11 @@
         "description": "吊桥",
         "spine": "diaoqiao_open",
         "transparent": 1
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
     },
     {
         "mapid": 97,
         "name": "平原（恢复）",
-        "seid": "73021&",
+        "seid": "60971&",
         "description": "很平常的平原",
         "spine": "&",
         "transparent": 1
@@ -786,7 +778,7 @@
     {
         "mapid": 98,
         "name": "箭塔（防御）",
-        "seid": "73031&",
+        "seid": "60981&",
         "description": "防御性很好的箭塔",
         "spine": "jianta",
         "transparent": 1
@@ -794,7 +786,7 @@
     {
         "mapid": 99,
         "name": "树林（策攻）",
-        "seid": "73041&",
+        "seid": "60991&",
         "description": "很平常的树林",
         "spine": "&",
         "transparent": 1
@@ -802,10 +794,25 @@
     {
         "mapid": 100,
         "name": "高地箭塔（远射）",
-        "seid": "73051&",
+        "seid": "61001&",
         "description": "射程很远的箭塔",
         "spine": "jianta",
         "transparent": 1
->>>>>>> Stashed changes
+    },
+    {
+        "mapid": 101,
+        "name": "医疗帐篷",
+        "seid": "61011&",
+        "description": "为医生提供便利的帐篷",
+        "spine": "yiliaozhangpeng",
+        "transparent": 1
+    },
+    {
+        "mapid": 102,
+        "name": "观星台",
+        "seid": "61021&",
+        "description": "便于策士发挥实力的观星台",
+        "spine": "guanxingtai",
+        "transparent": 1
     }
 ]