diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist
index d2514c14..cfe7485c 100644
--- a/assets/resources/gui/gui.plist
+++ b/assets/resources/gui/gui.plist
@@ -15,9 +15,9 @@
spriteSourceSize
{94,118}
textureRect
- {{1772,957},{94,118}}
+ {{1573,543},{94,118}}
textureRotated
-
+
02.png
@@ -30,7 +30,7 @@
spriteSourceSize
{64,63}
textureRect
- {{1825,635},{64,63}}
+ {{405,443},{64,63}}
textureRotated
@@ -45,37 +45,7 @@
spriteSourceSize
{64,62}
textureRect
- {{1823,700},{64,62}}
- textureRotated
-
-
- 04.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {744,276}
- spriteSourceSize
- {744,276}
- textureRect
- {{1,1},{744,276}}
- textureRotated
-
-
- 15.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {328,454}
- spriteSourceSize
- {328,454}
- textureRect
- {{279,1},{328,454}}
+ {{1476,898},{64,62}}
textureRotated
@@ -90,9 +60,9 @@
spriteSourceSize
{403,123}
textureRect
- {{520,733},{403,123}}
+ {{1213,1},{403,123}}
textureRotated
-
+
21.png
@@ -105,25 +75,10 @@
spriteSourceSize
{190,178}
textureRect
- {{1381,850},{190,178}}
+ {{276,787},{190,178}}
textureRotated
- 27.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {252,204}
- spriteSourceSize
- {252,204}
- textureRect
- {{1410,1},{252,204}}
- textureRotated
-
-
28.png
aliases
@@ -135,7 +90,7 @@
spriteSourceSize
{244,274}
textureRect
- {{499,457},{244,274}}
+ {{234,511},{244,274}}
textureRotated
@@ -150,7 +105,7 @@
spriteSourceSize
{254,256}
textureRect
- {{1626,1},{254,256}}
+ {{1196,215},{254,256}}
textureRotated
@@ -165,7 +120,7 @@
spriteSourceSize
{256,244}
textureRect
- {{1636,257},{256,244}}
+ {{1454,257},{256,244}}
textureRotated
@@ -180,9 +135,9 @@
spriteSourceSize
{122,98}
textureRect
- {{1381,631},{122,98}}
+ {{1476,774},{122,98}}
textureRotated
-
+
43.png
@@ -195,7 +150,7 @@
spriteSourceSize
{100,100}
textureRect
- {{1305,1361},{100,100}}
+ {{1786,655},{100,100}}
textureRotated
@@ -210,9 +165,9 @@
spriteSourceSize
{82,94}
textureRect
- {{1807,1361},{82,94}}
+ {{981,841},{82,94}}
textureRotated
-
+
57.png
@@ -225,9 +180,9 @@
spriteSourceSize
{90,104}
textureRect
- {{1198,1255},{90,104}}
+ {{767,841},{90,104}}
textureRotated
-
+
58.png
@@ -240,7 +195,7 @@
spriteSourceSize
{100,96}
textureRect
- {{1407,1119},{100,96}}
+ {{1683,759},{100,96}}
textureRotated
@@ -255,7 +210,7 @@
spriteSourceSize
{84,106}
textureRect
- {{1290,1119},{84,106}}
+ {{873,841},{84,106}}
textureRotated
@@ -270,9 +225,9 @@
spriteSourceSize
{82,100}
textureRect
- {{1407,1311},{82,100}}
+ {{1739,857},{82,100}}
textureRotated
-
+
Artboard 13.png
@@ -285,9 +240,9 @@
spriteSourceSize
{321,299}
textureRect
- {{1111,405},{257,261}}
+ {{816,582},{257,261}}
textureRotated
-
+
Artboard 15.png
@@ -300,9 +255,9 @@
spriteSourceSize
{337,265}
textureRect
- {{693,1154},{273,219}}
+ {{809,171},{273,219}}
textureRotated
-
+
Artboard 16.png
@@ -315,9 +270,9 @@
spriteSourceSize
{360,106}
textureRect
- {{1104,1119},{334,92}}
+ {{480,717},{334,92}}
textureRotated
-
+
Artboard 17.png
@@ -330,9 +285,9 @@
spriteSourceSize
{360,112}
textureRect
- {{1008,1119},{344,94}}
+ {{772,392},{344,94}}
textureRotated
-
+
Artboard 18.png
@@ -345,9 +300,9 @@
spriteSourceSize
{360,114}
textureRect
- {{914,1124},{336,92}}
+ {{746,488},{336,92}}
textureRotated
-
+
Artboard 27.png
@@ -360,9 +315,9 @@
spriteSourceSize
{389,124}
textureRect
- {{1308,1},{365,100}}
+ {{405,341},{365,100}}
textureRotated
-
+
Artboard 28.png
@@ -375,7 +330,7 @@
spriteSourceSize
{386,109}
textureRect
- {{1155,1030},{352,87}}
+ {{1213,126},{352,87}}
textureRotated
@@ -390,9 +345,9 @@
spriteSourceSize
{466,216}
textureRect
- {{645,733},{402,168}}
+ {{1,1},{402,168}}
textureRotated
-
+
Artboard 32 copy 3.png
@@ -405,9 +360,9 @@
spriteSourceSize
{466,216}
textureRect
- {{609,1},{402,168}}
+ {{1,171},{402,168}}
textureRotated
-
+
Artboard 32 copy 4.png
@@ -420,9 +375,9 @@
spriteSourceSize
{466,216}
textureRect
- {{779,1},{402,168}}
+ {{405,1},{402,168}}
textureRotated
-
+
Artboard 32 copy 5.png
@@ -435,9 +390,9 @@
spriteSourceSize
{466,216}
textureRect
- {{815,720},{402,168}}
+ {{1,341},{402,168}}
textureRotated
-
+
Artboard 32 copy.png
@@ -450,9 +405,9 @@
spriteSourceSize
{466,216}
textureRect
- {{949,1},{402,168}}
+ {{405,171},{402,168}}
textureRotated
-
+
Artboard 32.png
@@ -465,9 +420,9 @@
spriteSourceSize
{466,216}
textureRect
- {{985,715},{402,168}}
+ {{809,1},{402,168}}
textureRotated
-
+
Artboard 5.png
@@ -480,9 +435,9 @@
spriteSourceSize
{318,335}
textureRect
- {{1370,368},{254,261}}
+ {{1618,1},{254,261}}
textureRotated
-
+
Artboard 50.png
@@ -495,7 +450,7 @@
spriteSourceSize
{93,95}
textureRect
- {{1198,1119},{79,79}}
+ {{1658,889},{79,79}}
textureRotated
@@ -510,37 +465,7 @@
spriteSourceSize
{93,94}
textureRect
- {{337,1167},{79,80}}
- textureRotated
-
-
- Artboard 54.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {428,181}
- spriteSourceSize
- {450,205}
- textureRect
- {{337,737},{428,181}}
- textureRotated
-
-
- Artboard 55.png
-
- aliases
-
- spriteOffset
- {-1,-1}
- spriteSize
- {382,187}
- spriteSourceSize
- {404,203}
- textureRect
- {{1119,1},{382,187}}
+ {{1576,889},{79,80}}
textureRotated
@@ -555,9 +480,9 @@
spriteSourceSize
{121,129}
textureRect
- {{1509,631},{105,113}}
+ {{1576,774},{105,113}}
textureRotated
-
+
Artboard 70.png
@@ -570,7 +495,7 @@
spriteSourceSize
{121,124}
textureRect
- {{1198,1361},{105,102}}
+ {{1679,655},{105,102}}
textureRotated
@@ -585,9 +510,9 @@
spriteSourceSize
{320,332}
textureRect
- {{419,1167},{264,272}}
+ {{480,443},{264,272}}
textureRotated
-
+
BtnBrown.png
@@ -600,9 +525,9 @@
spriteSourceSize
{197,185}
textureRect
- {{1509,1255},{197,185}}
+ {{1712,257},{197,185}}
textureRotated
-
+
BtnSmallAqua.png
@@ -615,9 +540,9 @@
spriteSourceSize
{197,186}
textureRect
- {{1626,503},{197,186}}
+ {{1712,456},{197,186}}
textureRotated
-
+
BtnSmallBlue.png
@@ -630,9 +555,9 @@
spriteSourceSize
{197,186}
textureRect
- {{1624,691},{197,186}}
+ {{1079,582},{197,186}}
textureRotated
-
+
BtnSmallDarkGray.png
@@ -645,7 +570,7 @@
spriteSourceSize
{197,186}
textureRect
- {{1573,879},{197,186}}
+ {{1079,781},{197,186}}
textureRotated
@@ -660,9 +585,9 @@
spriteSourceSize
{196,186}
textureRect
- {{1708,1163},{196,186}}
+ {{1278,781},{196,186}}
textureRotated
-
+
BtnSmallOrange.png
@@ -675,24 +600,9 @@
spriteSourceSize
{197,186}
textureRect
- {{1509,1067},{197,186}}
+ {{1267,582},{197,186}}
textureRotated
-
-
- EnergyIcon.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {218,278}
- spriteSourceSize
- {218,278}
- textureRect
- {{279,457},{218,278}}
- textureRotated
-
+
Heroes_icon.png
@@ -705,7 +615,7 @@
spriteSourceSize
{41,48}
textureRect
- {{653,405},{41,48}}
+ {{1669,543},{41,48}}
textureRotated
@@ -720,7 +630,7 @@
spriteSourceSize
{35,32}
textureRect
- {{381,1248},{35,32}}
+ {{234,787},{35,32}}
textureRotated
@@ -735,37 +645,7 @@
spriteSourceSize
{42,43}
textureRect
- {{337,1248},{42,43}}
- textureRotated
-
-
- Options_box(1).png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {360,224}
- spriteSourceSize
- {360,224}
- textureRect
- {{1155,668},{360,224}}
- textureRotated
-
-
- Party_box.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {334,548}
- spriteSourceSize
- {334,548}
- textureRect
- {{1,747},{334,548}}
+ {{981,925},{42,43}}
textureRotated
@@ -780,9 +660,9 @@
spriteSourceSize
{49,42}
textureRect
- {{609,405},{49,42}}
+ {{1567,126},{49,42}}
textureRotated
-
+
UI-02.png
@@ -795,7 +675,7 @@
spriteSourceSize
{105,10}
textureRect
- {{182,1451},{105,10}}
+ {{627,958},{105,10}}
textureRotated
@@ -810,7 +690,7 @@
spriteSourceSize
{111,16}
textureRect
- {{425,1433},{111,16}}
+ {{1454,215},{111,16}}
textureRotated
@@ -825,7 +705,7 @@
spriteSourceSize
{92,100}
textureRect
- {{1407,1217},{92,100}}
+ {{1084,488},{92,100}}
textureRotated
@@ -840,9 +720,9 @@
spriteSourceSize
{138,123}
textureRect
- {{294,1297},{138,123}}
+ {{627,811},{138,123}}
textureRotated
-
+
bg.png
@@ -855,7 +735,7 @@
spriteSourceSize
{231,308}
textureRect
- {{878,405},{231,308}}
+ {{1,511},{231,308}}
textureRotated
@@ -870,7 +750,7 @@
spriteSourceSize
{111,109}
textureRect
- {{1410,257},{111,109}}
+ {{1186,471},{111,109}}
textureRotated
@@ -885,7 +765,7 @@
spriteSourceSize
{97,97}
textureRect
- {{1708,1361},{97,97}}
+ {{1786,757},{97,97}}
textureRotated
@@ -900,7 +780,7 @@
spriteSourceSize
{180,38}
textureRect
- {{696,405},{180,38}}
+ {{1455,503},{180,38}}
textureRotated
@@ -915,7 +795,7 @@
spriteSourceSize
{38,38}
textureRect
- {{1111,668},{38,38}}
+ {{1637,503},{38,38}}
textureRotated
@@ -930,9 +810,9 @@
spriteSourceSize
{166,20}
textureRect
- {{1,1297},{166,20}}
+ {{627,936},{166,20}}
textureRotated
-
+
gbg.png
@@ -945,7 +825,7 @@
spriteSourceSize
{212,26}
textureRect
- {{538,1433},{212,26}}
+ {{1,929},{212,26}}
textureRotated
@@ -960,7 +840,7 @@
spriteSourceSize
{76,76}
textureRect
- {{1290,1205},{76,76}}
+ {{1823,856},{76,76}}
textureRotated
@@ -975,9 +855,9 @@
spriteSourceSize
{109,108}
textureRect
- {{1772,1053},{109,108}}
+ {{1569,663},{109,108}}
textureRotated
-
+
grep.png
@@ -990,7 +870,7 @@
spriteSourceSize
{112,110}
textureRect
- {{1509,738},{112,110}}
+ {{1455,662},{112,110}}
textureRotated
@@ -1005,9 +885,9 @@
spriteSourceSize
{273,106}
textureRect
- {{745,445},{273,106}}
+ {{1,821},{273,106}}
textureRotated
-
+
kuang.png
@@ -1020,7 +900,7 @@
spriteSourceSize
{110,152}
textureRect
- {{182,1297},{110,152}}
+ {{1084,171},{110,152}}
textureRotated
@@ -1035,7 +915,7 @@
spriteSourceSize
{77,72}
textureRect
- {{1825,503},{75,68}}
+ {{746,582},{75,68}}
textureRotated
@@ -1050,9 +930,9 @@
spriteSourceSize
{76,119}
textureRect
- {{1772,879},{76,119}}
+ {{1118,325},{76,119}}
textureRotated
-
+
magic.png
@@ -1065,7 +945,7 @@
spriteSourceSize
{67,53}
textureRect
- {{1825,580},{67,53}}
+ {{746,659},{67,53}}
textureRotated
@@ -1080,7 +960,7 @@
spriteSourceSize
{157,157}
textureRect
- {{23,1297},{157,157}}
+ {{468,811},{157,157}}
textureRotated
@@ -1095,7 +975,7 @@
spriteSourceSize
{111,109}
textureRect
- {{1523,257},{111,109}}
+ {{1299,471},{111,109}}
textureRotated
@@ -1110,7 +990,7 @@
spriteSourceSize
{129,8}
textureRect
- {{294,1437},{129,8}}
+ {{1454,233},{129,8}}
textureRotated
@@ -1125,7 +1005,7 @@
spriteSourceSize
{216,8}
textureRect
- {{289,1451},{216,8}}
+ {{1,957},{216,8}}
textureRotated
@@ -1140,7 +1020,7 @@
spriteSourceSize
{35,14}
textureRect
- {{738,1137},{35,14}}
+ {{772,341},{35,14}}
textureRotated
@@ -1155,9 +1035,9 @@
spriteSourceSize
{216,14}
textureRect
- {{520,1138},{216,14}}
+ {{1881,1},{216,14}}
textureRotated
-
+
zhujiemian-6.png
@@ -1170,7 +1050,7 @@
spriteSourceSize
{116,117}
textureRect
- {{1381,731},{116,117}}
+ {{1455,543},{116,117}}
textureRotated
@@ -1186,9 +1066,9 @@
realTextureFileName
gui.png
size
- {1895,1464}
+ {1900,969}
smartupdate
- $TexturePacker:SmartUpdate:315eea633c52474865f5e7bb2ebee265:01992793fa93cc906a13ad50a4a3a9d4:5f86533554b8a62fd9d2a17dd9533d7c$
+ $TexturePacker:SmartUpdate:eb60835624a00b4dcb3eb383188374e5:bac7fa6c66460e5b6585da9e4f20e0a1:5f86533554b8a62fd9d2a17dd9533d7c$
textureFileName
gui.png
diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta
index 1511f625..6597b448 100644
--- a/assets/resources/gui/gui.plist.meta
+++ b/assets/resources/gui/gui.plist.meta
@@ -16,11 +16,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -10,
- "trimX": 419,
- "trimY": 1167,
+ "trimX": 480,
+ "trimY": 443,
"width": 264,
"height": 272,
"rawWidth": 320,
@@ -65,8 +65,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 696,
- "trimY": 405,
+ "trimX": 1455,
+ "trimY": 503,
"width": 180,
"height": 38,
"rawWidth": 180,
@@ -108,11 +108,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 609,
- "trimY": 405,
+ "trimX": 1567,
+ "trimY": 126,
"width": 49,
"height": 42,
"rawWidth": 49,
@@ -154,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1008,
- "trimY": 1119,
+ "trimX": 772,
+ "trimY": 392,
"width": 344,
"height": 94,
"rawWidth": 360,
@@ -191,6 +191,7 @@
],
"subMetas": {}
},
+<<<<<<< HEAD
"47364": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@47364",
@@ -237,6 +238,8 @@
],
"subMetas": {}
},
+=======
+>>>>>>> efe5c18b3e4ea9f0fdff969717e6ed36f98164c7
"63816": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@63816",
@@ -246,11 +249,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -3,
"offsetY": 3,
- "trimX": 914,
- "trimY": 1124,
+ "trimX": 746,
+ "trimY": 488,
"width": 336,
"height": 92,
"rawWidth": 360,
@@ -295,8 +298,8 @@
"rotated": true,
"offsetX": -2,
"offsetY": 1,
- "trimX": 337,
- "trimY": 1167,
+ "trimX": 1576,
+ "trimY": 889,
"width": 79,
"height": 80,
"rawWidth": 93,
@@ -341,8 +344,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1407,
- "trimY": 1217,
+ "trimX": 1084,
+ "trimY": 488,
"width": 92,
"height": 100,
"rawWidth": 92,
@@ -384,11 +387,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1772,
- "trimY": 1053,
+ "trimX": 1569,
+ "trimY": 663,
"width": 109,
"height": 108,
"rawWidth": 109,
@@ -430,11 +433,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1772,
- "trimY": 957,
+ "trimX": 1573,
+ "trimY": 543,
"width": 94,
"height": 118,
"rawWidth": 94,
@@ -479,8 +482,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1825,
- "trimY": 635,
+ "trimX": 405,
+ "trimY": 443,
"width": 64,
"height": 63,
"rawWidth": 64,
@@ -525,8 +528,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1823,
- "trimY": 700,
+ "trimX": 1476,
+ "trimY": 898,
"width": 64,
"height": 62,
"rawWidth": 64,
@@ -559,98 +562,6 @@
],
"subMetas": {}
},
- "74ef1": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@74ef1",
- "displayName": "",
- "id": "74ef1",
- "name": "04",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 1,
- "width": 744,
- "height": 276,
- "rawWidth": 744,
- "rawHeight": 276,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "979f3": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@979f3",
- "displayName": "",
- "id": "979f3",
- "name": "15",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 279,
- "trimY": 1,
- "width": 328,
- "height": 454,
- "rawWidth": 328,
- "rawHeight": 454,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"6f893": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@6f893",
@@ -660,11 +571,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 520,
- "trimY": 733,
+ "trimX": 1213,
+ "trimY": 1,
"width": 403,
"height": 123,
"rawWidth": 403,
@@ -709,8 +620,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1381,
- "trimY": 850,
+ "trimX": 276,
+ "trimY": 787,
"width": 190,
"height": 178,
"rawWidth": 190,
@@ -743,52 +654,6 @@
],
"subMetas": {}
},
- "01640": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@01640",
- "displayName": "",
- "id": "01640",
- "name": "27",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1410,
- "trimY": 1,
- "width": 252,
- "height": 204,
- "rawWidth": 252,
- "rawHeight": 204,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"3fe99": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@3fe99",
@@ -801,8 +666,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 499,
- "trimY": 457,
+ "trimX": 234,
+ "trimY": 511,
"width": 244,
"height": 274,
"rawWidth": 244,
@@ -847,8 +712,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1626,
- "trimY": 1,
+ "trimX": 1196,
+ "trimY": 215,
"width": 254,
"height": 256,
"rawWidth": 254,
@@ -893,7 +758,7 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1636,
+ "trimX": 1454,
"trimY": 257,
"width": 256,
"height": 244,
@@ -936,11 +801,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1381,
- "trimY": 631,
+ "trimX": 1476,
+ "trimY": 774,
"width": 122,
"height": 98,
"rawWidth": 122,
@@ -985,8 +850,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1305,
- "trimY": 1361,
+ "trimX": 1786,
+ "trimY": 655,
"width": 100,
"height": 100,
"rawWidth": 100,
@@ -1028,11 +893,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1807,
- "trimY": 1361,
+ "trimX": 981,
+ "trimY": 841,
"width": 82,
"height": 94,
"rawWidth": 82,
@@ -1074,11 +939,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1198,
- "trimY": 1255,
+ "trimX": 767,
+ "trimY": 841,
"width": 90,
"height": 104,
"rawWidth": 90,
@@ -1123,8 +988,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1407,
- "trimY": 1119,
+ "trimX": 1683,
+ "trimY": 759,
"width": 100,
"height": 96,
"rawWidth": 100,
@@ -1169,8 +1034,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1290,
- "trimY": 1119,
+ "trimX": 873,
+ "trimY": 841,
"width": 84,
"height": 106,
"rawWidth": 84,
@@ -1212,11 +1077,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1407,
- "trimY": 1311,
+ "trimX": 1739,
+ "trimY": 857,
"width": 82,
"height": 100,
"rawWidth": 82,
@@ -1258,11 +1123,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": -8,
- "trimX": 1111,
- "trimY": 405,
+ "trimX": 816,
+ "trimY": 582,
"width": 257,
"height": 261,
"rawWidth": 321,
@@ -1304,11 +1169,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -6,
- "trimX": 693,
- "trimY": 1154,
+ "trimX": 809,
+ "trimY": 171,
"width": 273,
"height": 219,
"rawWidth": 337,
@@ -1350,11 +1215,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1104,
- "trimY": 1119,
+ "trimX": 480,
+ "trimY": 717,
"width": 334,
"height": 92,
"rawWidth": 360,
@@ -1396,11 +1261,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -2,
"offsetY": 2,
- "trimX": 1308,
- "trimY": 1,
+ "trimX": 405,
+ "trimY": 341,
"width": 365,
"height": 100,
"rawWidth": 389,
@@ -1445,8 +1310,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 1155,
- "trimY": 1030,
+ "trimX": 1213,
+ "trimY": 126,
"width": 352,
"height": 87,
"rawWidth": 386,
@@ -1488,11 +1353,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 645,
- "trimY": 733,
+ "trimX": 1,
+ "trimY": 1,
"width": 402,
"height": 168,
"rawWidth": 466,
@@ -1534,11 +1399,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 609,
- "trimY": 1,
+ "trimX": 1,
+ "trimY": 171,
"width": 402,
"height": 168,
"rawWidth": 466,
@@ -1580,10 +1445,10 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 779,
+ "trimX": 405,
"trimY": 1,
"width": 402,
"height": 168,
@@ -1626,11 +1491,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 815,
- "trimY": 720,
+ "trimX": 1,
+ "trimY": 341,
"width": 402,
"height": 168,
"rawWidth": 466,
@@ -1672,11 +1537,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 949,
- "trimY": 1,
+ "trimX": 405,
+ "trimY": 171,
"width": 402,
"height": 168,
"rawWidth": 466,
@@ -1718,11 +1583,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 985,
- "trimY": 715,
+ "trimX": 809,
+ "trimY": 1,
"width": 402,
"height": 168,
"rawWidth": 466,
@@ -1764,11 +1629,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -3,
"offsetY": -3,
- "trimX": 1370,
- "trimY": 368,
+ "trimX": 1618,
+ "trimY": 1,
"width": 254,
"height": 261,
"rawWidth": 318,
@@ -1813,8 +1678,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1198,
- "trimY": 1119,
+ "trimX": 1658,
+ "trimY": 889,
"width": 79,
"height": 79,
"rawWidth": 93,
@@ -1847,98 +1712,6 @@
],
"subMetas": {}
},
- "d7a24": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@d7a24",
- "displayName": "",
- "id": "d7a24",
- "name": "Artboard 54",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 337,
- "trimY": 737,
- "width": 428,
- "height": 181,
- "rawWidth": 450,
- "rawHeight": 205,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "1f85c": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@1f85c",
- "displayName": "",
- "id": "1f85c",
- "name": "Artboard 55",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": -1,
- "offsetY": -1,
- "trimX": 1119,
- "trimY": 1,
- "width": 382,
- "height": 187,
- "rawWidth": 404,
- "rawHeight": 203,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"b049e": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@b049e",
@@ -1948,11 +1721,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1509,
- "trimY": 631,
+ "trimX": 1576,
+ "trimY": 774,
"width": 105,
"height": 113,
"rawWidth": 121,
@@ -1997,8 +1770,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": 4,
- "trimX": 1198,
- "trimY": 1361,
+ "trimX": 1679,
+ "trimY": 655,
"width": 105,
"height": 102,
"rawWidth": 121,
@@ -2040,11 +1813,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1509,
- "trimY": 1255,
+ "trimX": 1712,
+ "trimY": 257,
"width": 197,
"height": 185,
"rawWidth": 197,
@@ -2086,11 +1859,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1626,
- "trimY": 503,
+ "trimX": 1712,
+ "trimY": 456,
"width": 197,
"height": 186,
"rawWidth": 197,
@@ -2132,11 +1905,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1624,
- "trimY": 691,
+ "trimX": 1079,
+ "trimY": 582,
"width": 197,
"height": 186,
"rawWidth": 197,
@@ -2181,8 +1954,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1573,
- "trimY": 879,
+ "trimX": 1079,
+ "trimY": 781,
"width": 197,
"height": 186,
"rawWidth": 197,
@@ -2224,11 +1997,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1708,
- "trimY": 1163,
+ "trimX": 1278,
+ "trimY": 781,
"width": 196,
"height": 186,
"rawWidth": 196,
@@ -2270,11 +2043,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1509,
- "trimY": 1067,
+ "trimX": 1267,
+ "trimY": 582,
"width": 197,
"height": 186,
"rawWidth": 197,
@@ -2307,52 +2080,6 @@
],
"subMetas": {}
},
- "ec56d": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@ec56d",
- "displayName": "",
- "id": "ec56d",
- "name": "EnergyIcon",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 279,
- "trimY": 457,
- "width": 218,
- "height": 278,
- "rawWidth": 218,
- "rawHeight": 278,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"d3524": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@d3524",
@@ -2365,8 +2092,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 653,
- "trimY": 405,
+ "trimX": 1669,
+ "trimY": 543,
"width": 41,
"height": 48,
"rawWidth": 41,
@@ -2411,8 +2138,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 381,
- "trimY": 1248,
+ "trimX": 234,
+ "trimY": 787,
"width": 35,
"height": 32,
"rawWidth": 35,
@@ -2457,8 +2184,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 337,
- "trimY": 1248,
+ "trimX": 981,
+ "trimY": 925,
"width": 42,
"height": 43,
"rawWidth": 42,
@@ -2491,52 +2218,6 @@
],
"subMetas": {}
},
- "91f32": {
- "importer": "sprite-frame",
- "uuid": "475189e3-a159-45bc-90f5-57864087d290@91f32",
- "displayName": "",
- "id": "91f32",
- "name": "Party_box",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 747,
- "width": 334,
- "height": 548,
- "rawWidth": 334,
- "rawHeight": 548,
- "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": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "475189e3-a159-45bc-90f5-57864087d290"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"57d74": {
"importer": "sprite-frame",
"uuid": "475189e3-a159-45bc-90f5-57864087d290@57d74",
@@ -2549,8 +2230,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 182,
- "trimY": 1451,
+ "trimX": 627,
+ "trimY": 958,
"width": 105,
"height": 10,
"rawWidth": 105,
@@ -2595,8 +2276,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 425,
- "trimY": 1433,
+ "trimX": 1454,
+ "trimY": 215,
"width": 111,
"height": 16,
"rawWidth": 111,
@@ -2638,11 +2319,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 294,
- "trimY": 1297,
+ "trimX": 627,
+ "trimY": 811,
"width": 138,
"height": 123,
"rawWidth": 138,
@@ -2687,8 +2368,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 878,
- "trimY": 405,
+ "trimX": 1,
+ "trimY": 511,
"width": 231,
"height": 308,
"rawWidth": 231,
@@ -2733,8 +2414,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1410,
- "trimY": 257,
+ "trimX": 1186,
+ "trimY": 471,
"width": 111,
"height": 109,
"rawWidth": 111,
@@ -2779,8 +2460,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1708,
- "trimY": 1361,
+ "trimX": 1786,
+ "trimY": 757,
"width": 97,
"height": 97,
"rawWidth": 97,
@@ -2825,8 +2506,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1111,
- "trimY": 668,
+ "trimX": 1637,
+ "trimY": 503,
"width": 38,
"height": 38,
"rawWidth": 38,
@@ -2868,11 +2549,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1297,
+ "trimX": 627,
+ "trimY": 936,
"width": 166,
"height": 20,
"rawWidth": 166,
@@ -2917,8 +2598,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 538,
- "trimY": 1433,
+ "trimX": 1,
+ "trimY": 929,
"width": 212,
"height": 26,
"rawWidth": 212,
@@ -2963,8 +2644,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1290,
- "trimY": 1205,
+ "trimX": 1823,
+ "trimY": 856,
"width": 76,
"height": 76,
"rawWidth": 76,
@@ -3009,8 +2690,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1509,
- "trimY": 738,
+ "trimX": 1455,
+ "trimY": 662,
"width": 112,
"height": 110,
"rawWidth": 112,
@@ -3052,11 +2733,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 745,
- "trimY": 445,
+ "trimX": 1,
+ "trimY": 821,
"width": 273,
"height": 106,
"rawWidth": 273,
@@ -3101,8 +2782,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 182,
- "trimY": 1297,
+ "trimX": 1084,
+ "trimY": 171,
"width": 110,
"height": 152,
"rawWidth": 110,
@@ -3147,8 +2828,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1825,
- "trimY": 503,
+ "trimX": 746,
+ "trimY": 582,
"width": 75,
"height": 68,
"rawWidth": 77,
@@ -3190,11 +2871,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1772,
- "trimY": 879,
+ "trimX": 1118,
+ "trimY": 325,
"width": 76,
"height": 119,
"rawWidth": 76,
@@ -3239,8 +2920,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1825,
- "trimY": 580,
+ "trimX": 746,
+ "trimY": 659,
"width": 67,
"height": 53,
"rawWidth": 67,
@@ -3285,8 +2966,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 23,
- "trimY": 1297,
+ "trimX": 468,
+ "trimY": 811,
"width": 157,
"height": 157,
"rawWidth": 157,
@@ -3331,8 +3012,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1523,
- "trimY": 257,
+ "trimX": 1299,
+ "trimY": 471,
"width": 111,
"height": 109,
"rawWidth": 111,
@@ -3377,8 +3058,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 294,
- "trimY": 1437,
+ "trimX": 1454,
+ "trimY": 233,
"width": 129,
"height": 8,
"rawWidth": 129,
@@ -3423,8 +3104,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 289,
- "trimY": 1451,
+ "trimX": 1,
+ "trimY": 957,
"width": 216,
"height": 8,
"rawWidth": 216,
@@ -3469,8 +3150,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 738,
- "trimY": 1137,
+ "trimX": 772,
+ "trimY": 341,
"width": 35,
"height": 14,
"rawWidth": 35,
@@ -3512,11 +3193,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 520,
- "trimY": 1138,
+ "trimX": 1881,
+ "trimY": 1,
"width": 216,
"height": 14,
"rawWidth": 216,
@@ -3561,8 +3242,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1381,
- "trimY": 731,
+ "trimX": 1455,
+ "trimY": 543,
"width": 116,
"height": 117,
"rawWidth": 116,
diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png
index 5a2fbafa..ccda040a 100644
Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ