优化地图处理冲突

data/MapInfos.json

@@ -30,6 +30,7 @@ null,
 {"id":28,"expanded":false,"name":"实验室","order":53,"parentId":27,"scrollX":935.4,"scrollY":572.4},
 {"id":29,"expanded":false,"name":"渡鸦12345的办公室2F","order":5,"parentId":13,"scrollX":2672.5714285714284,"scrollY":1635.4285714285713},
 {"id":30,"expanded":false,"name":"渡鸦12345的办公室","order":3,"parentId":31,"scrollX":1330.2,"scrollY":1029.6},
+<<<<<<< HEAD
 {"id":31,"expanded":true,"name":"世界地图","order":2,"parentId":1,"scrollX":8344,"scrollY":3128},
 {"id":32,"expanded":true,"name":"宇宙","order":23,"parentId":1,"scrollX":1474.2,"scrollY":1837.1999999999998},
 {"id":33,"expanded":true,"name":"柯伊伯站","order":24,"parentId":32,"scrollX":1490,"scrollY":1744.5},
@@ -54,5 +55,31 @@ null,
 {"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":39,"parentId":51,"scrollX":1637,"scrollY":813.5},
 {"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":40,"parentId":52,"scrollX":1567,"scrollY":542.5},
 {"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":41,"parentId":53,"scrollX":1013,"scrollY":622.5},
+=======
+{"id":31,"expanded":false,"name":"世界地图","order":2,"parentId":1,"scrollX":8344.199999999999,"scrollY":3128.3999999999996},
+{"id":32,"expanded":true,"name":"宇宙","order":23,"parentId":1,"scrollX":1474,"scrollY":1776},
+{"id":33,"expanded":true,"name":"柯伊伯站","order":24,"parentId":32,"scrollX":1954.1999999999998,"scrollY":1920},
+{"id":34,"expanded":true,"name":"豆豆星系","order":25,"parentId":32,"scrollX":935.4,"scrollY":572.4},
+{"id":35,"expanded":true,"name":"豆豆星","order":26,"parentId":34,"scrollX":2439,"scrollY":4640.4},
+{"id":36,"expanded":true,"name":"群星之城","order":28,"parentId":35,"scrollX":1474,"scrollY":902},
+{"id":37,"expanded":false,"name":"迷失森林","order":27,"parentId":35,"scrollX":1536.6,"scrollY":2797.2},
+{"id":38,"expanded":true,"name":"城堡（外观）","order":29,"parentId":36,"scrollX":1042.2,"scrollY":1309.2},
+{"id":39,"expanded":true,"name":"城堡（内部）：2F","order":30,"parentId":38,"scrollX":1543,"scrollY":1028},
+{"id":40,"expanded":false,"name":"装备店","order":31,"parentId":36,"scrollX":935.4,"scrollY":572.4},
+{"id":41,"expanded":false,"name":"世界之门","order":42,"parentId":32,"scrollX":1474.2,"scrollY":1837.1999999999998},
+{"id":42,"expanded":true,"name":"魔王城","order":32,"parentId":35,"scrollX":925.8,"scrollY":867.5999999999999},
+{"id":43,"expanded":false,"name":"控制室","order":43,"parentId":1,"scrollX":1522.2,"scrollY":954},
+{"id":44,"expanded":true,"name":"走廊","order":44,"parentId":43,"scrollX":1543,"scrollY":1432},
+{"id":45,"expanded":false,"name":"走廊","order":45,"parentId":44,"scrollX":928,"scrollY":1384},
+{"id":46,"expanded":true,"name":"魔王城堡：1F","order":33,"parentId":42,"scrollX":1330.2,"scrollY":1248},
+{"id":47,"expanded":true,"name":"魔王城堡：4F","order":34,"parentId":42,"scrollX":1559,"scrollY":954},
+{"id":48,"expanded":false,"name":"装备店","order":35,"parentId":47,"scrollX":1559,"scrollY":954},
+{"id":49,"expanded":false,"name":"物品商店","order":36,"parentId":47,"scrollX":1559,"scrollY":954},
+{"id":50,"expanded":false,"name":"旅馆：1F","order":37,"parentId":47,"scrollX":1559,"scrollY":954},
+{"id":51,"expanded":true,"name":"豆豆主星B","order":38,"parentId":34,"scrollX":1954.1999999999998,"scrollY":2317.2},
+{"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":39,"parentId":51,"scrollX":1522.2,"scrollY":1837.1999999999998},
+{"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":40,"parentId":52,"scrollX":1544,"scrollY":1494},
+{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":41,"parentId":53,"scrollX":1543,"scrollY":1086},
+>>>>>>> 3388e3fc7bdcd6b6f316e56cf8b44788d52c6126
 {"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":21,"parentId":22,"scrollX":994.1999999999999,"scrollY":637.1999999999999}
 ]