动画优化

assets/resources/element_spine/JG0104_01/JG0104_01.json

@@ -1,10 +1,10 @@
 {
 "skeleton": {
-	"hash": "1UHWt2vtCr1LpVKy02LhssElr90",
+	"hash": "v/5u7ssNZzScPx34v7fR1tnMhks",
 	"spine": "3.8.99",
-	"x": -32.75,
+	"x": -18,
 	"y": -16.52,
-	"width": 63.39,
+	"width": 36,
 	"height": 66,
 	"images": "./img/",
 	"audio": "E:/AaronChan/森林大冒险/ani/SP/UI动画/门01/img"
@@ -20,13 +20,13 @@
 ],
 "slots": [
 	{ "name": "04", "bone": "root", "attachment": "04" },
-	{ "name": "6", "bone": "5", "attachment": "05" },
+	{ "name": "6", "bone": "5" },
 	{ "name": "01", "bone": "01", "attachment": "01" },
 	{ "name": "2", "bone": "root", "attachment": "2" },
 	{ "name": "03", "bone": "03", "attachment": "03" },
 	{ "name": "02", "bone": "02", "attachment": "02" },
-	{ "name": "5", "bone": "05", "attachment": "05" },
-	{ "name": "7", "bone": "6", "attachment": "05" }
+	{ "name": "5", "bone": "05" },
+	{ "name": "7", "bone": "6" }
 ],
 "skins": [
 	{
@@ -105,6 +105,7 @@
 			},
 			"5": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -120,6 +121,7 @@
 			},
 			"6": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -135,6 +137,7 @@
 			},
 			"7": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -174,6 +177,7 @@
 			},
 			"5": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -189,7 +193,6 @@
 			},
 			"6": {
 				"attachment": [
-					{ "name": null },
 					{ "time": 0.1667, "name": "05" },
 					{ "time": 0.2667, "name": "06" },
 					{ "time": 0.3333, "name": "07" },
@@ -206,6 +209,7 @@
 			},
 			"7": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2667, "name": "08" },

assets/resources/element_spine/JG0104_02/JG0104_02.json

@@ -1,10 +1,10 @@
 {
 "skeleton": {
-	"hash": "ciSFDz++sIvvDIR+4QdiqlJ20oE",
+	"hash": "Dbech3vyl/O5OFGvse/qlJf/oJw",
 	"spine": "3.8.99",
-	"x": -32.26,
+	"x": -18,
 	"y": -16.41,
-	"width": 62.34,
+	"width": 36,
 	"height": 66,
 	"images": "./img/",
 	"audio": "E:/AaronChan/森林大冒险/ani/SP/UI动画/门01/img"
@@ -20,13 +20,13 @@
 ],
 "slots": [
 	{ "name": "04", "bone": "root", "attachment": "04" },
-	{ "name": "6", "bone": "5", "attachment": "05" },
+	{ "name": "6", "bone": "5" },
 	{ "name": "01", "bone": "01", "attachment": "01" },
 	{ "name": "2", "bone": "root", "attachment": "2" },
 	{ "name": "03", "bone": "03", "attachment": "03" },
 	{ "name": "02", "bone": "02", "attachment": "02" },
-	{ "name": "5", "bone": "05", "attachment": "05" },
-	{ "name": "7", "bone": "6", "attachment": "05" }
+	{ "name": "5", "bone": "05" },
+	{ "name": "7", "bone": "6" }
 ],
 "skins": [
 	{
@@ -105,6 +105,7 @@
 			},
 			"5": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.2, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -120,6 +121,7 @@
 			},
 			"6": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.2, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -135,6 +137,7 @@
 			},
 			"7": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.1, "name": "06" },
 					{ "time": 0.2, "name": "07" },
 					{ "time": 0.2667, "name": "08" },
@@ -174,6 +177,7 @@
 			},
 			"5": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.0667, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2333, "name": "08" },
@@ -189,7 +193,6 @@
 			},
 			"6": {
 				"attachment": [
-					{ "name": null },
 					{ "time": 0.1667, "name": "05" },
 					{ "time": 0.2333, "name": "06" },
 					{ "time": 0.3333, "name": "07" },
@@ -206,6 +209,7 @@
 			},
 			"7": {
 				"attachment": [
+					{ "name": "05" },
 					{ "time": 0.0667, "name": "06" },
 					{ "time": 0.1667, "name": "07" },
 					{ "time": 0.2333, "name": "08" },

assets/resources/element_spine/JG0105_01/JG0105_01.json

@@ -1,10 +1,10 @@
 {
 "skeleton": {
-	"hash": "N78IzX8pJ0J4V9JswrWkIN2F5ag",
+	"hash": "DqqBgHWTfKJEx4zN0POligbKC40",
 	"spine": "3.8.99",
-	"x": -39.58,
+	"x": -17,
 	"y": -18.91,
-	"width": 77.92,
+	"width": 34,
 	"height": 77.11,
 	"images": "./img/",
 	"audio": "E:/AaronChan/森林大冒险/ani/SP/UI动画/门01/img"
@@ -19,12 +19,12 @@
 ],
 "slots": [
 	{ "name": "04", "bone": "root", "attachment": "04" },
-	{ "name": "6", "bone": "5", "attachment": "05" },
+	{ "name": "6", "bone": "5" },
 	{ "name": "01", "bone": "01", "attachment": "01" },
 	{ "name": "2", "bone": "root", "attachment": "2" },
 	{ "name": "02", "bone": "03", "attachment": "02" },
-	{ "name": "5", "bone": "05", "attachment": "05" },
-	{ "name": "7", "bone": "6", "attachment": "05" }
+	{ "name": "5", "bone": "05" },
+	{ "name": "7", "bone": "6" }
 ],
 "skins": [
 	{
@@ -106,85 +106,49 @@
 			},
 			"5": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
-					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"6": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
+					{ "time": 0.0667, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2333, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
 					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.5667, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7333, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"7": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
-					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			}
@@ -209,59 +173,60 @@
 			"01": {
 				"attachment": [
 					{ "name": null },
-					{ "time": 0.3333, "name": "01" }
+					{ "time": 1, "name": "01" }
 				]
 			},
 			"02": {
 				"attachment": [
-					{ "time": 0.3333, "name": null }
+					{ "time": 1, "name": null }
 				]
 			},
 			"5": {
 				"attachment": [
-					{ "time": 0.0333, "name": "06" },
-					{ "time": 0.0667, "name": "07" },
-					{ "time": 0.1, "name": "08" },
-					{ "time": 0.1333, "name": "09" },
-					{ "time": 0.1667, "name": "10" },
-					{ "time": 0.2, "name": "11" },
-					{ "time": 0.2333, "name": "12" },
-					{ "time": 0.2667, "name": "13" },
-					{ "time": 0.3, "name": "14" },
-					{ "time": 0.3333, "name": "15" },
-					{ "time": 0.3667, "name": null }
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
+					{ "time": 1, "name": null }
 				]
 			},
 			"6": {
 				"attachment": [
-					{ "name": null },
 					{ "time": 0.0667, "name": "05" },
-					{ "time": 0.1, "name": "06" },
-					{ "time": 0.1333, "name": "07" },
-					{ "time": 0.1667, "name": "08" },
-					{ "time": 0.2, "name": "09" },
-					{ "time": 0.2333, "name": "10" },
-					{ "time": 0.2667, "name": "11" },
-					{ "time": 0.3, "name": "12" },
-					{ "time": 0.3333, "name": "13" },
-					{ "time": 0.3667, "name": "14" },
-					{ "time": 0.4, "name": "15" },
-					{ "time": 0.4333, "name": null }
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2333, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.5667, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7333, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9, "name": "15" },
+					{ "time": 1, "name": null }
 				]
 			},
 			"7": {
 				"attachment": [
-					{ "time": 0.0333, "name": "06" },
-					{ "time": 0.0667, "name": "07" },
-					{ "time": 0.1, "name": "08" },
-					{ "time": 0.1333, "name": "09" },
-					{ "time": 0.1667, "name": "10" },
-					{ "time": 0.2, "name": "11" },
-					{ "time": 0.2333, "name": "12" },
-					{ "time": 0.2667, "name": "13" },
-					{ "time": 0.3, "name": "14" },
-					{ "time": 0.3333, "name": "15" },
-					{ "time": 0.3667, "name": null }
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
+					{ "time": 1, "name": null }
 				]
 			}
 		},
@@ -269,7 +234,7 @@
 			"03": {
 				"translate": [
 					{ "curve": 1, "c4": 0.41 },
-					{ "time": 0.3333, "y": -40.64 }
+					{ "time": 1, "y": -40.64 }
 				]
 			}
 		}

assets/resources/element_spine/JG0105_02/JG0105_02.json

@@ -1,10 +1,10 @@
 {
 "skeleton": {
-	"hash": "vOD+K0OLb0eNS7Ij9ZWzTUV+1eA",
+	"hash": "KF1V6YzMSbBmuTHiVdmz8EPoQoU",
 	"spine": "3.8.99",
-	"x": -39.21,
+	"x": -17,
 	"y": -18.91,
-	"width": 77.14,
+	"width": 34,
 	"height": 77.11,
 	"images": "./img/",
 	"audio": "E:/AaronChan/森林大冒险/ani/SP/UI动画/门01/img"
@@ -19,12 +19,12 @@
 ],
 "slots": [
 	{ "name": "04", "bone": "root", "attachment": "04" },
-	{ "name": "6", "bone": "5", "attachment": "05" },
+	{ "name": "6", "bone": "5" },
 	{ "name": "01", "bone": "01", "attachment": "01" },
 	{ "name": "2", "bone": "root", "attachment": "2" },
 	{ "name": "02", "bone": "03", "attachment": "02" },
-	{ "name": "5", "bone": "05", "attachment": "05" },
-	{ "name": "7", "bone": "6", "attachment": "05" }
+	{ "name": "5", "bone": "05" },
+	{ "name": "7", "bone": "6" }
 ],
 "skins": [
 	{
@@ -106,70 +106,49 @@
 			},
 			"5": {
 				"attachment": [
-					{ "time": 0.1, "name": null },
-					{ "time": 0.1667, "name": "05" },
-					{ "time": 0.2, "name": "06" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
 					{ "time": 0.2667, "name": "07" },
-					{ "time": 0.3, "name": "08" },
-					{ "time": 0.3667, "name": "09" },
-					{ "time": 0.4, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5667, "name": "13" },
-					{ "time": 0.6, "name": "14" },
-					{ "time": 0.6667, "name": "15" },
-					{ "time": 0.7, "name": "05" },
-					{ "time": 0.7667, "name": "06" },
-					{ "time": 0.8, "name": "07" },
-					{ "time": 0.8667, "name": "08" },
-					{ "time": 0.9, "name": "09" },
-					{ "time": 0.9667, "name": "10" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"6": {
 				"attachment": [
-					{ "time": 0.1, "name": null },
-					{ "time": 0.1667, "name": "05" },
-					{ "time": 0.2, "name": "06" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
 					{ "time": 0.2667, "name": "07" },
-					{ "time": 0.3, "name": "08" },
-					{ "time": 0.3667, "name": "09" },
-					{ "time": 0.4, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5667, "name": "13" },
-					{ "time": 0.6, "name": "14" },
-					{ "time": 0.6667, "name": "15" },
-					{ "time": 0.7, "name": "05" },
-					{ "time": 0.7667, "name": "06" },
-					{ "time": 0.8, "name": "07" },
-					{ "time": 0.8667, "name": "08" },
-					{ "time": 0.9, "name": "09" },
-					{ "time": 0.9667, "name": "10" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"7": {
 				"attachment": [
-					{ "time": 0.1, "name": null },
-					{ "time": 0.1667, "name": "05" },
-					{ "time": 0.2, "name": "06" },
-					{ "time": 0.2667, "name": "07" },
-					{ "time": 0.3, "name": "08" },
-					{ "time": 0.3667, "name": "09" },
-					{ "time": 0.4, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5667, "name": "13" },
-					{ "time": 0.6, "name": "14" },
-					{ "time": 0.6667, "name": "15" },
-					{ "time": 0.7, "name": "05" },
-					{ "time": 0.7667, "name": "06" },
-					{ "time": 0.8, "name": "07" },
-					{ "time": 0.8667, "name": "08" },
-					{ "time": 0.9, "name": "09" },
-					{ "time": 0.9667, "name": "10" },
+					{ "time": 0.0667, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2333, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.5667, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7333, "name": "13" },
+					{ "time": 0.8, "name": "14" },
+					{ "time": 0.9, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			}
@@ -204,85 +183,49 @@
 			},
 			"5": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
-					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"6": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
-					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.1, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2667, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
+					{ "time": 0.4333, "name": "09" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.6, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7667, "name": "13" },
+					{ "time": 0.8333, "name": "14" },
+					{ "time": 0.9333, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			},
 			"7": {
 				"attachment": [
-					{ "name": null },
-					{ "time": 0.2667, "name": "05" },
-					{ "time": 0.3, "name": "06" },
-					{ "time": 0.3333, "name": "07" },
-					{ "time": 0.3667, "name": "08" },
+					{ "time": 0.0667, "name": "05" },
+					{ "time": 0.1667, "name": "06" },
+					{ "time": 0.2333, "name": "07" },
+					{ "time": 0.3333, "name": "08" },
 					{ "time": 0.4, "name": "09" },
-					{ "time": 0.4333, "name": "10" },
-					{ "time": 0.4667, "name": "11" },
-					{ "time": 0.5, "name": "12" },
-					{ "time": 0.5333, "name": "13" },
-					{ "time": 0.5667, "name": "14" },
-					{ "time": 0.6, "name": "15" },
-					{ "time": 0.6333, "name": "05" },
-					{ "time": 0.6667, "name": "06" },
-					{ "time": 0.7, "name": "07" },
-					{ "time": 0.7333, "name": "08" },
-					{ "time": 0.7667, "name": "09" },
-					{ "time": 0.8, "name": "10" },
-					{ "time": 0.8333, "name": "11" },
-					{ "time": 0.8667, "name": "12" },
-					{ "time": 0.9, "name": "13" },
-					{ "time": 0.9333, "name": "14" },
-					{ "time": 0.9667, "name": "15" },
+					{ "time": 0.5, "name": "10" },
+					{ "time": 0.5667, "name": "11" },
+					{ "time": 0.6667, "name": "12" },
+					{ "time": 0.7333, "name": "13" },
+					{ "time": 0.8, "name": "14" },
+					{ "time": 0.9, "name": "15" },
 					{ "time": 1, "name": null }
 				]
 			}

assets/resources/prefab/map/map1.prefab

@@ -17310,7 +17310,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -17560,7 +17560,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -17810,7 +17810,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -18384,7 +18384,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -18634,7 +18634,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -18884,7 +18884,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -19134,7 +19134,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -21395,7 +21395,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -21645,7 +21645,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -21895,7 +21895,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -22145,7 +22145,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 36,
       "height": 66
     },
     "_anchorPoint": {
@@ -22481,7 +22481,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -22731,7 +22731,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -22981,7 +22981,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -23231,7 +23231,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {
@@ -23481,7 +23481,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 46.89,
+      "width": 34,
       "height": 77.11
     },
     "_anchorPoint": {

local/local.json

@@ -20,12 +20,13 @@
     "aa4d574e-420c-47ae-bfa1-768309e25aa0",
     "3d970ea4-c1a7-4b5e-a794-be2a897474f0",
     "1fbc18b8-3bde-4f5f-8f1d-e7ce637b6616",
-    "1dd1b738-6fcc-472c-aef0-635d214a6118",
-<<<<<<< HEAD
     "2d2f792f-a40c-49bb-a189-ed176a246e49",
-    "35b14081-9e0f-45a5-a804-a787c942ff47"
-=======
-    "2d2f792f-a40c-49bb-a189-ed176a246e49"
->>>>>>> 93e7033bc2ecbb29aee4038c576291045fbf47b2
+    "81823765-7aef-47ac-b793-287673d47aa3",
+    "c1fa2217-e454-46ca-ad7b-31c2afa8adc4",
+    "1cc87fa7-097b-4f10-aecb-49dcb1713bac",
+    "e18cbf3b-5ab8-4c87-871a-a2c51ce55790",
+    "d14d519b-6493-4bf0-bbdd-1438c31926e2",
+    "35b14081-9e0f-45a5-a804-a787c942ff47",
+    "1dd1b738-6fcc-472c-aef0-635d214a6118"
   ]
 }