diff --git a/assets/resources/gui/mps.plist b/assets/resources/gui/mps.plist
index e6abbe9a..8281725d 100644
--- a/assets/resources/gui/mps.plist
+++ b/assets/resources/gui/mps.plist
@@ -34,7 +34,7 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,1095},{616,182}}
+ {{675,1669},{616,182}}
textureRotated
@@ -51,7 +51,7 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1775},{672,92}}
+ {{675,1853},{672,92}}
textureRotated
@@ -68,9 +68,9 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1869},{672,76}}
+ {{1931,675},{672,76}}
textureRotated
-
+
0l5_mountains.png
@@ -102,7 +102,7 @@
spriteSourceSize
{672,378}
textureRect
- {{1,1589},{672,162}}
+ {{675,1193},{672,162}}
textureRotated
@@ -119,9 +119,9 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1507},{672,138}}
+ {{1663,675},{672,138}}
textureRotated
-
+
0l8_ground.png
@@ -136,9 +136,9 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,381},{672,216}}
+ {{1729,1},{672,216}}
textureRotated
-
+
1l1_wall.png
@@ -221,9 +221,9 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,1279},{662,90}}
+ {{1349,1349},{662,90}}
textureRotated
-
+
1l6_ground.png
@@ -238,9 +238,9 @@
spriteSourceSize
{672,378}
textureRect
- {{1441,1279},{672,76}}
+ {{1293,1699},{672,76}}
textureRotated
-
+
3l1_sky.png
@@ -272,9 +272,9 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1353},{672,152}}
+ {{1509,675},{672,152}}
textureRotated
-
+
3l3_pyramid.png
@@ -289,9 +289,9 @@
spriteSourceSize
{672,378}
textureRect
- {{1621,1279},{528,154}}
+ {{1349,1543},{528,154}}
textureRotated
-
+
3l4_bg-ground01.png
@@ -306,7 +306,7 @@
spriteSourceSize
{672,378}
textureRect
- {{1,1753},{672,156}}
+ {{675,1357},{672,156}}
textureRotated
@@ -323,7 +323,7 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,599},{672,180}}
+ {{1,1589},{672,180}}
textureRotated
@@ -340,9 +340,9 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1647},{672,126}}
+ {{1803,675},{672,126}}
textureRotated
-
+
3l7_ground.png
@@ -357,7 +357,24 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,941},{672,152}}
+ {{675,1515},{672,152}}
+ textureRotated
+
+
+ Icon_Battle.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {64,57}
+ spriteSourceSize
+ {64,57}
+ textureRect
+ {{1349,1894},{64,57}}
textureRotated
@@ -374,9 +391,9 @@
spriteSourceSize
{68,51}
textureRect
- {{1777,1626},{68,51}}
+ {{1879,1629},{68,51}}
textureRotated
-
+
Stone_A_04.png
@@ -391,9 +408,9 @@
spriteSourceSize
{60,51}
textureRect
- {{1850,1562},{60,51}}
+ {{1293,1777},{60,51}}
textureRotated
-
+
Stone_A_07.png
@@ -408,9 +425,9 @@
spriteSourceSize
{107,51}
textureRect
- {{1621,1809},{107,51}}
+ {{1947,1},{107,51}}
textureRotated
-
+
Stone_B_01.png
@@ -425,7 +442,7 @@
spriteSourceSize
{68,70}
textureRect
- {{1519,1865},{68,70}}
+ {{1935,1441},{68,70}}
textureRotated
@@ -442,7 +459,7 @@
spriteSourceSize
{66,45}
textureRect
- {{1777,1679},{66,45}}
+ {{1415,1894},{66,45}}
textureRotated
@@ -459,7 +476,7 @@
spriteSourceSize
{35,22}
textureRect
- {{1730,1809},{35,22}}
+ {{1293,1669},{35,22}}
textureRotated
@@ -476,9 +493,9 @@
spriteSourceSize
{71,62}
textureRect
- {{1777,1562},{71,62}}
+ {{1899,1777},{71,62}}
textureRotated
-
+
Stone_B_05.png
@@ -493,7 +510,7 @@
spriteSourceSize
{84,43}
textureRect
- {{1967,1095},{84,43}}
+ {{1879,1543},{84,43}}
textureRotated
@@ -510,7 +527,7 @@
spriteSourceSize
{31,15}
textureRect
- {{1519,1937},{31,15}}
+ {{1947,110},{31,15}}
textureRotated
@@ -527,7 +544,41 @@
spriteSourceSize
{44,16}
textureRect
- {{1,1911},{44,16}}
+ {{1,1931},{44,16}}
+ textureRotated
+
+
+ Title_01_NoDeco_Orange.Png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {273,115}
+ spriteSourceSize
+ {273,115}
+ textureRect
+ {{1349,1777},{273,115}}
+ textureRotated
+
+
+ Title_01_NoDeco_Tangerine.Png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {273,115}
+ spriteSourceSize
+ {273,115}
+ textureRect
+ {{1624,1777},{273,115}}
textureRotated
@@ -546,7 +597,7 @@
textureRect
{{1349,1},{672,378}}
textureRotated
-
+
l2_mountains.png
@@ -578,9 +629,9 @@
spriteSourceSize
{672,378}
textureRect
- {{1519,1279},{584,100}}
+ {{1349,1441},{584,100}}
textureRotated
-
+
l4_bg-ground01.png
@@ -595,9 +646,9 @@
spriteSourceSize
{672,378}
textureRect
- {{675,1193},{672,158}}
+ {{1349,675},{672,158}}
textureRotated
-
+
l5_bg-ground02.png
@@ -612,7 +663,7 @@
spriteSourceSize
{672,378}
textureRect
- {{1349,781},{672,158}}
+ {{1,1771},{672,158}}
textureRotated
@@ -633,23 +684,6 @@
textureRotated
- logo2.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {1,2}
- spriteSize
- {281,231}
- spriteSourceSize
- {307,307}
- textureRect
- {{1777,1279},{281,231}}
- textureRotated
-
-
metadata
@@ -662,9 +696,9 @@
realTextureFileName
mps.png
size
- {2022,1953}
+ {2012,1952}
smartupdate
- $TexturePacker:SmartUpdate:c995e79e2727f3d5b64d2e4345b903e7:ff13e6153e38a1ee043318ccbb0a835f:4c0e3901f0d5fcb2cf0cd4dcba1c7f8b$
+ $TexturePacker:SmartUpdate:afc599cf42d3db8475edd4bf42d848d7:62891583945cafa92fc112c0ecd848ee:4c0e3901f0d5fcb2cf0cd4dcba1c7f8b$
textureFileName
mps.png
diff --git a/assets/resources/gui/mps.plist.meta b/assets/resources/gui/mps.plist.meta
index 96101026..8c5543a8 100644
--- a/assets/resources/gui/mps.plist.meta
+++ b/assets/resources/gui/mps.plist.meta
@@ -7,6 +7,52 @@
".json"
],
"subMetas": {
+ "57674": {
+ "importer": "sprite-frame",
+ "uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@57674",
+ "displayName": "",
+ "id": "57674",
+ "name": "Icon_Battle",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1349,
+ "trimY": 1894,
+ "width": 64,
+ "height": 57,
+ "rawWidth": 64,
+ "rawHeight": 57,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "ca2b26a5-8d54-49ec-bdaf-e9f777afc9cb@6c48a",
+ "atlasUuid": "81af97ed-7940-45e6-91a1-21bd0df1a343",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"58094": {
"importer": "sprite-frame",
"uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@58094",
@@ -53,6 +99,98 @@
],
"subMetas": {}
},
+ "63222": {
+ "importer": "sprite-frame",
+ "uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@63222",
+ "displayName": "",
+ "id": "63222",
+ "name": "Title_01_NoDeco_Tangerine",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1624,
+ "trimY": 1777,
+ "width": 273,
+ "height": 115,
+ "rawWidth": 273,
+ "rawHeight": 115,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "ca2b26a5-8d54-49ec-bdaf-e9f777afc9cb@6c48a",
+ "atlasUuid": "81af97ed-7940-45e6-91a1-21bd0df1a343",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "86850": {
+ "importer": "sprite-frame",
+ "uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@86850",
+ "displayName": "",
+ "id": "86850",
+ "name": "Title_01_NoDeco_Orange",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1349,
+ "trimY": 1777,
+ "width": 273,
+ "height": 115,
+ "rawWidth": 273,
+ "rawHeight": 115,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 135,
+ "borderRight": 138,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "ca2b26a5-8d54-49ec-bdaf-e9f777afc9cb@6c48a",
+ "atlasUuid": "81af97ed-7940-45e6-91a1-21bd0df1a343",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"4f746": {
"importer": "sprite-frame",
"uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@4f746",
@@ -110,8 +248,8 @@
"rotated": false,
"offsetX": -4,
"offsetY": 82,
- "trimX": 1349,
- "trimY": 1095,
+ "trimX": 675,
+ "trimY": 1669,
"width": 616,
"height": 182,
"rawWidth": 672,
@@ -157,7 +295,7 @@
"offsetX": 0,
"offsetY": -3,
"trimX": 675,
- "trimY": 1775,
+ "trimY": 1853,
"width": 672,
"height": 92,
"rawWidth": 672,
@@ -199,11 +337,11 @@
"name": "0l4_clouds02",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 122,
- "trimX": 675,
- "trimY": 1869,
+ "trimX": 1931,
+ "trimY": 675,
"width": 672,
"height": 76,
"rawWidth": 672,
@@ -294,8 +432,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -108,
- "trimX": 1,
- "trimY": 1589,
+ "trimX": 675,
+ "trimY": 1193,
"width": 672,
"height": 162,
"rawWidth": 672,
@@ -337,11 +475,11 @@
"name": "0l7_ground02",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -120,
- "trimX": 675,
- "trimY": 1507,
+ "trimX": 1663,
+ "trimY": 675,
"width": 672,
"height": 138,
"rawWidth": 672,
@@ -383,11 +521,11 @@
"name": "0l8_ground",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -81,
- "trimX": 1349,
- "trimY": 381,
+ "trimX": 1729,
+ "trimY": 1,
"width": 672,
"height": 216,
"rawWidth": 672,
@@ -613,11 +751,11 @@
"name": "1l5_crystals",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -2,
"offsetY": -85,
"trimX": 1349,
- "trimY": 1279,
+ "trimY": 1349,
"width": 662,
"height": 90,
"rawWidth": 672,
@@ -659,11 +797,11 @@
"name": "1l6_ground",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -151,
- "trimX": 1441,
- "trimY": 1279,
+ "trimX": 1293,
+ "trimY": 1699,
"width": 672,
"height": 76,
"rawWidth": 672,
@@ -705,11 +843,11 @@
"name": "3l2_clouds",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -48,
- "trimX": 675,
- "trimY": 1353,
+ "trimX": 1509,
+ "trimY": 675,
"width": 672,
"height": 152,
"rawWidth": 672,
@@ -751,11 +889,11 @@
"name": "3l3_pyramid",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 2,
"offsetY": -7,
- "trimX": 1621,
- "trimY": 1279,
+ "trimX": 1349,
+ "trimY": 1543,
"width": 528,
"height": 154,
"rawWidth": 672,
@@ -800,8 +938,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -111,
- "trimX": 1,
- "trimY": 1753,
+ "trimX": 675,
+ "trimY": 1357,
"width": 672,
"height": 156,
"rawWidth": 672,
@@ -846,8 +984,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -99,
- "trimX": 1349,
- "trimY": 599,
+ "trimX": 1,
+ "trimY": 1589,
"width": 672,
"height": 180,
"rawWidth": 672,
@@ -889,11 +1027,11 @@
"name": "3l6_bg-ground03",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -126,
- "trimX": 675,
- "trimY": 1647,
+ "trimX": 1803,
+ "trimY": 675,
"width": 672,
"height": 126,
"rawWidth": 672,
@@ -938,8 +1076,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -113,
- "trimX": 1349,
- "trimY": 941,
+ "trimX": 675,
+ "trimY": 1515,
"width": 672,
"height": 152,
"rawWidth": 672,
@@ -981,11 +1119,11 @@
"name": "Stone_A_01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1777,
- "trimY": 1626,
+ "trimX": 1879,
+ "trimY": 1629,
"width": 68,
"height": 51,
"rawWidth": 68,
@@ -1027,11 +1165,11 @@
"name": "Stone_A_04",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1850,
- "trimY": 1562,
+ "trimX": 1293,
+ "trimY": 1777,
"width": 60,
"height": 51,
"rawWidth": 60,
@@ -1073,11 +1211,11 @@
"name": "Stone_A_07",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1621,
- "trimY": 1809,
+ "trimX": 1947,
+ "trimY": 1,
"width": 107,
"height": 51,
"rawWidth": 107,
@@ -1122,8 +1260,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1519,
- "trimY": 1865,
+ "trimX": 1935,
+ "trimY": 1441,
"width": 68,
"height": 70,
"rawWidth": 68,
@@ -1168,8 +1306,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1777,
- "trimY": 1679,
+ "trimX": 1415,
+ "trimY": 1894,
"width": 66,
"height": 45,
"rawWidth": 66,
@@ -1214,8 +1352,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1730,
- "trimY": 1809,
+ "trimX": 1293,
+ "trimY": 1669,
"width": 35,
"height": 22,
"rawWidth": 35,
@@ -1257,11 +1395,11 @@
"name": "Stone_B_04",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1777,
- "trimY": 1562,
+ "trimX": 1899,
+ "trimY": 1777,
"width": 71,
"height": 62,
"rawWidth": 71,
@@ -1306,8 +1444,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1967,
- "trimY": 1095,
+ "trimX": 1879,
+ "trimY": 1543,
"width": 84,
"height": 43,
"rawWidth": 84,
@@ -1352,8 +1490,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1519,
- "trimY": 1937,
+ "trimX": 1947,
+ "trimY": 110,
"width": 31,
"height": 15,
"rawWidth": 31,
@@ -1399,7 +1537,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 1911,
+ "trimY": 1931,
"width": 44,
"height": 16,
"rawWidth": 44,
@@ -1441,7 +1579,7 @@
"name": "l1_sky",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1349,
@@ -1533,11 +1671,11 @@
"name": "l3_clouds",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -6,
"offsetY": 89,
- "trimX": 1519,
- "trimY": 1279,
+ "trimX": 1349,
+ "trimY": 1441,
"width": 584,
"height": 100,
"rawWidth": 672,
@@ -1579,11 +1717,11 @@
"name": "l4_bg-ground01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -110,
- "trimX": 675,
- "trimY": 1193,
+ "trimX": 1349,
+ "trimY": 675,
"width": 672,
"height": 158,
"rawWidth": 672,
@@ -1628,8 +1766,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -110,
- "trimX": 1349,
- "trimY": 781,
+ "trimX": 1,
+ "trimY": 1771,
"width": 672,
"height": 158,
"rawWidth": 672,
@@ -1708,52 +1846,6 @@
".json"
],
"subMetas": {}
- },
- "14c74": {
- "importer": "sprite-frame",
- "uuid": "81af97ed-7940-45e6-91a1-21bd0df1a343@14c74",
- "displayName": "",
- "id": "14c74",
- "name": "logo2",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 1,
- "offsetY": 2,
- "trimX": 1777,
- "trimY": 1279,
- "width": 281,
- "height": 231,
- "rawWidth": 307,
- "rawHeight": 307,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "ca2b26a5-8d54-49ec-bdaf-e9f777afc9cb@6c48a",
- "atlasUuid": "81af97ed-7940-45e6-91a1-21bd0df1a343",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
}
},
"userData": {
diff --git a/assets/resources/gui/mps.png b/assets/resources/gui/mps.png
index 31cc9885..8fb4ea50 100644
Binary files a/assets/resources/gui/mps.png and b/assets/resources/gui/mps.png differ
diff --git a/assets/resources/loading/prefab/loading.prefab b/assets/resources/loading/prefab/loading.prefab
index 50d0d9f0..e19c51d5 100644
--- a/assets/resources/loading/prefab/loading.prefab
+++ b/assets/resources/loading/prefab/loading.prefab
@@ -22,29 +22,29 @@
"__id__": 2
},
{
- "__id__": 18
+ "__id__": 25
},
{
- "__id__": 72
+ "__id__": 79
},
{
- "__id__": 88
+ "__id__": 95
}
],
"_active": true,
"_components": [
{
- "__id__": 96
+ "__id__": 145
},
{
- "__id__": 98
+ "__id__": 147
},
{
- "__id__": 100
+ "__id__": 149
}
],
"_prefab": {
- "__id__": 102
+ "__id__": 151
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -133,6 +133,18 @@
},
{
"__id__": 16
+ },
+ {
+ "__id__": 18
+ },
+ {
+ "__id__": 19
+ },
+ {
+ "__id__": 21
+ },
+ {
+ "__id__": 23
}
],
"removedComponents": []
@@ -279,6 +291,82 @@
"52mSf8VVRAbK1ZcheP8zBG"
]
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 6
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": true
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_color"
+ ],
+ "value": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 108,
+ "b": 180,
+ "a": 255
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "253QE7witBsbB6iYj7GHjO"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 22
+ },
+ "propertyPath": [
+ "_color"
+ ],
+ "value": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 108,
+ "b": 168,
+ "a": 255
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "9biHW3cOVCkb0JnJZjTlFV"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 24
+ },
+ "propertyPath": [
+ "_color"
+ ],
+ "value": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 129,
+ "b": 190,
+ "a": 114
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "015DHKMtpIrLoszvWeVn5S"
+ ]
+ },
{
"__type__": "cc.Node",
"_name": "pro_progress",
@@ -289,41 +377,41 @@
},
"_children": [
{
- "__id__": 19
+ "__id__": 26
},
{
- "__id__": 25
+ "__id__": 32
},
{
- "__id__": 35
+ "__id__": 42
},
{
- "__id__": 43
+ "__id__": 50
},
{
- "__id__": 51
+ "__id__": 58
}
],
"_active": true,
"_components": [
{
- "__id__": 61
+ "__id__": 68
},
{
- "__id__": 63
+ "__id__": 70
},
{
- "__id__": 65
+ "__id__": 72
},
{
- "__id__": 67
+ "__id__": 74
},
{
- "__id__": 69
+ "__id__": 76
}
],
"_prefab": {
- "__id__": 71
+ "__id__": 78
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -360,20 +448,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 20
+ "__id__": 27
},
{
- "__id__": 22
+ "__id__": 29
}
],
"_prefab": {
- "__id__": 24
+ "__id__": 31
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -410,11 +498,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 19
+ "__id__": 26
},
"_enabled": true,
"__prefab": {
- "__id__": 21
+ "__id__": 28
},
"_contentSize": {
"__type__": "cc.Size",
@@ -438,11 +526,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 19
+ "__id__": 26
},
"_enabled": true,
"__prefab": {
- "__id__": 23
+ "__id__": 30
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -499,26 +587,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 26
+ "__id__": 33
},
{
- "__id__": 28
+ "__id__": 35
},
{
- "__id__": 30
+ "__id__": 37
},
{
- "__id__": 32
+ "__id__": 39
}
],
"_prefab": {
- "__id__": 34
+ "__id__": 41
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -555,11 +643,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 25
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 27
+ "__id__": 34
},
"_contentSize": {
"__type__": "cc.Size",
@@ -583,11 +671,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 25
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 29
+ "__id__": 36
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -651,11 +739,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 25
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 31
+ "__id__": 38
},
"_id": ""
},
@@ -669,11 +757,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 25
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 33
+ "__id__": 40
},
"templateMode": true,
"watchPath": "",
@@ -706,23 +794,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 36
+ "__id__": 43
},
{
- "__id__": 38
+ "__id__": 45
},
{
- "__id__": 40
+ "__id__": 47
}
],
"_prefab": {
- "__id__": 42
+ "__id__": 49
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -759,11 +847,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 35
+ "__id__": 42
},
"_enabled": true,
"__prefab": {
- "__id__": 37
+ "__id__": 44
},
"_contentSize": {
"__type__": "cc.Size",
@@ -787,11 +875,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 35
+ "__id__": 42
},
"_enabled": true,
"__prefab": {
- "__id__": 39
+ "__id__": 46
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -835,11 +923,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 35
+ "__id__": 42
},
"_enabled": true,
"__prefab": {
- "__id__": 41
+ "__id__": 48
},
"_alignFlags": 45,
"_target": null,
@@ -884,23 +972,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 44
+ "__id__": 51
},
{
- "__id__": 46
+ "__id__": 53
},
{
- "__id__": 48
+ "__id__": 55
}
],
"_prefab": {
- "__id__": 50
+ "__id__": 57
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -937,11 +1025,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 43
+ "__id__": 50
},
"_enabled": true,
"__prefab": {
- "__id__": 45
+ "__id__": 52
},
"_contentSize": {
"__type__": "cc.Size",
@@ -965,11 +1053,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 43
+ "__id__": 50
},
"_enabled": true,
"__prefab": {
- "__id__": 47
+ "__id__": 54
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1013,11 +1101,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 43
+ "__id__": 50
},
"_enabled": true,
"__prefab": {
- "__id__": 49
+ "__id__": 56
},
"playOnLoad": true,
"_clips": [
@@ -1055,26 +1143,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 25
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 52
+ "__id__": 59
},
{
- "__id__": 54
+ "__id__": 61
},
{
- "__id__": 56
+ "__id__": 63
},
{
- "__id__": 58
+ "__id__": 65
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 67
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1111,11 +1199,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 60
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1139,11 +1227,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 62
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1207,11 +1295,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 64
},
"_id": ""
},
@@ -1225,11 +1313,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 66
},
"templateMode": false,
"watchPath": "*.prompt",
@@ -1260,11 +1348,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 69
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1288,11 +1376,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 64
+ "__id__": 71
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1336,14 +1424,14 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 66
+ "__id__": 73
},
"_barSprite": {
- "__id__": 22
+ "__id__": 29
},
"_mode": 2,
"_totalLength": 1,
@@ -1361,11 +1449,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 68
+ "__id__": 75
},
"controller": false,
"watchPath": "",
@@ -1389,11 +1477,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 70
+ "__id__": 77
},
"_alignFlags": 42,
"_target": null,
@@ -1442,20 +1530,20 @@
},
"_children": [
{
- "__id__": 73
+ "__id__": 80
},
{
- "__id__": 79
+ "__id__": 86
}
],
"_active": true,
"_components": [
{
- "__id__": 85
+ "__id__": 92
}
],
"_prefab": {
- "__id__": 87
+ "__id__": 94
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1492,20 +1580,20 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 72
+ "__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 74
+ "__id__": 81
},
{
- "__id__": 76
+ "__id__": 83
}
],
"_prefab": {
- "__id__": 78
+ "__id__": 85
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1542,11 +1630,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 73
+ "__id__": 80
},
"_enabled": true,
"__prefab": {
- "__id__": 75
+ "__id__": 82
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1570,11 +1658,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 73
+ "__id__": 80
},
"_enabled": true,
"__prefab": {
- "__id__": 77
+ "__id__": 84
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1651,20 +1739,20 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 72
+ "__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 80
+ "__id__": 87
},
{
- "__id__": 82
+ "__id__": 89
}
],
"_prefab": {
- "__id__": 84
+ "__id__": 91
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1701,11 +1789,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 79
+ "__id__": 86
},
"_enabled": true,
"__prefab": {
- "__id__": 81
+ "__id__": 88
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1729,11 +1817,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 79
+ "__id__": 86
},
"_enabled": true,
"__prefab": {
- "__id__": 83
+ "__id__": 90
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1810,11 +1898,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 72
+ "__id__": 79
},
"_enabled": true,
"__prefab": {
- "__id__": 86
+ "__id__": 93
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1853,21 +1941,43 @@
"_parent": {
"__id__": 1
},
- "_children": [],
+ "_children": [
+ {
+ "__id__": 96
+ },
+ {
+ "__id__": 102
+ },
+ {
+ "__id__": 108
+ },
+ {
+ "__id__": 114
+ },
+ {
+ "__id__": 120
+ },
+ {
+ "__id__": 126
+ },
+ {
+ "__id__": 132
+ }
+ ],
"_active": true,
"_components": [
{
- "__id__": 89
+ "__id__": 138
},
{
- "__id__": 91
+ "__id__": 140
},
{
- "__id__": 93
+ "__id__": 142
}
],
"_prefab": {
- "__id__": 95
+ "__id__": 144
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1884,8 +1994,58 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1.5,
- "y": 1.5,
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Sword-FA_WP_Main_Sword_016_SkyBlue",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "_prefab": {
+ "__id__": 101
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -99.936,
+ "y": 53.296,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": -1,
"z": 1
},
"_mobility": 0,
@@ -1904,16 +2064,946 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 88
+ "__id__": 96
},
"_enabled": true,
"__prefab": {
- "__id__": 90
+ "__id__": 98
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 281,
- "height": 231
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c8OG2/g+dGFr9cuYX83v+C"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 96
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 100
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@ec127",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "2dzAxX5y5HzKU0VTPyd9lZ"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "24lDesdBhCZ7zkZ50dTKwu",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Wand-FA_WP_Main_Wand_009_WoodGold",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ }
+ ],
+ "_prefab": {
+ "__id__": 107
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 110.609,
+ "y": 60,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 102
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 104
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 108,
+ "height": 106
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "48NDryUeNCA7L+mfQsTi++"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 102
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 106
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@dac70",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "9bY/6hKXlHzIXhvRr0wBSo"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "d6Q5uuM9JJtqTop1aWrIIr",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "League_7_Legendary",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 109
+ },
+ {
+ "__id__": 111
+ }
+ ],
+ "_prefab": {
+ "__id__": 113
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 33.097,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.3,
+ "y": 1.3,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 108
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 110
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 114,
+ "height": 126
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b3lfNrQhtDx7AUi4om38KC"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 108
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 112
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@b18a4",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "82leB/OoJMtKK9EFbdm+rF"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "23ezTDhoRKtI7byZJA5Vc+",
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Title_01_NoDeco_Sky",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 115
+ },
+ {
+ "__id__": 117
+ }
+ ],
+ "_prefab": {
+ "__id__": 119
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.8,
+ "y": 0.8,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 114
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 116
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 500,
+ "height": 115
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "27VAbBqcxDVYPFMy2oymJf"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 114
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 118
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "81af97ed-7940-45e6-91a1-21bd0df1a343@86850",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "81af97ed-7940-45e6-91a1-21bd0df1a343",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "29AjBpfAdAkagoe5AGpOKO"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "ceVpcVXQtGBJsfoeaAzSnp",
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Bow-FA_WP_Main_Bow_010_Blue",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 121
+ },
+ {
+ "__id__": 123
+ }
+ ],
+ "_prefab": {
+ "__id__": 125
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 98.613,
+ "y": 10.921,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0.7071067811865475,
+ "w": 0.7071067811865476
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 90
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 120
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 122
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 118,
+ "height": 118
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "ebtTaAWJxED6ehoDL02BYV"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 120
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 124
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@0151d",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f9xFPRGOJE0r+fawkBGoaE"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "2e4QPAR9hDpqz1XTcQjw2j",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Shield-FA_WP_Sub_Shield_010_Gold",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 127
+ },
+ {
+ "__id__": 129
+ }
+ ],
+ "_prefab": {
+ "__id__": 131
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -125.397,
+ "y": 27.919,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0.17364817766693033,
+ "w": 0.984807753012208
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 20
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 126
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 128
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 128,
+ "height": 98
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e13xrh4fhDHLDo8Pde0SMH"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 126
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 130
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d@56e31",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "abc35b6e-b052-4835-a3a3-cb85abd47f4d",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "62IYwa/QtCmrKekqi5M4J2"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "bceqdXa71LkoshWewfpIox",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Label",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 95
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 133
+ },
+ {
+ "__id__": 135
+ }
+ ],
+ "_prefab": {
+ "__id__": 137
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 12.634,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 132
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 134
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 216,
+ "height": 79
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "721WclWIRJ9owIF3PIXGMH"
+ },
+ {
+ "__type__": "cc.Label",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 132
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 136
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_string": "像素大勇者",
+ "_horizontalAlign": 1,
+ "_verticalAlign": 1,
+ "_actualFontSize": 40,
+ "_fontSize": 40,
+ "_fontFamily": "Arial",
+ "_lineHeight": 50,
+ "_overflow": 0,
+ "_enableWrapText": true,
+ "_font": null,
+ "_isSystemFontUsed": true,
+ "_spacingX": 0,
+ "_isItalic": false,
+ "_isBold": true,
+ "_isUnderline": false,
+ "_underlineHeight": 2,
+ "_cacheMode": 0,
+ "_enableOutline": true,
+ "_outlineColor": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "_outlineWidth": 8,
+ "_enableShadow": true,
+ "_shadowColor": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "_shadowOffset": {
+ "__type__": "cc.Vec2",
+ "x": 2,
+ "y": 2
+ },
+ "_shadowBlur": 2,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "cayvxIXQ5P+ICrao+NmQuN"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "4at70oxoJCv4rbAk0tCLCD",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 95
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 139
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 250,
+ "height": 176
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1932,11 +3022,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 88
+ "__id__": 95
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 141
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1948,13 +3038,10 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "81af97ed-7940-45e6-91a1-21bd0df1a343@14c74",
- "__expectedType__": "cc.SpriteFrame"
- },
+ "_spriteFrame": null,
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -1980,11 +3067,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 88
+ "__id__": 95
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 143
},
"_alignFlags": 2,
"_target": null,
@@ -2033,7 +3120,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 97
+ "__id__": 146
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2061,7 +3148,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 99
+ "__id__": 148
},
"_alignFlags": 45,
"_target": null,
@@ -2097,7 +3184,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 101
+ "__id__": 150
},
"_id": ""
},
diff --git a/put/server/data/api-skill-guide.md b/put/server/data/api-skill-guide.md
index b7db8423..53eca9bd 100644
--- a/put/server/data/api-skill-guide.md
+++ b/put/server/data/api-skill-guide.md
@@ -221,7 +221,7 @@ Content-Type: application/json
}
```
-> **注意**:`PUT` 是浅合并。若修改 `skills` 数组,必须传入**完整的新数组**(不能只传被修改的技能对象)。
+> **注意**:`PUT` 是**顶层字段浅合并**。若修改 `skills` 数组,必须传入**完整的新数组**(不能只传被修改的技能对象)。若只需改某个技能的局部字段,请用 `PATCH /api/heroes/:uuid/skills/:skillUuid`(见 §4.7)。
### 4.6 删除英雄
@@ -229,6 +229,41 @@ Content-Type: application/json
DELETE /api/heroes/5011
```
+### 4.7 技能级局部更新(推荐智能体使用)
+
+当只需要修改某个技能的局部字段(如调整 lv8 档位的 ap 值)时,使用技能级 PATCH,避免整表替换 `skills` 数组。
+
+**合并规则**:
+- `name`/`cd`/`cdExpr`/`desc`:存在则直接覆盖
+- `overrides`:与现有 `overrides` **浅合并**(不是替换)
+- `lv_entries`:按 `lv` 合并——同 `lv` 更新该档(`overrides` 浅合并),不同 `lv` 新增
+
+```http
+PATCH /api/heroes/5011/skills/6200
+Content-Type: application/json
+
+{
+ "overrides": { "ap": 280 },
+ "lv_entries": [
+ { "lv": 8, "overrides": { "ap": 320 } },
+ { "lv": 20, "s_lv": 4, "overrides": { "ap": 500 }, "desc": "造成{ap}%伤害" }
+ ]
+}
+```
+
+**效果**:
+- 基础 `overrides.ap` 从 250 变为 280
+- `lv_entries` 中 `lv:8` 档的 `overrides.ap` 从 300 变为 320(其他字段保留)
+- `lv_entries` 中新增 `lv:20` 档
+
+**对比:三种修改方式的选择**
+
+| 场景 | 推荐接口 | 原因 |
+|---|---|---|
+| 只改英雄名/稀有度/statBase 等顶层字段 | `PUT /api/heroes/:uuid` | 简单直接,不涉及 skills |
+| 改某个技能的 name/cd/desc/overrides 或某一档 lv_entry | `PATCH /api/heroes/:uuid/skills/:skillUuid` | 避免整表替换 skills,最安全 |
+| 新增/删除技能、改技能 uuid、大规模重构 | `POST /api/heroes/:uuid`(全量覆盖) | 结构变动大,整表替换更清晰 |
+
---
## 5. 智能体操作流程(推荐)
@@ -238,7 +273,8 @@ DELETE /api/heroes/5011
3. **构造英雄对象**:严格遵循 §3 结构,空组写 `{}`,空数组写 `[]`
4. **提交**:
- 新增/覆盖:`POST /api/heroes/:uuid`
- - 局部修改:`PUT /api/heroes/:uuid`(传完整修改字段)
+ - 顶层字段局部修改:`PUT /api/heroes/:uuid`
+ - 技能级局部修改:`PATCH /api/heroes/:uuid/skills/:skillUuid`
5. **验证**:`GET /api/heroes/:uuid` 确认数据已写入
6. **(开发版)应用**:`POST /api/apply` 将 heroes.json 渲染进 `heroSet.ts`(线上设计版无此权限)