回档文件处理冲突

data/MapInfos.json

@@ -33,10 +33,10 @@ null,
 {"id":31,"expanded":true,"name":"世界地图","order":2,"parentId":1,"scrollX":8133.818181818182,"scrollY":2823.2727272727275},
 {"id":32,"expanded":true,"name":"表世界宇宙","order":26,"parentId":1,"scrollX":1589,"scrollY":1615},
 {"id":33,"expanded":true,"name":"柯伊伯站","order":27,"parentId":32,"scrollX":2069,"scrollY":2075},
-{"id":34,"expanded":true,"name":"豆豆星系","order":28,"parentId":32,"scrollX":1170,"scrollY":715.5},
-{"id":35,"expanded":true,"name":"豆豆星","order":29,"parentId":34,"scrollX":4602,"scrollY":2898},
+{"id":34,"expanded":true,"name":"豆豆星系","order":28,"parentId":32,"scrollX":3744,"scrollY":2289.6},
+{"id":35,"expanded":true,"name":"豆豆星","order":29,"parentId":34,"scrollX":3705.6,"scrollY":2899.2},
 {"id":36,"expanded":true,"name":"群星之城","order":30,"parentId":35,"scrollX":1558,"scrollY":1916.5},
-{"id":37,"expanded":false,"name":"测试用的地图","order":54,"parentId":1,"scrollX":819,"scrollY":474.5},
+{"id":37,"expanded":false,"name":"测试用的地图","order":54,"parentId":1,"scrollX":2674.285714285714,"scrollY":1635.4285714285713},
 {"id":38,"expanded":true,"name":"艾瑞姆皇宫","order":31,"parentId":36,"scrollX":3403.636363636364,"scrollY":2081.4545454545455},
 {"id":39,"expanded":true,"name":"艾瑞姆皇宫：1F","order":32,"parentId":38,"scrollX":1157,"scrollY":1693.5},
 {"id":40,"expanded":false,"name":"炼金商店","order":33,"parentId":36,"scrollX":819,"scrollY":474.5},
@@ -48,12 +48,12 @@ null,
 {"id":46,"expanded":true,"name":"魔王城堡：1F","order":39,"parentId":42,"scrollX":1323,"scrollY":1690.5},
 {"id":47,"expanded":true,"name":"魔王城堡：4F","order":40,"parentId":42,"scrollX":772,"scrollY":1107},
 {"id":48,"expanded":false,"name":"装备店","order":41,"parentId":47,"scrollX":811,"scrollY":485.5},
-{"id":49,"expanded":false,"name":"物品商店","order":42,"parentId":47,"scrollX":811,"scrollY":474.5},
+{"id":49,"expanded":false,"name":"物品商店","order":42,"parentId":47,"scrollX":811,"scrollY":485.5},
 {"id":50,"expanded":false,"name":"旅馆：1F","order":43,"parentId":47,"scrollX":819,"scrollY":474.5},
-{"id":51,"expanded":true,"name":"豆豆主星B","order":45,"parentId":34,"scrollX":811,"scrollY":469},
+{"id":51,"expanded":true,"name":"豆豆主星B","order":45,"parentId":34,"scrollX":3744,"scrollY":2289.6},
 {"id":52,"expanded":true,"name":"熔岩洞窟：1F","order":46,"parentId":51,"scrollX":996,"scrollY":1634.5},
 {"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":47,"parentId":52,"scrollX":1637,"scrollY":689.5},
-{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":48,"parentId":53,"scrollX":997,"scrollY":863.5},
+{"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":48,"parentId":53,"scrollX":1544,"scrollY":954},
 {"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":24,"parentId":22,"scrollX":937,"scrollY":732.5},
 {"id":56,"expanded":false,"name":"护甲商店","order":34,"parentId":36,"scrollX":819,"scrollY":474.5},
 {"id":57,"expanded":false,"name":"武器商店","order":35,"parentId":36,"scrollX":819,"scrollY":474.5},
@@ -64,12 +64,11 @@ null,
 {"id":62,"expanded":false,"name":"伊娃之战","order":61,"parentId":15,"scrollX":780,"scrollY":477},
 {"id":63,"expanded":true,"name":"大海（过剧情）","order":19,"parentId":23,"scrollX":811,"scrollY":485.5},
 {"id":64,"expanded":true,"name":"塔纳古斯","order":66,"parentId":14,"scrollX":1148,"scrollY":631.5},
-{"id":65,"expanded":true,"name":"阿拉曼达广场","order":67,"parentId":64,"scrollX":1109,"scrollY":1131.5},
-{"id":66,"expanded":true,"name":"晋升之塔外","order":68,"parentId":65,"scrollX":811,"scrollY":485.5},
+{"id":65,"expanded":true,"name":"阿拉曼达广场","order":67,"parentId":64,"scrollX":1109,"scrollY":1311.5},
+{"id":66,"expanded":true,"name":"晋升之塔外","order":68,"parentId":65,"scrollX":772,"scrollY":483},
 {"id":67,"expanded":true,"name":"晋升之塔","order":69,"parentId":66,"scrollX":811,"scrollY":833.5},
 {"id":68,"expanded":false,"name":"阿拉曼达城墙顶部","order":70,"parentId":65,"scrollX":819,"scrollY":474.5},
 {"id":69,"expanded":false,"name":"物品商店","order":37,"parentId":36,"scrollX":819,"scrollY":474.5},
 {"id":70,"expanded":true,"name":"天文台","order":71,"parentId":64,"scrollX":811,"scrollY":484.5},
-null,
-{"id":72,"expanded":true,"name":"豆豆星海底","order":44,"parentId":35,"scrollX":2228,"scrollY":466.5}
+{"id":71,"expanded":true,"name":"豆豆星海底","order":44,"parentId":35,"scrollX":3705.6,"scrollY":3470.3999999999996}
 ]