diff --git a/assets/resources/gui/items.plist b/assets/resources/gui/items.plist
index c96d634c..9835fdf9 100644
--- a/assets/resources/gui/items.plist
+++ b/assets/resources/gui/items.plist
@@ -17,7 +17,7 @@
spriteSourceSize
{70,70}
textureRect
- {{449,241},{56,62}}
+ {{382,435},{56,62}}
textureRotated
@@ -34,7 +34,7 @@
spriteSourceSize
{70,70}
textureRect
- {{449,305},{56,62}}
+ {{382,499},{56,62}}
textureRotated
@@ -51,9 +51,9 @@
spriteSourceSize
{70,70}
textureRect
- {{149,630},{56,62}}
+ {{440,435},{56,62}}
textureRotated
-
+
1004.png
@@ -68,9 +68,9 @@
spriteSourceSize
{83,83}
textureRect
- {{239,337},{73,65}}
+ {{162,480},{73,65}}
textureRotated
-
+
1005.png
@@ -85,7 +85,7 @@
spriteSourceSize
{83,83}
textureRect
- {{238,412},{73,65}}
+ {{349,222},{73,65}}
textureRotated
@@ -102,9 +102,9 @@
spriteSourceSize
{83,83}
textureRect
- {{238,487},{73,65}}
+ {{416,222},{73,65}}
textureRotated
-
+
1007.png
@@ -119,7 +119,7 @@
spriteSourceSize
{90,90}
textureRect
- {{89,307},{68,78}}
+ {{91,578},{68,78}}
textureRotated
@@ -136,9 +136,9 @@
spriteSourceSize
{90,90}
textureRect
- {{159,337},{68,78}}
+ {{162,400},{68,78}}
textureRotated
-
+
1009.png
@@ -153,7 +153,7 @@
spriteSourceSize
{90,90}
textureRect
- {{89,387},{68,78}}
+ {{232,391},{68,78}}
textureRotated
@@ -170,9 +170,9 @@
spriteSourceSize
{102,102}
textureRect
- {{185,255},{80,86}}
+ {{185,209},{80,86}}
textureRotated
-
+
1011.png
@@ -187,7 +187,7 @@
spriteSourceSize
{102,102}
textureRect
- {{279,165},{80,86}}
+ {{267,209},{80,86}}
textureRotated
@@ -204,9 +204,9 @@
spriteSourceSize
{102,102}
textureRect
- {{361,241},{80,86}}
+ {{292,297},{80,86}}
textureRotated
-
+
2003.png
@@ -221,9 +221,9 @@
spriteSourceSize
{64,64}
textureRect
- {{304,562},{64,62}}
+ {{237,626},{64,62}}
textureRotated
-
+
2004.png
@@ -238,7 +238,7 @@
spriteSourceSize
{64,64}
textureRect
- {{91,543},{58,58}}
+ {{284,149},{58,58}}
textureRotated
@@ -255,9 +255,9 @@
spriteSourceSize
{83,83}
textureRect
- {{159,407},{75,77}}
+ {{161,547},{75,77}}
textureRotated
-
+
2006.Png
@@ -272,9 +272,9 @@
spriteSourceSize
{83,83}
textureRect
- {{159,484},{75,77}}
+ {{305,465},{75,77}}
textureRotated
-
+
2009.png
@@ -289,9 +289,9 @@
spriteSourceSize
{92,74}
textureRect
- {{197,89},{92,74}}
+ {{216,297},{92,74}}
textureRotated
-
+
2011.png
@@ -357,7 +357,7 @@
spriteSourceSize
{79,66}
textureRect
- {{372,391},{61,64}}
+ {{1,695},{61,64}}
textureRotated
@@ -374,7 +374,7 @@
spriteSourceSize
{79,66}
textureRect
- {{306,401},{61,64}}
+ {{67,695},{61,64}}
textureRotated
@@ -391,9 +391,9 @@
spriteSourceSize
{79,66}
textureRect
- {{372,454},{61,64}}
+ {{436,289},{61,64}}
textureRotated
-
+
2031.png
@@ -408,7 +408,7 @@
spriteSourceSize
{64,64}
textureRect
- {{441,571},{52,58}}
+ {{375,563},{52,58}}
textureRotated
@@ -425,7 +425,7 @@
spriteSourceSize
{64,64}
textureRect
- {{372,579},{52,58}}
+ {{440,499},{52,58}}
textureRotated
@@ -442,9 +442,9 @@
spriteSourceSize
{64,64}
textureRect
- {{426,625},{52,58}}
+ {{429,617},{52,58}}
textureRotated
-
+
2301.png
@@ -459,9 +459,9 @@
spriteSourceSize
{128,128}
textureRect
- {{306,329},{64,70}}
+ {{281,692},{64,70}}
textureRotated
-
+
2302.png
@@ -476,9 +476,9 @@
spriteSourceSize
{102,102}
textureRect
- {{359,91},{68,80}}
+ {{91,496},{68,80}}
textureRotated
-
+
2303.png
@@ -493,9 +493,9 @@
spriteSourceSize
{96,96}
textureRect
- {{441,167},{64,72}}
+ {{133,692},{64,72}}
textureRotated
-
+
2304.png
@@ -510,7 +510,7 @@
spriteSourceSize
{96,96}
textureRect
- {{291,89},{66,74}}
+ {{237,471},{66,74}}
textureRotated
@@ -527,7 +527,7 @@
spriteSourceSize
{90,90}
textureRect
- {{372,323},{64,66}}
+ {{301,624},{64,66}}
textureRotated
@@ -544,7 +544,7 @@
spriteSourceSize
{96,96}
textureRect
- {{228,562},{62,74}}
+ {{301,85},{62,74}}
textureRotated
@@ -561,9 +561,9 @@
spriteSourceSize
{96,96}
textureRect
- {{441,91},{64,74}}
+ {{161,626},{64,74}}
textureRotated
-
+
2308.png
@@ -578,9 +578,9 @@
spriteSourceSize
{96,96}
textureRect
- {{273,255},{64,72}}
+ {{207,692},{64,72}}
textureRotated
-
+
2309.png
@@ -595,7 +595,7 @@
spriteSourceSize
{96,96}
textureRect
- {{91,467},{66,74}}
+ {{307,544},{66,74}}
textureRotated
@@ -612,7 +612,7 @@
spriteSourceSize
{90,90}
textureRect
- {{438,369},{64,66}}
+ {{353,692},{64,66}}
textureRotated
@@ -629,7 +629,7 @@
spriteSourceSize
{90,90}
textureRect
- {{371,517},{60,68}}
+ {{349,160},{60,68}}
textureRotated
@@ -646,9 +646,9 @@
spriteSourceSize
{90,90}
textureRect
- {{228,626},{60,70}}
+ {{367,620},{60,70}}
textureRotated
-
+
2313.png
@@ -663,9 +663,9 @@
spriteSourceSize
{90,90}
textureRect
- {{305,464},{64,66}}
+ {{421,692},{64,66}}
textureRotated
-
+
2314.png
@@ -680,7 +680,7 @@
spriteSourceSize
{90,90}
textureRect
- {{441,501},{60,68}}
+ {{374,297},{60,68}}
textureRotated
@@ -697,7 +697,7 @@
spriteSourceSize
{90,90}
textureRect
- {{300,626},{60,70}}
+ {{429,160},{60,70}}
textureRotated
@@ -714,9 +714,9 @@
spriteSourceSize
{90,90}
textureRect
- {{438,435},{64,66}}
+ {{382,367},{64,66}}
textureRotated
-
+
3011.png
@@ -786,6 +786,74 @@
textureRotated
+ 3015.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {58,95}
+ spriteSourceSize
+ {58,95}
+ textureRect
+ {{197,89},{58,95}}
+ textureRotated
+
+
+ 3016.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {58,95}
+ spriteSourceSize
+ {58,95}
+ textureRect
+ {{187,149},{58,95}}
+ textureRotated
+
+
+ 3017.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {58,95}
+ spriteSourceSize
+ {58,95}
+ textureRect
+ {{89,307},{58,95}}
+ textureRotated
+
+
+ 3018.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {65,95}
+ spriteSourceSize
+ {65,95}
+ textureRect
+ {{149,303},{65,95}}
+ textureRotated
+
+
5007.Png
aliases
@@ -799,7 +867,7 @@
spriteSourceSize
{90,90}
textureRect
- {{361,161},{78,78}}
+ {{302,385},{78,78}}
textureRotated
@@ -816,9 +884,9 @@
spriteSourceSize
{83,83}
textureRect
- {{80,603},{83,67}}
+ {{377,91},{83,67}}
textureRotated
-
+
5017.Png
@@ -833,7 +901,7 @@
spriteSourceSize
{83,83}
textureRect
- {{1,603},{83,77}}
+ {{83,411},{83,77}}
textureRotated
@@ -850,9 +918,9 @@
spriteSourceSize
{67,75}
textureRect
- {{151,561},{67,75}}
+ {{238,547},{67,75}}
textureRotated
-
+
9002.Png
@@ -952,9 +1020,9 @@
spriteSourceSize
{102,102}
textureRect
- {{187,165},{90,88}}
+ {{1,603},{90,88}}
textureRotated
-
+
metadata
@@ -968,9 +1036,9 @@
realTextureFileName
items.png
size
- {506,687}
+ {500,757}
smartupdate
- $TexturePacker:SmartUpdate:33a9d89dd7e1f35ae22f3fb4d86bccb1:4f6ce09da2b7b04abfedc2f98cb414e8:9b2c40378ce3448cae3ca053079d3001$
+ $TexturePacker:SmartUpdate:1d8fc59352b9bf89bfb712ec8cc2886f:7d3659da895e5c4862324cd6bb832e2e:9b2c40378ce3448cae3ca053079d3001$
textureFileName
items.png
diff --git a/assets/resources/gui/items.plist.meta b/assets/resources/gui/items.plist.meta
index 44385cbc..3a9e08d6 100644
--- a/assets/resources/gui/items.plist.meta
+++ b/assets/resources/gui/items.plist.meta
@@ -19,8 +19,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 238,
- "trimY": 412,
+ "trimX": 349,
+ "trimY": 222,
"width": 73,
"height": 65,
"rawWidth": 83,
@@ -53,6 +53,52 @@
],
"subMetas": {}
},
+ "50394": {
+ "importer": "sprite-frame",
+ "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@50394",
+ "displayName": "",
+ "id": "50394",
+ "name": "3016",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 187,
+ "trimY": 149,
+ "width": 58,
+ "height": 95,
+ "rawWidth": 58,
+ "rawHeight": 95,
+ "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+ "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"55546": {
"importer": "sprite-frame",
"uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@55546",
@@ -108,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 372,
- "trimY": 454,
+ "trimX": 436,
+ "trimY": 289,
"width": 61,
"height": 64,
"rawWidth": 79,
@@ -200,11 +246,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -3,
- "trimX": 238,
- "trimY": 487,
+ "trimX": 416,
+ "trimY": 222,
"width": 73,
"height": 65,
"rawWidth": 83,
@@ -249,8 +295,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 449,
- "trimY": 241,
+ "trimX": 382,
+ "trimY": 435,
"width": 56,
"height": 62,
"rawWidth": 70,
@@ -295,8 +341,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 449,
- "trimY": 305,
+ "trimX": 382,
+ "trimY": 499,
"width": 56,
"height": 62,
"rawWidth": 70,
@@ -338,11 +384,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 149,
- "trimY": 630,
+ "trimX": 440,
+ "trimY": 435,
"width": 56,
"height": 62,
"rawWidth": 70,
@@ -384,11 +430,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -3,
- "trimX": 239,
- "trimY": 337,
+ "trimX": 162,
+ "trimY": 480,
"width": 73,
"height": 65,
"rawWidth": 83,
@@ -433,8 +479,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 89,
- "trimY": 307,
+ "trimX": 91,
+ "trimY": 578,
"width": 68,
"height": 78,
"rawWidth": 90,
@@ -476,11 +522,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 159,
- "trimY": 337,
+ "trimX": 162,
+ "trimY": 400,
"width": 68,
"height": 78,
"rawWidth": 90,
@@ -525,8 +571,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 89,
- "trimY": 387,
+ "trimX": 232,
+ "trimY": 391,
"width": 68,
"height": 78,
"rawWidth": 90,
@@ -568,11 +614,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 185,
- "trimY": 255,
+ "trimY": 209,
"width": 80,
"height": 86,
"rawWidth": 102,
@@ -617,8 +663,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 279,
- "trimY": 165,
+ "trimX": 267,
+ "trimY": 209,
"width": 80,
"height": 86,
"rawWidth": 102,
@@ -660,11 +706,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 361,
- "trimY": 241,
+ "trimX": 292,
+ "trimY": 297,
"width": 80,
"height": 86,
"rawWidth": 102,
@@ -706,11 +752,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 304,
- "trimY": 562,
+ "trimX": 237,
+ "trimY": 626,
"width": 64,
"height": 62,
"rawWidth": 64,
@@ -755,8 +801,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 91,
- "trimY": 543,
+ "trimX": 284,
+ "trimY": 149,
"width": 58,
"height": 58,
"rawWidth": 64,
@@ -798,11 +844,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 159,
- "trimY": 407,
+ "trimX": 161,
+ "trimY": 547,
"width": 75,
"height": 77,
"rawWidth": 83,
@@ -844,11 +890,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 159,
- "trimY": 484,
+ "trimX": 305,
+ "trimY": 465,
"width": 75,
"height": 77,
"rawWidth": 83,
@@ -890,11 +936,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 197,
- "trimY": 89,
+ "trimX": 216,
+ "trimY": 297,
"width": 92,
"height": 74,
"rawWidth": 92,
@@ -1077,8 +1123,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 372,
- "trimY": 391,
+ "trimX": 1,
+ "trimY": 695,
"width": 61,
"height": 64,
"rawWidth": 79,
@@ -1123,8 +1169,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 306,
- "trimY": 401,
+ "trimX": 67,
+ "trimY": 695,
"width": 61,
"height": 64,
"rawWidth": 79,
@@ -1169,8 +1215,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 441,
- "trimY": 571,
+ "trimX": 375,
+ "trimY": 563,
"width": 52,
"height": 58,
"rawWidth": 64,
@@ -1215,8 +1261,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 372,
- "trimY": 579,
+ "trimX": 440,
+ "trimY": 499,
"width": 52,
"height": 58,
"rawWidth": 64,
@@ -1258,11 +1304,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 426,
- "trimY": 625,
+ "trimX": 429,
+ "trimY": 617,
"width": 52,
"height": 58,
"rawWidth": 64,
@@ -1304,11 +1350,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 306,
- "trimY": 329,
+ "trimX": 281,
+ "trimY": 692,
"width": 64,
"height": 70,
"rawWidth": 128,
@@ -1350,11 +1396,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -3,
- "trimX": 359,
- "trimY": 91,
+ "trimX": 91,
+ "trimY": 496,
"width": 68,
"height": 80,
"rawWidth": 102,
@@ -1396,11 +1442,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 441,
- "trimY": 167,
+ "trimX": 133,
+ "trimY": 692,
"width": 64,
"height": 72,
"rawWidth": 96,
@@ -1445,8 +1491,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -3,
- "trimX": 291,
- "trimY": 89,
+ "trimX": 237,
+ "trimY": 471,
"width": 66,
"height": 74,
"rawWidth": 96,
@@ -1491,8 +1537,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -3,
- "trimX": 372,
- "trimY": 323,
+ "trimX": 301,
+ "trimY": 624,
"width": 64,
"height": 66,
"rawWidth": 90,
@@ -1537,8 +1583,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 228,
- "trimY": 562,
+ "trimX": 301,
+ "trimY": 85,
"width": 62,
"height": 74,
"rawWidth": 96,
@@ -1580,11 +1626,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 441,
- "trimY": 91,
+ "trimX": 161,
+ "trimY": 626,
"width": 64,
"height": 74,
"rawWidth": 96,
@@ -1626,11 +1672,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 273,
- "trimY": 255,
+ "trimX": 207,
+ "trimY": 692,
"width": 64,
"height": 72,
"rawWidth": 96,
@@ -1675,8 +1721,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -3,
- "trimX": 91,
- "trimY": 467,
+ "trimX": 307,
+ "trimY": 544,
"width": 66,
"height": 74,
"rawWidth": 96,
@@ -1721,8 +1767,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": -3,
- "trimX": 438,
- "trimY": 369,
+ "trimX": 353,
+ "trimY": 692,
"width": 64,
"height": 66,
"rawWidth": 90,
@@ -1767,8 +1813,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 371,
- "trimY": 517,
+ "trimX": 349,
+ "trimY": 160,
"width": 60,
"height": 68,
"rawWidth": 90,
@@ -1810,11 +1856,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -3,
- "trimX": 228,
- "trimY": 626,
+ "trimX": 367,
+ "trimY": 620,
"width": 60,
"height": 70,
"rawWidth": 90,
@@ -1856,11 +1902,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": -3,
- "trimX": 305,
- "trimY": 464,
+ "trimX": 421,
+ "trimY": 692,
"width": 64,
"height": 66,
"rawWidth": 90,
@@ -1905,8 +1951,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -3,
- "trimX": 441,
- "trimY": 501,
+ "trimX": 374,
+ "trimY": 297,
"width": 60,
"height": 68,
"rawWidth": 90,
@@ -1951,8 +1997,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 300,
- "trimY": 626,
+ "trimX": 429,
+ "trimY": 160,
"width": 60,
"height": 70,
"rawWidth": 90,
@@ -1994,11 +2040,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": -3,
- "trimX": 438,
- "trimY": 435,
+ "trimX": 382,
+ "trimY": 367,
"width": 64,
"height": 66,
"rawWidth": 90,
@@ -2169,6 +2215,144 @@
],
"subMetas": {}
},
+ "5e017": {
+ "importer": "sprite-frame",
+ "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@5e017",
+ "displayName": "",
+ "id": "5e017",
+ "name": "3015",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 197,
+ "trimY": 89,
+ "width": 58,
+ "height": 95,
+ "rawWidth": 58,
+ "rawHeight": 95,
+ "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+ "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "25f1d": {
+ "importer": "sprite-frame",
+ "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@25f1d",
+ "displayName": "",
+ "id": "25f1d",
+ "name": "3017",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 89,
+ "trimY": 307,
+ "width": 58,
+ "height": 95,
+ "rawWidth": 58,
+ "rawHeight": 95,
+ "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+ "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9cf54": {
+ "importer": "sprite-frame",
+ "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@9cf54",
+ "displayName": "",
+ "id": "9cf54",
+ "name": "3018",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 149,
+ "trimY": 303,
+ "width": 65,
+ "height": 95,
+ "rawWidth": 65,
+ "rawHeight": 95,
+ "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+ "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"3b17d": {
"importer": "sprite-frame",
"uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@3b17d",
@@ -2181,8 +2365,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 361,
- "trimY": 161,
+ "trimX": 302,
+ "trimY": 385,
"width": 78,
"height": 78,
"rawWidth": 90,
@@ -2224,11 +2408,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 80,
- "trimY": 603,
+ "trimX": 377,
+ "trimY": 91,
"width": 83,
"height": 67,
"rawWidth": 83,
@@ -2273,8 +2457,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 603,
+ "trimX": 83,
+ "trimY": 411,
"width": 83,
"height": 77,
"rawWidth": 83,
@@ -2316,11 +2500,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 151,
- "trimY": 561,
+ "trimX": 238,
+ "trimY": 547,
"width": 67,
"height": 75,
"rawWidth": 67,
@@ -2546,11 +2730,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 187,
- "trimY": 165,
+ "trimX": 1,
+ "trimY": 603,
"width": 90,
"height": 88,
"rawWidth": 102,
diff --git a/assets/resources/gui/items.png b/assets/resources/gui/items.png
index 872e7e56..09593701 100644
Binary files a/assets/resources/gui/items.png and b/assets/resources/gui/items.png differ
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 29d5cc03..ad83da9b 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -14617,6 +14617,8 @@
"__id__": 0
},
"fileId": "19hLnQYuJDarKdkx/tRExZ",
+ "instance": null,
+ "targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -14783,7 +14785,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@ba0c6",
+ "__uuid__": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@75dc8",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,