diff --git a/assets/resources/gui/aui.plist b/assets/resources/gui/aui.plist
index 27249481..0b2080fd 100644
--- a/assets/resources/gui/aui.plist
+++ b/assets/resources/gui/aui.plist
@@ -17,9 +17,9 @@
spriteSourceSize
{128,128}
textureRect
- {{520,1392},{116,90}}
+ {{201,1347},{116,90}}
textureRotated
-
+
Consumable_Potion_02_Red.png
@@ -34,7 +34,7 @@
spriteSourceSize
{128,128}
textureRect
- {{729,1589},{98,114}}
+ {{313,1466},{98,114}}
textureRotated
@@ -51,7 +51,7 @@
spriteSourceSize
{128,128}
textureRect
- {{319,1895},{102,102}}
+ {{462,1080},{102,102}}
textureRotated
@@ -68,9 +68,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1,1697},{86,106}}
+ {{225,1259},{86,106}}
textureRotated
-
+
Economy_Gem_01_Blue.png
@@ -85,7 +85,7 @@
spriteSourceSize
{128,128}
textureRect
- {{196,1465},{116,102}}
+ {{195,1439},{116,102}}
textureRotated
@@ -102,7 +102,7 @@
spriteSourceSize
{128,128}
textureRect
- {{493,1734},{106,106}}
+ {{820,948},{106,106}}
textureRotated
@@ -119,7 +119,7 @@
spriteSourceSize
{128,128}
textureRect
- {{721,1689},{106,106}}
+ {{461,1184},{106,106}}
textureRotated
@@ -136,7 +136,7 @@
spriteSourceSize
{128,128}
textureRect
- {{383,1708},{108,98}}
+ {{573,1015},{108,98}}
textureRotated
@@ -153,7 +153,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1,1895},{102,104}}
+ {{791,1056},{102,104}}
textureRotated
@@ -170,7 +170,7 @@
spriteSourceSize
{128,128}
textureRect
- {{107,1895},{102,104}}
+ {{787,1160},{102,104}}
textureRotated
@@ -187,7 +187,7 @@
spriteSourceSize
{128,128}
textureRect
- {{213,1895},{102,104}}
+ {{786,1264},{102,104}}
textureRotated
@@ -204,7 +204,7 @@
spriteSourceSize
{128,128}
textureRect
- {{162,1569},{112,96}}
+ {{854,763},{112,96}}
textureRotated
@@ -221,7 +221,7 @@
spriteSourceSize
{128,128}
textureRect
- {{611,1651},{98,108}}
+ {{569,1225},{98,108}}
textureRotated
@@ -238,7 +238,7 @@
spriteSourceSize
{97,97}
textureRect
- {{733,1895},{97,97}}
+ {{784,1368},{97,97}}
textureRotated
@@ -255,7 +255,7 @@
spriteSourceSize
{64,64}
textureRect
- {{116,1492},{52,52}}
+ {{79,1517},{52,52}}
textureRotated
@@ -272,9 +272,9 @@
spriteSourceSize
{181,202}
textureRect
- {{1,1048},{181,202}}
+ {{42,879},{181,202}}
textureRotated
-
+
Group 67.png
@@ -289,9 +289,9 @@
spriteSourceSize
{181,202}
textureRect
- {{412,1026},{181,202}}
+ {{42,1083},{181,202}}
textureRotated
-
+
Group 68.png
@@ -306,7 +306,7 @@
spriteSourceSize
{181,202}
textureRect
- {{205,1126},{181,202}}
+ {{320,294},{181,202}}
textureRotated
@@ -323,9 +323,9 @@
spriteSourceSize
{181,202}
textureRect
- {{1,1231},{181,202}}
+ {{277,477},{181,202}}
textureRotated
-
+
Group 70.png
@@ -340,9 +340,9 @@
spriteSourceSize
{181,202}
textureRect
- {{616,1026},{181,202}}
+ {{277,681},{181,202}}
textureRotated
-
+
Group 71.png
@@ -357,9 +357,9 @@
spriteSourceSize
{181,202}
textureRect
- {{409,1209},{181,202}}
+ {{570,113},{181,202}}
textureRotated
-
+
Icon_Coin.png
@@ -374,9 +374,9 @@
spriteSourceSize
{38,42}
textureRect
- {{902,247},{38,42}}
+ {{543,1531},{38,42}}
textureRotated
-
+
Icon_Lock03.png
@@ -391,7 +391,7 @@
spriteSourceSize
{71,93}
textureRect
- {{845,1634},{71,93}}
+ {{759,745},{71,93}}
textureRotated
@@ -408,9 +408,9 @@
spriteSourceSize
{128,128}
textureRect
- {{820,1041},{120,110}}
+ {{460,747},{120,110}}
textureRotated
-
+
Item_Card_01_Color.png
@@ -425,7 +425,7 @@
spriteSourceSize
{128,128}
textureRect
- {{820,1153},{120,110}}
+ {{79,1287},{120,110}}
textureRotated
@@ -442,9 +442,9 @@
spriteSourceSize
{128,128}
textureRect
- {{627,1895},{104,100}}
+ {{867,657},{104,100}}
textureRotated
-
+
Item_Dice_01_White.png
@@ -459,7 +459,7 @@
spriteSourceSize
{128,128}
textureRect
- {{89,1779},{104,104}}
+ {{680,1261},{104,104}}
textureRotated
@@ -476,7 +476,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1,1607},{88,112}}
+ {{453,1292},{88,112}}
textureRotated
@@ -493,9 +493,9 @@
spriteSourceSize
{128,128}
textureRect
- {{732,1473},{114,116}}
+ {{79,1399},{114,116}}
textureRotated
-
+
Misc_Fire_01_Red.png
@@ -510,7 +510,7 @@
spriteSourceSize
{128,128}
textureRect
- {{501,1624},{108,108}}
+ {{569,1115},{108,108}}
textureRotated
@@ -527,9 +527,9 @@
spriteSourceSize
{128,128}
textureRect
- {{741,1365},{120,106}}
+ {{225,1137},{120,106}}
textureRotated
-
+
Rectangle 2426.png
@@ -544,9 +544,9 @@
spriteSourceSize
{110,81}
textureRect
- {{314,1465},{110,81}}
+ {{755,662},{110,81}}
textureRotated
-
+
Rectangle 568.png
@@ -561,7 +561,7 @@
spriteSourceSize
{204,40}
textureRect
- {{1,1006},{204,40}}
+ {{524,425},{204,40}}
textureRotated
@@ -578,9 +578,9 @@
spriteSourceSize
{112,90}
textureRect
- {{850,1520},{112,90}}
+ {{437,1382},{112,90}}
textureRotated
-
+
Stat_AttackSpeed_01.png
@@ -595,7 +595,7 @@
spriteSourceSize
{128,128}
textureRect
- {{161,1667},{110,110}}
+ {{724,550},{110,110}}
textureRotated
@@ -612,7 +612,7 @@
spriteSourceSize
{128,128}
textureRect
- {{423,1895},{102,102}}
+ {{680,1367},{102,102}}
textureRotated
@@ -629,9 +629,9 @@
spriteSourceSize
{128,128}
textureRect
- {{515,1510},{94,112}}
+ {{429,1474},{94,112}}
textureRotated
-
+
UI_Common_AD_01_Gray.png
@@ -646,24 +646,7 @@
spriteSourceSize
{128,128}
textureRect
- {{601,1751},{104,106}}
- textureRotated
-
-
- UI_Common_Lock_01_Silver.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,-1}
- spriteSize
- {100,116}
- spriteSourceSize
- {128,128}
- textureRect
- {{397,1494},{100,116}}
+ {{551,1425},{104,106}}
textureRotated
@@ -680,7 +663,7 @@
spriteSourceSize
{128,128}
textureRect
- {{389,1596},{110,110}}
+ {{845,435},{110,110}}
textureRotated
@@ -697,7 +680,7 @@
spriteSourceSize
{128,128}
textureRect
- {{709,1797},{106,96}}
+ {{683,1055},{106,96}}
textureRotated
@@ -714,9 +697,9 @@
spriteSourceSize
{128,128}
textureRect
- {{273,1677},{108,100}}
+ {{867,547},{108,100}}
textureRotated
-
+
UI_Play_Skull_01.png
@@ -731,7 +714,7 @@
spriteSourceSize
{128,128}
textureRect
- {{808,1265},{126,98}}
+ {{334,1080},{126,98}}
textureRotated
@@ -748,7 +731,7 @@
spriteSourceSize
{128,128}
textureRect
- {{613,1365},{126,98}}
+ {{333,1180},{126,98}}
textureRotated
@@ -765,7 +748,7 @@
spriteSourceSize
{128,128}
textureRect
- {{829,1707},{106,106}}
+ {{679,1153},{106,106}}
textureRotated
@@ -782,9 +765,9 @@
spriteSourceSize
{128,128}
textureRect
- {{400,1392},{118,100}}
+ {{715,828},{118,100}}
textureRotated
-
+
UI_Social_Guild_01.png
@@ -799,7 +782,7 @@
spriteSourceSize
{128,128}
textureRect
- {{611,1553},{116,96}}
+ {{319,1368},{116,96}}
textureRotated
@@ -816,7 +799,7 @@
spriteSourceSize
{128,128}
textureRect
- {{612,1465},{118,86}}
+ {{333,1280},{118,86}}
textureRotated
@@ -833,9 +816,9 @@
spriteSourceSize
{128,128}
textureRect
- {{527,1895},{102,98}}
+ {{659,1471},{102,98}}
textureRotated
-
+
arrow.png
@@ -850,7 +833,7 @@
spriteSourceSize
{46,76}
textureRect
- {{891,344},{46,76}}
+ {{897,1056},{46,76}}
textureRotated
@@ -867,7 +850,7 @@
spriteSourceSize
{46,76}
textureRect
- {{891,422},{46,76}}
+ {{841,1467},{46,76}}
textureRotated
@@ -884,9 +867,9 @@
spriteSourceSize
{51,47}
textureRect
- {{891,291},{51,47}}
+ {{133,1517},{51,47}}
textureRotated
-
+
bg1.png
@@ -901,7 +884,7 @@
spriteSourceSize
{44,44}
textureRect
- {{891,500},{44,44}}
+ {{1,1524},{44,44}}
textureRotated
@@ -918,9 +901,9 @@
spriteSourceSize
{227,42}
textureRect
- {{673,247},{227,42}}
+ {{225,879},{227,42}}
textureRotated
-
+
bg4.png
@@ -935,7 +918,7 @@
spriteSourceSize
{248,179}
textureRect
- {{673,66},{248,179}}
+ {{320,113},{248,179}}
textureRotated
@@ -952,7 +935,7 @@
spriteSourceSize
{405,110}
textureRect
- {{1,894},{405,110}}
+ {{320,1},{405,110}}
textureRotated
@@ -969,7 +952,24 @@
spriteSourceSize
{250,63}
textureRect
- {{673,1},{250,63}}
+ {{269,885},{250,63}}
+ textureRotated
+
+
+ btn_green.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {185,81}
+ spriteSourceSize
+ {185,81}
+ textureRect
+ {{568,662},{185,81}}
textureRotated
@@ -986,7 +986,7 @@
spriteSourceSize
{216,106}
textureRect
- {{673,291},{216,106}}
+ {{727,1},{216,106}}
textureRotated
@@ -1003,9 +1003,9 @@
spriteSourceSize
{216,106}
textureRect
- {{673,399},{216,106}}
+ {{753,109},{216,106}}
textureRotated
-
+
btn_large_green.png
@@ -1020,9 +1020,9 @@
spriteSourceSize
{216,106}
textureRect
- {{673,507},{216,106}}
+ {{861,109},{216,106}}
textureRotated
-
+
btn_large_orange.png
@@ -1037,7 +1037,7 @@
spriteSourceSize
{216,106}
textureRect
- {{451,534},{216,106}}
+ {{524,317},{216,106}}
textureRotated
@@ -1054,7 +1054,7 @@
spriteSourceSize
{216,106}
textureRect
- {{449,642},{216,106}}
+ {{742,327},{216,106}}
textureRotated
@@ -1071,9 +1071,9 @@
spriteSourceSize
{193,76}
textureRect
- {{205,1309},{193,76}}
+ {{334,885},{193,76}}
textureRotated
-
+
btn_medium_gray.png
@@ -1088,9 +1088,9 @@
spriteSourceSize
{193,76}
textureRect
- {{205,1387},{193,76}}
+ {{568,467},{193,76}}
textureRotated
-
+
btn_medium_green.png
@@ -1105,9 +1105,9 @@
spriteSourceSize
{193,76}
textureRect
- {{1,1414},{193,76}}
+ {{646,467},{193,76}}
textureRotated
-
+
btn_medium_red.png
@@ -1122,9 +1122,9 @@
spriteSourceSize
{193,76}
textureRect
- {{613,1209},{193,76}}
+ {{412,885},{193,76}}
textureRotated
-
+
btn_medium_yellow.png
@@ -1139,9 +1139,9 @@
spriteSourceSize
{193,76}
textureRect
- {{613,1287},{193,76}}
+ {{1,1329},{193,76}}
textureRotated
-
+
btn_menu.png
@@ -1156,7 +1156,41 @@
spriteSourceSize
{85,86}
textureRect
- {{1,1808},{85,86}}
+ {{817,861},{85,86}}
+ textureRotated
+
+
+ btn_red.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {185,81}
+ spriteSourceSize
+ {185,81}
+ textureRect
+ {{572,745},{185,81}}
+ textureRotated
+
+
+ btn_sky.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {185,81}
+ spriteSourceSize
+ {185,81}
+ textureRect
+ {{490,869},{185,81}}
textureRotated
@@ -1173,9 +1207,26 @@
spriteSourceSize
{268,106}
textureRect
- {{669,638},{268,106}}
+ {{460,477},{268,106}}
textureRotated
-
+
+
+ btn_yellow.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {185,81}
+ spriteSourceSize
+ {185,81}
+ textureRect
+ {{573,828},{185,81}}
+ textureRotated
+
check.png
@@ -1190,7 +1241,7 @@
spriteSourceSize
{80,76}
textureRect
- {{863,1365},{80,76}}
+ {{763,1471},{80,76}}
textureRotated
@@ -1207,9 +1258,9 @@
spriteSourceSize
{103,105}
textureRect
- {{832,1815},{103,105}}
+ {{715,948},{103,105}}
textureRotated
-
+
deco.png
@@ -1224,9 +1275,9 @@
spriteSourceSize
{448,39}
textureRect
- {{1,534},{448,39}}
+ {{1,879},{448,39}}
textureRotated
-
+
eff.png
@@ -1241,9 +1292,9 @@
spriteSourceSize
{317,446}
textureRect
- {{1,575},{317,446}}
+ {{1,1},{317,446}}
textureRotated
-
+
gold.png
@@ -1258,7 +1309,7 @@
spriteSourceSize
{54,54}
textureRect
- {{879,985},{54,54}}
+ {{889,1446},{54,54}}
textureRotated
@@ -1275,7 +1326,7 @@
spriteSourceSize
{98,111}
textureRect
- {{276,1577},{98,111}}
+ {{567,1325},{98,111}}
textureRotated
@@ -1292,7 +1343,7 @@
spriteSourceSize
{30,30}
textureRect
- {{408,931},{30,30}}
+ {{47,1524},{30,30}}
textureRotated
@@ -1309,24 +1360,7 @@
spriteSourceSize
{113,113}
textureRect
- {{1,1492},{113,113}}
- textureRotated
-
-
- illust.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {203,118}
- spriteSourceSize
- {203,118}
- textureRect
- {{207,1006},{203,118}}
+ {{730,435},{113,113}}
textureRotated
@@ -1343,9 +1377,9 @@
spriteSourceSize
{35,39}
textureRect
- {{408,894},{35,39}}
+ {{42,1287},{35,39}}
textureRotated
-
+
lock2.png
@@ -1360,7 +1394,7 @@
spriteSourceSize
{58,65}
textureRect
- {{879,746},{58,65}}
+ {{905,861},{58,65}}
textureRotated
@@ -1377,7 +1411,7 @@
spriteSourceSize
{170,57}
textureRect
- {{879,813},{170,57}}
+ {{656,828},{170,57}}
textureRotated
@@ -1394,9 +1428,9 @@
spriteSourceSize
{428,274}
textureRect
- {{449,750},{428,274}}
+ {{1,449},{428,274}}
textureRotated
-
+
reset.png
@@ -1411,26 +1445,9 @@
spriteSourceSize
{76,71}
textureRect
- {{863,1447},{76,71}}
+ {{883,1368},{76,71}}
textureRotated
-
-
- ribbon.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {670,531}
- spriteSourceSize
- {670,531}
- textureRect
- {{1,1},{670,531}}
- textureRotated
-
+
role1.png
@@ -1445,7 +1462,7 @@
spriteSourceSize
{44,44}
textureRect
- {{891,546},{44,44}}
+ {{889,1502},{44,44}}
textureRotated
@@ -1462,7 +1479,7 @@
spriteSourceSize
{44,44}
textureRect
- {{891,592},{44,44}}
+ {{897,1134},{44,44}}
textureRotated
@@ -1479,7 +1496,7 @@
spriteSourceSize
{44,44}
textureRect
- {{116,1546},{44,44}}
+ {{893,1180},{44,44}}
textureRotated
@@ -1496,7 +1513,7 @@
spriteSourceSize
{44,44}
textureRect
- {{116,1592},{44,44}}
+ {{893,1226},{44,44}}
textureRotated
@@ -1513,7 +1530,7 @@
spriteSourceSize
{44,44}
textureRect
- {{115,1638},{44,44}}
+ {{892,1272},{44,44}}
textureRotated
@@ -1529,9 +1546,9 @@
realTextureFileName
aui.png
size
- {941,1998}
+ {968,1570}
smartupdate
- $TexturePacker:SmartUpdate:90291883e9600b0eb48ff107a380a983:c0fc681917102bd02ab271e6c433ab2b:b5775493c55766efeea5ccac51652ce8$
+ $TexturePacker:SmartUpdate:cde696a414e67d6b596a33e17595bca2:f0fec01b89672dedf38d21aaf4e39004:b5775493c55766efeea5ccac51652ce8$
textureFileName
aui.png
diff --git a/assets/resources/gui/aui.plist.meta b/assets/resources/gui/aui.plist.meta
index 3c868692..7c04acdb 100644
--- a/assets/resources/gui/aui.plist.meta
+++ b/assets/resources/gui/aui.plist.meta
@@ -15,11 +15,11 @@
"name": "Economy_Energy_02_Blue",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1697,
+ "trimX": 225,
+ "trimY": 1259,
"width": 86,
"height": 106,
"rawWidth": 128,
@@ -61,11 +61,11 @@
"name": "Group 70",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 616,
- "trimY": 1026,
+ "trimX": 277,
+ "trimY": 681,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -107,11 +107,11 @@
"name": "btn_medium_gray",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 205,
- "trimY": 1387,
+ "trimX": 568,
+ "trimY": 467,
"width": 193,
"height": 76,
"rawWidth": 193,
@@ -156,8 +156,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 205,
- "trimY": 1126,
+ "trimX": 320,
+ "trimY": 294,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -199,11 +199,11 @@
"name": "Consumable_Food_Bread_01",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 3,
- "trimX": 520,
- "trimY": 1392,
+ "trimX": 201,
+ "trimY": 1347,
"width": 116,
"height": 90,
"rawWidth": 128,
@@ -248,8 +248,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 729,
- "trimY": 1589,
+ "trimX": 313,
+ "trimY": 1466,
"width": 98,
"height": 114,
"rawWidth": 128,
@@ -294,8 +294,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 319,
- "trimY": 1895,
+ "trimX": 462,
+ "trimY": 1080,
"width": 102,
"height": 102,
"rawWidth": 128,
@@ -340,8 +340,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -2,
- "trimX": 196,
- "trimY": 1465,
+ "trimX": 195,
+ "trimY": 1439,
"width": 116,
"height": 102,
"rawWidth": 128,
@@ -386,8 +386,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 493,
- "trimY": 1734,
+ "trimX": 820,
+ "trimY": 948,
"width": 106,
"height": 106,
"rawWidth": 128,
@@ -432,8 +432,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 721,
- "trimY": 1689,
+ "trimX": 461,
+ "trimY": 1184,
"width": 106,
"height": 106,
"rawWidth": 128,
@@ -478,8 +478,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 383,
- "trimY": 1708,
+ "trimX": 573,
+ "trimY": 1015,
"width": 108,
"height": 98,
"rawWidth": 128,
@@ -524,8 +524,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1,
- "trimY": 1895,
+ "trimX": 791,
+ "trimY": 1056,
"width": 102,
"height": 104,
"rawWidth": 128,
@@ -570,8 +570,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 107,
- "trimY": 1895,
+ "trimX": 787,
+ "trimY": 1160,
"width": 102,
"height": 104,
"rawWidth": 128,
@@ -616,8 +616,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 213,
- "trimY": 1895,
+ "trimX": 786,
+ "trimY": 1264,
"width": 102,
"height": 104,
"rawWidth": 128,
@@ -662,8 +662,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -2,
- "trimX": 162,
- "trimY": 1569,
+ "trimX": 854,
+ "trimY": 763,
"width": 112,
"height": 96,
"rawWidth": 128,
@@ -708,8 +708,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 611,
- "trimY": 1651,
+ "trimX": 569,
+ "trimY": 1225,
"width": 98,
"height": 108,
"rawWidth": 128,
@@ -754,8 +754,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 733,
- "trimY": 1895,
+ "trimX": 784,
+ "trimY": 1368,
"width": 97,
"height": 97,
"rawWidth": 97,
@@ -800,8 +800,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 116,
- "trimY": 1492,
+ "trimX": 79,
+ "trimY": 1517,
"width": 52,
"height": 52,
"rawWidth": 64,
@@ -843,11 +843,11 @@
"name": "Group 66",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1048,
+ "trimX": 42,
+ "trimY": 879,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -889,11 +889,11 @@
"name": "Group 67",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 412,
- "trimY": 1026,
+ "trimX": 42,
+ "trimY": 1083,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -935,11 +935,11 @@
"name": "Group 69",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1231,
+ "trimX": 277,
+ "trimY": 477,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -981,11 +981,11 @@
"name": "Group 71",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 409,
- "trimY": 1209,
+ "trimX": 570,
+ "trimY": 113,
"width": 181,
"height": 202,
"rawWidth": 181,
@@ -1027,11 +1027,11 @@
"name": "Icon_Coin",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 902,
- "trimY": 247,
+ "trimX": 543,
+ "trimY": 1531,
"width": 38,
"height": 42,
"rawWidth": 38,
@@ -1076,8 +1076,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 845,
- "trimY": 1634,
+ "trimX": 759,
+ "trimY": 745,
"width": 71,
"height": 93,
"rawWidth": 71,
@@ -1119,11 +1119,11 @@
"name": "Item_Card_01_Blue",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -2,
- "trimX": 820,
- "trimY": 1041,
+ "trimX": 460,
+ "trimY": 747,
"width": 120,
"height": 110,
"rawWidth": 128,
@@ -1168,8 +1168,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 820,
- "trimY": 1153,
+ "trimX": 79,
+ "trimY": 1287,
"width": 120,
"height": 110,
"rawWidth": 128,
@@ -1211,11 +1211,11 @@
"name": "Item_Chest_01_Red",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 627,
- "trimY": 1895,
+ "trimX": 867,
+ "trimY": 657,
"width": 104,
"height": 100,
"rawWidth": 128,
@@ -1260,8 +1260,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 89,
- "trimY": 1779,
+ "trimX": 680,
+ "trimY": 1261,
"width": 104,
"height": 104,
"rawWidth": 128,
@@ -1306,8 +1306,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": -1,
- "trimX": 1,
- "trimY": 1607,
+ "trimX": 453,
+ "trimY": 1292,
"width": 88,
"height": 112,
"rawWidth": 128,
@@ -1349,11 +1349,11 @@
"name": "Item_Scroll_01_Red",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 732,
- "trimY": 1473,
+ "trimX": 79,
+ "trimY": 1399,
"width": 114,
"height": 116,
"rawWidth": 128,
@@ -1398,8 +1398,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 501,
- "trimY": 1624,
+ "trimX": 569,
+ "trimY": 1115,
"width": 108,
"height": 108,
"rawWidth": 128,
@@ -1441,11 +1441,11 @@
"name": "Prop_Mcarecrow_01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 741,
- "trimY": 1365,
+ "trimX": 225,
+ "trimY": 1137,
"width": 120,
"height": 106,
"rawWidth": 128,
@@ -1487,11 +1487,11 @@
"name": "Rectangle 2426",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 314,
- "trimY": 1465,
+ "trimX": 755,
+ "trimY": 662,
"width": 110,
"height": 81,
"rawWidth": 110,
@@ -1536,8 +1536,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1006,
+ "trimX": 524,
+ "trimY": 425,
"width": 204,
"height": 40,
"rawWidth": 204,
@@ -1579,11 +1579,11 @@
"name": "Rectangleligjht 2426_",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 850,
- "trimY": 1520,
+ "trimX": 437,
+ "trimY": 1382,
"width": 112,
"height": 90,
"rawWidth": 112,
@@ -1628,8 +1628,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 161,
- "trimY": 1667,
+ "trimX": 724,
+ "trimY": 550,
"width": 110,
"height": 110,
"rawWidth": 128,
@@ -1674,8 +1674,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 423,
- "trimY": 1895,
+ "trimX": 680,
+ "trimY": 1367,
"width": 102,
"height": 102,
"rawWidth": 128,
@@ -1717,11 +1717,11 @@
"name": "Stat_Power_01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 515,
- "trimY": 1510,
+ "trimX": 429,
+ "trimY": 1474,
"width": 94,
"height": 112,
"rawWidth": 128,
@@ -1766,8 +1766,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 601,
- "trimY": 1751,
+ "trimX": 551,
+ "trimY": 1425,
"width": 104,
"height": 106,
"rawWidth": 128,
@@ -1801,52 +1801,6 @@
],
"subMetas": {}
},
- "9bf16": {
- "importer": "sprite-frame",
- "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@9bf16",
- "displayName": "",
- "id": "9bf16",
- "name": "UI_Common_Lock_01_Silver",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": -1,
- "trimX": 397,
- "trimY": 1494,
- "width": 100,
- "height": 116,
- "rawWidth": 128,
- "rawHeight": 128,
- "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": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
- "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"ba14b": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@ba14b",
@@ -1858,8 +1812,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": -1,
- "trimX": 389,
- "trimY": 1596,
+ "trimX": 845,
+ "trimY": 435,
"width": 110,
"height": 110,
"rawWidth": 128,
@@ -1904,8 +1858,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 709,
- "trimY": 1797,
+ "trimX": 683,
+ "trimY": 1055,
"width": 106,
"height": 96,
"rawWidth": 128,
@@ -1947,11 +1901,11 @@
"name": "UI_Play_Map_01",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 273,
- "trimY": 1677,
+ "trimX": 867,
+ "trimY": 547,
"width": 108,
"height": 100,
"rawWidth": 128,
@@ -1996,8 +1950,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 808,
- "trimY": 1265,
+ "trimX": 334,
+ "trimY": 1080,
"width": 126,
"height": 98,
"rawWidth": 128,
@@ -2042,8 +1996,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 613,
- "trimY": 1365,
+ "trimX": 333,
+ "trimY": 1180,
"width": 126,
"height": 98,
"rawWidth": 128,
@@ -2088,8 +2042,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 2,
- "trimX": 829,
- "trimY": 1707,
+ "trimX": 679,
+ "trimY": 1153,
"width": 106,
"height": 106,
"rawWidth": 128,
@@ -2131,11 +2085,11 @@
"name": "UI_Social_Chat_02",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": -2,
- "trimX": 400,
- "trimY": 1392,
+ "trimX": 715,
+ "trimY": 828,
"width": 118,
"height": 100,
"rawWidth": 128,
@@ -2180,8 +2134,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 611,
- "trimY": 1553,
+ "trimX": 319,
+ "trimY": 1368,
"width": 116,
"height": 96,
"rawWidth": 128,
@@ -2226,8 +2180,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 612,
- "trimY": 1465,
+ "trimX": 333,
+ "trimY": 1280,
"width": 118,
"height": 86,
"rawWidth": 128,
@@ -2269,11 +2223,11 @@
"name": "UI_System_Setting_01",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 527,
- "trimY": 1895,
+ "trimX": 659,
+ "trimY": 1471,
"width": 102,
"height": 98,
"rawWidth": 128,
@@ -2318,8 +2272,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 344,
+ "trimX": 897,
+ "trimY": 1056,
"width": 46,
"height": 76,
"rawWidth": 46,
@@ -2364,8 +2318,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 422,
+ "trimX": 841,
+ "trimY": 1467,
"width": 46,
"height": 76,
"rawWidth": 46,
@@ -2407,11 +2361,11 @@
"name": "arrow3",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 291,
+ "trimX": 133,
+ "trimY": 1517,
"width": 51,
"height": 47,
"rawWidth": 51,
@@ -2456,8 +2410,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 500,
+ "trimX": 1,
+ "trimY": 1524,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -2499,11 +2453,11 @@
"name": "bg3",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 247,
+ "trimX": 225,
+ "trimY": 879,
"width": 227,
"height": 42,
"rawWidth": 227,
@@ -2548,8 +2502,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 66,
+ "trimX": 320,
+ "trimY": 113,
"width": 248,
"height": 179,
"rawWidth": 248,
@@ -2594,8 +2548,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 894,
+ "trimX": 320,
+ "trimY": 1,
"width": 405,
"height": 110,
"rawWidth": 405,
@@ -2637,11 +2591,11 @@
"name": "bg_line",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 1,
+ "trimX": 269,
+ "trimY": 885,
"width": 250,
"height": 63,
"rawWidth": 250,
@@ -2675,6 +2629,52 @@
],
"subMetas": {}
},
+ "4a554": {
+ "importer": "sprite-frame",
+ "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@4a554",
+ "displayName": "",
+ "id": "4a554",
+ "name": "btn_green",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 568,
+ "trimY": 662,
+ "width": 185,
+ "height": 81,
+ "rawWidth": 185,
+ "rawHeight": 81,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 92,
+ "borderRight": 92,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
+ "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"15f3b": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b",
@@ -2686,8 +2686,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 291,
+ "trimX": 727,
+ "trimY": 1,
"width": 216,
"height": 106,
"rawWidth": 216,
@@ -2729,11 +2729,11 @@
"name": "btn_large_brown",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 399,
+ "trimX": 753,
+ "trimY": 109,
"width": 216,
"height": 106,
"rawWidth": 216,
@@ -2775,11 +2775,11 @@
"name": "btn_large_green",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 507,
+ "trimX": 861,
+ "trimY": 109,
"width": 216,
"height": 106,
"rawWidth": 216,
@@ -2824,8 +2824,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 451,
- "trimY": 534,
+ "trimX": 524,
+ "trimY": 317,
"width": 216,
"height": 106,
"rawWidth": 216,
@@ -2870,8 +2870,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 449,
- "trimY": 642,
+ "trimX": 742,
+ "trimY": 327,
"width": 216,
"height": 106,
"rawWidth": 216,
@@ -2913,11 +2913,11 @@
"name": "btn_medium_blue",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 205,
- "trimY": 1309,
+ "trimX": 334,
+ "trimY": 885,
"width": 193,
"height": 76,
"rawWidth": 193,
@@ -2959,11 +2959,11 @@
"name": "btn_medium_green",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1414,
+ "trimX": 646,
+ "trimY": 467,
"width": 193,
"height": 76,
"rawWidth": 193,
@@ -3005,11 +3005,11 @@
"name": "btn_medium_red",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 613,
- "trimY": 1209,
+ "trimX": 412,
+ "trimY": 885,
"width": 193,
"height": 76,
"rawWidth": 193,
@@ -3051,11 +3051,11 @@
"name": "btn_medium_yellow",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 613,
- "trimY": 1287,
+ "trimX": 1,
+ "trimY": 1329,
"width": 193,
"height": 76,
"rawWidth": 193,
@@ -3100,8 +3100,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1808,
+ "trimX": 817,
+ "trimY": 861,
"width": 85,
"height": 86,
"rawWidth": 85,
@@ -3135,6 +3135,98 @@
],
"subMetas": {}
},
+ "fd2c3": {
+ "importer": "sprite-frame",
+ "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@fd2c3",
+ "displayName": "",
+ "id": "fd2c3",
+ "name": "btn_red",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 572,
+ "trimY": 745,
+ "width": 185,
+ "height": 81,
+ "rawWidth": 185,
+ "rawHeight": 81,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 92,
+ "borderRight": 92,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
+ "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "e9165": {
+ "importer": "sprite-frame",
+ "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e9165",
+ "displayName": "",
+ "id": "e9165",
+ "name": "btn_sky",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 490,
+ "trimY": 869,
+ "width": 185,
+ "height": 81,
+ "rawWidth": 185,
+ "rawHeight": 81,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 92,
+ "borderRight": 92,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
+ "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"ac343": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@ac343",
@@ -3143,11 +3235,11 @@
"name": "btn_start",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 669,
- "trimY": 638,
+ "trimX": 460,
+ "trimY": 477,
"width": 268,
"height": 106,
"rawWidth": 268,
@@ -3181,6 +3273,52 @@
],
"subMetas": {}
},
+ "b2501": {
+ "importer": "sprite-frame",
+ "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@b2501",
+ "displayName": "",
+ "id": "b2501",
+ "name": "btn_yellow",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 573,
+ "trimY": 828,
+ "width": 185,
+ "height": 81,
+ "rawWidth": 185,
+ "rawHeight": 81,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 92.25,
+ "borderRight": 92.25,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
+ "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"09987": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@09987",
@@ -3192,8 +3330,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 863,
- "trimY": 1365,
+ "trimX": 763,
+ "trimY": 1471,
"width": 80,
"height": 76,
"rawWidth": 80,
@@ -3235,11 +3373,11 @@
"name": "common_btn_close",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 832,
- "trimY": 1815,
+ "trimX": 715,
+ "trimY": 948,
"width": 103,
"height": 105,
"rawWidth": 103,
@@ -3281,11 +3419,11 @@
"name": "deco",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 534,
+ "trimY": 879,
"width": 448,
"height": 39,
"rawWidth": 448,
@@ -3327,11 +3465,11 @@
"name": "eff",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 575,
+ "trimY": 1,
"width": 317,
"height": 446,
"rawWidth": 317,
@@ -3376,8 +3514,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 879,
- "trimY": 985,
+ "trimX": 889,
+ "trimY": 1446,
"width": 54,
"height": 54,
"rawWidth": 54,
@@ -3422,8 +3560,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 276,
- "trimY": 1577,
+ "trimX": 567,
+ "trimY": 1325,
"width": 98,
"height": 111,
"rawWidth": 98,
@@ -3468,8 +3606,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 408,
- "trimY": 931,
+ "trimX": 47,
+ "trimY": 1524,
"width": 30,
"height": 30,
"rawWidth": 30,
@@ -3514,8 +3652,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1492,
+ "trimX": 730,
+ "trimY": 435,
"width": 113,
"height": 113,
"rawWidth": 113,
@@ -3549,52 +3687,6 @@
],
"subMetas": {}
},
- "808ea": {
- "importer": "sprite-frame",
- "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@808ea",
- "displayName": "",
- "id": "808ea",
- "name": "illust",
- "userData": {
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 207,
- "trimY": 1006,
- "width": 203,
- "height": 118,
- "rawWidth": 203,
- "rawHeight": 118,
- "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": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
- "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"d1068": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@d1068",
@@ -3603,11 +3695,11 @@
"name": "lock",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 408,
- "trimY": 894,
+ "trimX": 42,
+ "trimY": 1287,
"width": 35,
"height": 39,
"rawWidth": 35,
@@ -3652,8 +3744,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 879,
- "trimY": 746,
+ "trimX": 905,
+ "trimY": 861,
"width": 58,
"height": 65,
"rawWidth": 58,
@@ -3698,8 +3790,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 879,
- "trimY": 813,
+ "trimX": 656,
+ "trimY": 828,
"width": 170,
"height": 57,
"rawWidth": 170,
@@ -3741,11 +3833,11 @@
"name": "popup",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 449,
- "trimY": 750,
+ "trimX": 1,
+ "trimY": 449,
"width": 428,
"height": 274,
"rawWidth": 428,
@@ -3787,11 +3879,11 @@
"name": "reset",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 863,
- "trimY": 1447,
+ "trimX": 883,
+ "trimY": 1368,
"width": 76,
"height": 71,
"rawWidth": 76,
@@ -3825,52 +3917,6 @@
],
"subMetas": {}
},
- "c1a5c": {
- "importer": "sprite-frame",
- "uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@c1a5c",
- "displayName": "",
- "id": "c1a5c",
- "name": "ribbon",
- "userData": {
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 1,
- "width": 670,
- "height": 531,
- "rawWidth": 670,
- "rawHeight": 531,
- "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": "9386d02f-0d02-4019-99ee-2b6c3759cbbb@6c48a",
- "atlasUuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"3b9a1": {
"importer": "sprite-frame",
"uuid": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@3b9a1",
@@ -3882,8 +3928,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 546,
+ "trimX": 889,
+ "trimY": 1502,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -3928,8 +3974,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 891,
- "trimY": 592,
+ "trimX": 897,
+ "trimY": 1134,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -3974,8 +4020,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 116,
- "trimY": 1546,
+ "trimX": 893,
+ "trimY": 1180,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -4020,8 +4066,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 116,
- "trimY": 1592,
+ "trimX": 893,
+ "trimY": 1226,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -4066,8 +4112,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 115,
- "trimY": 1638,
+ "trimX": 892,
+ "trimY": 1272,
"width": 44,
"height": 44,
"rawWidth": 44,
diff --git a/assets/resources/gui/aui.png b/assets/resources/gui/aui.png
index 2be7335c..4a683989 100644
Binary files a/assets/resources/gui/aui.png and b/assets/resources/gui/aui.png differ
diff --git a/assets/resources/gui/element/card.prefab b/assets/resources/gui/element/card.prefab
index fa801630..705115bf 100644
--- a/assets/resources/gui/element/card.prefab
+++ b/assets/resources/gui/element/card.prefab
@@ -1453,12 +1453,12 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -1468,7 +1468,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
diff --git a/assets/resources/gui/element/victory.prefab b/assets/resources/gui/element/victory.prefab
index c14d1131..7e956426 100644
--- a/assets/resources/gui/element/victory.prefab
+++ b/assets/resources/gui/element/victory.prefab
@@ -120,8 +120,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1.5,
- "y": 1.5,
+ "x": 1.8,
+ "y": 1.8,
"z": 1
},
"_mobility": 0,
@@ -148,8 +148,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 486.666666666667,
- "height": 860
+ "width": 432,
+ "height": 936
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -185,12 +185,12 @@
"a": 233
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7f50d",
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@d3496",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 1,
+ "_type": 0,
"_fillType": 0,
- "_sizeMode": 0,
+ "_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -201,7 +201,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780",
"__expectedType__": "cc.SpriteAtlas"
},
"_id": ""
@@ -218,16 +218,16 @@
"node": {
"__id__": 2
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
"__id__": 8
},
"_alignFlags": 45,
"_target": null,
- "_left": -5,
- "_right": -5,
- "_top": -5,
- "_bottom": -5,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -299,7 +299,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 0,
+ "y": 157.73999999999995,
"z": 0
},
"_lrot": {
@@ -512,7 +512,7 @@
"__id__": 10
},
"_children": [],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 20
@@ -1049,7 +1049,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -230,
+ "y": -514.6,
"z": 0
},
"_lrot": {
@@ -1158,7 +1158,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -73.65484619140625,
+ "x": -93.65484619140625,
"y": 0,
"z": 0
},
@@ -1397,7 +1397,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 140,
+ "width": 180,
"height": 50.4
},
"_anchorPoint": {
@@ -1542,7 +1542,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 300,
+ "width": 340,
"height": 40
},
"_anchorPoint": {
@@ -1635,8 +1635,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 139.99999999999972,
- "y": 25,
+ "x": -160.00000000000028,
+ "y": -15,
"z": 0
},
"_lrot": {
@@ -1688,7 +1688,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -73.65484619140625,
+ "x": -93.65484619140625,
"y": 0,
"z": 0
},
@@ -1927,7 +1927,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 140,
+ "width": 180,
"height": 50.4
},
"_anchorPoint": {
@@ -2072,7 +2072,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 300,
+ "width": 340,
"height": 40
},
"_anchorPoint": {
@@ -2100,8 +2100,8 @@
},
"_alignFlags": 40,
"_target": null,
- "_left": 320,
- "_right": 40.00000000000057,
+ "_left": 20,
+ "_right": 340.00000000000057,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
@@ -2166,7 +2166,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": -160.00000000000028,
- "y": -15,
+ "y": -55,
"z": 0
},
"_lrot": {
@@ -2218,7 +2218,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -73.65484619140625,
+ "x": -93.65484619140625,
"y": 0,
"z": 0
},
@@ -2457,7 +2457,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 140,
+ "width": 180,
"height": 50.4
},
"_anchorPoint": {
@@ -2602,7 +2602,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 300,
+ "width": 340,
"height": 40
},
"_anchorPoint": {
@@ -2695,8 +2695,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 139.99999999999972,
- "y": -15,
+ "x": -160.00000000000028,
+ "y": -95,
"z": 0
},
"_lrot": {
@@ -2748,7 +2748,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -73.65484619140625,
+ "x": -93.65484619140625,
"y": 0,
"z": 0
},
@@ -2987,7 +2987,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 140,
+ "width": 180,
"height": 50.4
},
"_anchorPoint": {
@@ -3132,7 +3132,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 300,
+ "width": 340,
"height": 40
},
"_anchorPoint": {
@@ -3160,8 +3160,8 @@
},
"_alignFlags": 40,
"_target": null,
- "_left": 320,
- "_right": 40.00000000000057,
+ "_left": 20,
+ "_right": 340.00000000000057,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
@@ -3209,7 +3209,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 660.0000000000006,
+ "width": 700.0000000000006,
"height": 120
},
"_anchorPoint": {
@@ -3237,10 +3237,10 @@
},
"_alignFlags": 44,
"_target": null,
- "_left": 30,
- "_right": 30,
+ "_left": 10,
+ "_right": 10,
"_top": 625.809,
- "_bottom": 150,
+ "_bottom": -134.60000000000002,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -3402,8 +3402,8 @@
"_target": null,
"_left": 0,
"_right": 0,
- "_top": 200,
- "_bottom": 200,
+ "_top": 42.25999999999996,
+ "_bottom": 357.73999999999995,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -3472,7 +3472,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -355.633,
+ "y": -531.734,
"z": 0
},
"_lrot": {
@@ -3528,7 +3528,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -410,
+ "x": -205,
"y": 0,
"z": 0
},
@@ -3765,7 +3765,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e9165",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -3903,7 +3903,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -70,
+ "x": 135,
"y": 0,
"z": 0
},
@@ -4140,7 +4140,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7645f",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@4a554",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -4261,7 +4261,7 @@
"__id__": 176
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 182
@@ -4637,7 +4637,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 1120,
+ "width": 710,
"height": 100
},
"_anchorPoint": {
@@ -4706,7 +4706,7 @@
"_left": 0,
"_right": 0,
"_top": 0,
- "_bottom": 234.36700000000002,
+ "_bottom": 58.26599999999996,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 7947d877..05e99adf 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -8404,7 +8404,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e9165",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -8582,7 +8582,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@15f3b",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@e9165",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -10046,7 +10046,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@3c9ae",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@b2501",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -11260,7 +11260,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7645f",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@4a554",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -12297,10 +12297,7 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
- "__expectedType__": "cc.SpriteFrame"
- },
+ "_spriteFrame": null,
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
@@ -12746,7 +12743,7 @@
"_spriteFrame"
],
"value": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@ac343",
+ "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@fd2c3",
"__expectedType__": "cc.SpriteFrame"
}
},
diff --git a/assets/resources/gui/umps.plist b/assets/resources/gui/umps.plist
index 1e37d6d4..3db65426 100644
--- a/assets/resources/gui/umps.plist
+++ b/assets/resources/gui/umps.plist
@@ -4,7 +4,7 @@
frames
- Background_01.png
+ 0_User_Name.png
aliases
@@ -13,66 +13,15 @@
spriteOffset
{0,0}
spriteSize
- {486,999}
+ {432,936}
spriteSourceSize
- {486,999}
+ {432,936}
textureRect
- {{963,1},{486,999}}
- textureRotated
-
-
- BackgroundsGradient09.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{1,1125},{16,512}}
- textureRotated
-
-
- BackgroundsGradient14.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{1,1143},{16,512}}
- textureRotated
-
-
- BackgroundsGradient18.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{1925,489},{16,512}}
+ {{1,543},{432,936}}
textureRotated
- BackgroundsGradient19.png
+ 6_Collection_Detail_2_Uncommon.png
aliases
@@ -81,15 +30,15 @@
spriteOffset
{0,0}
spriteSize
- {16,512}
+ {432,936}
spriteSourceSize
- {16,512}
+ {432,936}
textureRect
- {{1943,489},{16,512}}
+ {{435,543},{432,936}}
textureRotated
- BackgroundsGradient20.png
+ 9_PopupFullScreen_RewardItems.png
aliases
@@ -98,62 +47,11 @@
spriteOffset
{0,0}
spriteSize
- {16,512}
+ {432,936}
spriteSourceSize
- {16,512}
+ {432,936}
textureRect
- {{515,1131},{16,512}}
- textureRotated
-
-
- BackgroundsGradient21.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{515,1149},{16,512}}
- textureRotated
-
-
- BackgroundsGradient22.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{1029,1131},{16,512}}
- textureRotated
-
-
- BackgroundsGradient23.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {0,0}
- spriteSize
- {16,512}
- spriteSourceSize
- {16,512}
- textureRect
- {{1029,1149},{16,512}}
+ {{893,963},{432,936}}
textureRotated
@@ -187,9 +85,9 @@
spriteSourceSize
{960,540}
textureRect
- {{1,543},{960,354}}
+ {{963,1},{960,354}}
textureRotated
-
+
l3_clouds.png
@@ -204,7 +102,7 @@
spriteSourceSize
{960,540}
textureRect
- {{963,987},{832,142}}
+ {{1,1481},{832,142}}
textureRotated
@@ -221,7 +119,7 @@
spriteSourceSize
{960,540}
textureRect
- {{1,899},{960,224}}
+ {{893,1397},{960,224}}
textureRotated
@@ -238,9 +136,9 @@
spriteSourceSize
{960,540}
textureRect
- {{963,761},{960,224}}
+ {{1591,1},{960,224}}
textureRotated
-
+
l6_ground.png
@@ -255,9 +153,9 @@
spriteSourceSize
{960,540}
textureRect
- {{963,489},{960,270}}
+ {{1319,1},{960,270}}
textureRotated
-
+
l7_ground.png
@@ -272,7 +170,7 @@
spriteSourceSize
{960,22}
textureRect
- {{1964,1},{960,22}}
+ {{869,543},{960,22}}
textureRotated
@@ -288,9 +186,9 @@
realTextureFileName
umps.png
size
- {1987,1166}
+ {1854,1624}
smartupdate
- $TexturePacker:SmartUpdate:9163736a3f4a468332e628a9e68b5f85:60ccae662d592612b5b381325f26b442:318abc3a8f3ad8d09018e87dff1f2449$
+ $TexturePacker:SmartUpdate:7bdf5ebf9b96a48b6ad0a97b3e47162f:5e4e2e7442be7c58b998030762951bd2:318abc3a8f3ad8d09018e87dff1f2449$
textureFileName
umps.png
diff --git a/assets/resources/gui/umps.plist.meta b/assets/resources/gui/umps.plist.meta
index 11c368dd..483b3978 100644
--- a/assets/resources/gui/umps.plist.meta
+++ b/assets/resources/gui/umps.plist.meta
@@ -7,161 +7,23 @@
".json"
],
"subMetas": {
- "8b868": {
+ "40168": {
"importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@40168",
"displayName": "",
- "id": "8b868",
- "name": "Background_01",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 963,
- "trimY": 1,
- "width": 486,
- "height": 999,
- "rawWidth": 486,
- "rawHeight": 999,
- "borderTop": 0,
- "borderBottom": 997,
- "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": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "6a155": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@6a155",
- "displayName": "",
- "id": "6a155",
- "name": "BackgroundsGradient09",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 1125,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
- "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": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "577e1": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@577e1",
- "displayName": "",
- "id": "577e1",
- "name": "BackgroundsGradient14",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 1143,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
- "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": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "dc000": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@dc000",
- "displayName": "",
- "id": "dc000",
- "name": "BackgroundsGradient18",
+ "id": "40168",
+ "name": "6_Collection_Detail_2_Uncommon",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1925,
- "trimY": 489,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
+ "trimX": 435,
+ "trimY": 543,
+ "width": 432,
+ "height": 936,
+ "rawWidth": 432,
+ "rawHeight": 936,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -191,69 +53,23 @@
],
"subMetas": {}
},
- "858ff": {
+ "1e2d6": {
"importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@858ff",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@1e2d6",
"displayName": "",
- "id": "858ff",
- "name": "BackgroundsGradient19",
+ "id": "1e2d6",
+ "name": "0_User_Name",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1943,
- "trimY": 489,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
- "borderTop": 0,
- "borderBottom": 504,
- "borderLeft": 8,
- "borderRight": 7,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "dde68": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@dde68",
- "displayName": "",
- "id": "dde68",
- "name": "BackgroundsGradient20",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 515,
- "trimY": 1131,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
+ "trimX": 1,
+ "trimY": 543,
+ "width": 432,
+ "height": 936,
+ "rawWidth": 432,
+ "rawHeight": 936,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -283,115 +99,23 @@
],
"subMetas": {}
},
- "afacc": {
+ "d3496": {
"importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@afacc",
+ "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@d3496",
"displayName": "",
- "id": "afacc",
- "name": "BackgroundsGradient21",
+ "id": "d3496",
+ "name": "9_PopupFullScreen_RewardItems",
"userData": {
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 515,
- "trimY": 1149,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
- "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": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "ff843": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@ff843",
- "displayName": "",
- "id": "ff843",
- "name": "BackgroundsGradient22",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1029,
- "trimY": 1131,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
- "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": "cd375c0d-bb84-48dc-a7ec-334d7ce1471b@6c48a",
- "atlasUuid": "d7d869bc-06aa-4876-806f-487e68b96780",
- "trimType": "auto"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "3a313": {
- "importer": "sprite-frame",
- "uuid": "d7d869bc-06aa-4876-806f-487e68b96780@3a313",
- "displayName": "",
- "id": "3a313",
- "name": "BackgroundsGradient23",
- "userData": {
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1029,
- "trimY": 1149,
- "width": 16,
- "height": 512,
- "rawWidth": 16,
- "rawHeight": 512,
+ "trimX": 893,
+ "trimY": 963,
+ "width": 432,
+ "height": 936,
+ "rawWidth": 432,
+ "rawHeight": 936,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -475,11 +199,11 @@
"name": "l2_mountains",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -93,
- "trimX": 1,
- "trimY": 543,
+ "trimX": 963,
+ "trimY": 1,
"width": 960,
"height": 354,
"rawWidth": 960,
@@ -524,8 +248,8 @@
"rotated": false,
"offsetX": -9,
"offsetY": 127,
- "trimX": 963,
- "trimY": 987,
+ "trimX": 1,
+ "trimY": 1481,
"width": 832,
"height": 142,
"rawWidth": 960,
@@ -570,8 +294,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -158,
- "trimX": 1,
- "trimY": 899,
+ "trimX": 893,
+ "trimY": 1397,
"width": 960,
"height": 224,
"rawWidth": 960,
@@ -613,11 +337,11 @@
"name": "l5_bg-ground02",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -158,
- "trimX": 963,
- "trimY": 761,
+ "trimX": 1591,
+ "trimY": 1,
"width": 960,
"height": 224,
"rawWidth": 960,
@@ -659,11 +383,11 @@
"name": "l6_ground",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -135,
- "trimX": 963,
- "trimY": 489,
+ "trimX": 1319,
+ "trimY": 1,
"width": 960,
"height": 270,
"rawWidth": 960,
@@ -708,8 +432,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1964,
- "trimY": 1,
+ "trimX": 869,
+ "trimY": 543,
"width": 960,
"height": 22,
"rawWidth": 960,
diff --git a/assets/resources/gui/umps.png b/assets/resources/gui/umps.png
index eed951ec..62bd9d26 100644
Binary files a/assets/resources/gui/umps.png and b/assets/resources/gui/umps.png differ
diff --git a/assets/resources/loading/prefab/loading.prefab b/assets/resources/loading/prefab/loading.prefab
index 4a7c85d7..45c1f0eb 100644
--- a/assets/resources/loading/prefab/loading.prefab
+++ b/assets/resources/loading/prefab/loading.prefab
@@ -25,10 +25,10 @@
"__id__": 8
},
{
- "__id__": 16
+ "__id__": 62
},
{
- "__id__": 70
+ "__id__": 78
}
],
"_active": true,
@@ -99,7 +99,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 0,
+ "y": -184.565,
"z": 0
},
"_lrot": {
@@ -111,8 +111,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 2.4,
- "y": 2.4,
+ "x": 2,
+ "y": 2,
"z": 1
},
"_mobility": 0,
@@ -139,8 +139,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 324,
- "height": 666
+ "width": 432,
+ "height": 936
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -176,12 +176,12 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@8b868",
+ "__uuid__": "d7d869bc-06aa-4876-806f-487e68b96780@40168",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 0,
+ "_type": 1,
"_fillType": 0,
- "_sizeMode": 0,
+ "_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -214,184 +214,6 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
- {
- "__type__": "cc.Node",
- "_name": "logo-001",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 9
- },
- {
- "__id__": 11
- },
- {
- "__id__": 13
- }
- ],
- "_prefab": {
- "__id__": 15
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": -1.052,
- "y": 286.88,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1.5,
- "y": 1.5,
- "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__": 8
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 10
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 421,
- "height": 132
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "eb2AkLXgZLh7sLNWNvioUO"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 8
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 12
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@a557f",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": {
- "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
- "__expectedType__": "cc.SpriteAtlas"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "30mkWlnGVJOrpGmFdDAZBK"
- },
- {
- "__type__": "cc.Widget",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 8
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 14
- },
- "_alignFlags": 2,
- "_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
- "_horizontalCenter": 0,
- "_verticalCenter": 286.88,
- "_isAbsLeft": true,
- "_isAbsRight": true,
- "_isAbsTop": true,
- "_isAbsBottom": true,
- "_isAbsHorizontalCenter": true,
- "_isAbsVerticalCenter": true,
- "_originalWidth": 0,
- "_originalHeight": 0,
- "_alignMode": 2,
- "_lockFlags": 0,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "6aDD9Yj0RIHplo9L7nkr1g"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "04BQx3R5FH9qial5iEzI75",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
{
"__type__": "cc.Node",
"_name": "pro_progress",
@@ -402,41 +224,41 @@
},
"_children": [
{
- "__id__": 17
+ "__id__": 9
},
{
- "__id__": 23
+ "__id__": 15
+ },
+ {
+ "__id__": 25
},
{
"__id__": 33
},
{
"__id__": 41
- },
- {
- "__id__": 49
}
],
"_active": true,
"_components": [
+ {
+ "__id__": 51
+ },
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 57
+ },
{
"__id__": 59
- },
- {
- "__id__": 61
- },
- {
- "__id__": 63
- },
- {
- "__id__": 65
- },
- {
- "__id__": 67
}
],
"_prefab": {
- "__id__": 69
+ "__id__": 61
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -473,20 +295,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 18
+ "__id__": 10
},
{
- "__id__": 20
+ "__id__": 12
}
],
"_prefab": {
- "__id__": 22
+ "__id__": 14
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -523,11 +345,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 9
},
"_enabled": true,
"__prefab": {
- "__id__": 19
+ "__id__": 11
},
"_contentSize": {
"__type__": "cc.Size",
@@ -551,11 +373,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 9
},
"_enabled": true,
"__prefab": {
- "__id__": 21
+ "__id__": 13
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -568,7 +390,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@f96ec",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@61404",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 3,
@@ -612,26 +434,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 24
+ "__id__": 16
},
{
- "__id__": 26
+ "__id__": 18
},
{
- "__id__": 28
+ "__id__": 20
},
{
- "__id__": 30
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 32
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -668,11 +490,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 23
+ "__id__": 15
},
"_enabled": true,
"__prefab": {
- "__id__": 25
+ "__id__": 17
},
"_contentSize": {
"__type__": "cc.Size",
@@ -696,11 +518,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 23
+ "__id__": 15
},
"_enabled": true,
"__prefab": {
- "__id__": 27
+ "__id__": 19
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -764,11 +586,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 23
+ "__id__": 15
},
"_enabled": true,
"__prefab": {
- "__id__": 29
+ "__id__": 21
},
"_id": ""
},
@@ -782,11 +604,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 23
+ "__id__": 15
},
"_enabled": true,
"__prefab": {
- "__id__": 31
+ "__id__": 23
},
"templateMode": true,
"watchPath": "",
@@ -819,23 +641,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 34
+ "__id__": 26
},
{
- "__id__": 36
+ "__id__": 28
},
{
- "__id__": 38
+ "__id__": 30
}
],
"_prefab": {
- "__id__": 40
+ "__id__": 32
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -872,11 +694,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 35
+ "__id__": 27
},
"_contentSize": {
"__type__": "cc.Size",
@@ -900,11 +722,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 37
+ "__id__": 29
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -948,11 +770,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 25
},
"_enabled": true,
"__prefab": {
- "__id__": 39
+ "__id__": 31
},
"_alignFlags": 45,
"_target": null,
@@ -997,23 +819,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 42
+ "__id__": 34
},
{
- "__id__": 44
+ "__id__": 36
},
{
- "__id__": 46
+ "__id__": 38
}
],
"_prefab": {
- "__id__": 48
+ "__id__": 40
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1050,11 +872,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 41
+ "__id__": 33
},
"_enabled": true,
"__prefab": {
- "__id__": 43
+ "__id__": 35
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1078,11 +900,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 41
+ "__id__": 33
},
"_enabled": true,
"__prefab": {
- "__id__": 45
+ "__id__": 37
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1126,11 +948,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 41
+ "__id__": 33
},
"_enabled": true,
"__prefab": {
- "__id__": 47
+ "__id__": 39
},
"playOnLoad": true,
"_clips": [
@@ -1168,26 +990,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 8
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 50
+ "__id__": 42
},
{
- "__id__": 52
+ "__id__": 44
},
{
- "__id__": 54
+ "__id__": 46
},
{
- "__id__": 56
+ "__id__": 48
}
],
"_prefab": {
- "__id__": 58
+ "__id__": 50
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1224,11 +1046,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 49
+ "__id__": 41
},
"_enabled": true,
"__prefab": {
- "__id__": 51
+ "__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1252,11 +1074,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 49
+ "__id__": 41
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 45
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1320,11 +1142,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 49
+ "__id__": 41
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 47
},
"_id": ""
},
@@ -1338,11 +1160,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 49
+ "__id__": 41
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 49
},
"templateMode": false,
"watchPath": "*.prompt",
@@ -1373,11 +1195,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 60
+ "__id__": 52
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1401,11 +1223,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 54
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1446,14 +1268,14 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 64
+ "__id__": 56
},
"_barSprite": {
- "__id__": 20
+ "__id__": 12
},
"_mode": 2,
"_totalLength": 1,
@@ -1471,11 +1293,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 66
+ "__id__": 58
},
"controller": false,
"watchPath": "",
@@ -1499,11 +1321,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 68
+ "__id__": 60
},
"_alignFlags": 42,
"_target": null,
@@ -1552,20 +1374,20 @@
},
"_children": [
{
- "__id__": 71
+ "__id__": 63
},
{
- "__id__": 77
+ "__id__": 69
}
],
"_active": true,
"_components": [
{
- "__id__": 83
+ "__id__": 75
}
],
"_prefab": {
- "__id__": 85
+ "__id__": 77
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1602,20 +1424,20 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 70
+ "__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 72
+ "__id__": 64
},
{
- "__id__": 74
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 76
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1652,11 +1474,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 71
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 73
+ "__id__": 65
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1680,11 +1502,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 71
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 75
+ "__id__": 67
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1761,20 +1583,20 @@
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
- "__id__": 70
+ "__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 78
+ "__id__": 70
},
{
- "__id__": 80
+ "__id__": 72
}
],
"_prefab": {
- "__id__": 82
+ "__id__": 74
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1811,11 +1633,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 77
+ "__id__": 69
},
"_enabled": true,
"__prefab": {
- "__id__": 79
+ "__id__": 71
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1839,11 +1661,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 77
+ "__id__": 69
},
"_enabled": true,
"__prefab": {
- "__id__": 81
+ "__id__": 73
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1920,11 +1742,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 70
+ "__id__": 62
},
"_enabled": true,
"__prefab": {
- "__id__": 84
+ "__id__": 76
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1955,6 +1777,184 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "logo-001",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "_prefab": {
+ "__id__": 85
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -1.052,
+ "y": 286.88,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.5,
+ "y": 1.5,
+ "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__": 78
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 80
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 421,
+ "height": 132
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "eb2AkLXgZLh7sLNWNvioUO"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 78
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 82
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@a557f",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "30mkWlnGVJOrpGmFdDAZBK"
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 78
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 84
+ },
+ "_alignFlags": 2,
+ "_target": null,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_horizontalCenter": 0,
+ "_verticalCenter": 286.88,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 0,
+ "_alignMode": 2,
+ "_lockFlags": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "6aDD9Yj0RIHplo9L7nkr1g"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "04BQx3R5FH9qial5iEzI75",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "loading",