冲突处理

project/data.js

@@ -68,7 +68,6 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"tilesets": [
 			"magictower.png",
-<<<<<<< HEAD
 			"5.png",
 			"4.png",
 			"3.png",
@@ -76,22 +75,29 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 			"1.png",
 			"11.png",
 			"6.png",
-			"12.png"
+			"12.png",
-=======
 			"Outside_B.png",
 			"C4.png",
 			"C3.png",
 			"C2.png",
-			"C1.png"
+			"C1.png",
->>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
+			"IconSet.png",
+			"9.png",
+			"8.png",
+			"7.png",
+			"10.png"
 		],
 		"animates": [
 			"hand",
+			"jianji",
 			"sword",
+			"thunder",
+			"yongchang",
 			"zone"
 		],
 		"bgms": [
-			"bgm.mp3"
+			"Asphodelus_Ceui.mp3",
+			"theme.mp3"
 		],
 		"sounds": [
 			"attack.mp3",

project/icons.js

@@ -280,12 +280,9 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 =
 		"autotile2": 0,
 		"autotile3": 0,
 		"autotile4": 0,
-<<<<<<< HEAD
 		"autotile8": 0,
 		"autotile9": 0,
-		"autotile10": 0
+		"autotile10": 0,
-=======
 		"autotile5": 0
->>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
 	}
 }

project/maps.js

@@ -106,13 +106,9 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
 	"137": {"cls":"npcs","id":"greenMan"},
 	"138": {"cls":"npcs","id":"blueTrader"},
 	"140": {"cls":"autotile","id":"autotile4"},
-<<<<<<< HEAD
 	"141": {"cls":"autotile","id":"autotile8"},
 	"142": {"cls":"autotile","id":"autotile9"},
 	"143": {"cls":"autotile","id":"autotile10"},
-=======
-	"141": {"cls":"autotile","id":"autotile5"},
->>>>>>> c231be42bfd5ed9860a83961156fbd923e2a2434
 	"151": {"cls":"autotile","id":"autotile1"},
 	"152": {"cls":"autotile","id":"autotile2"},
 	"153": {"cls":"autotile","id":"autotile3"},