dd

2024-11-26 15:38:18 +08:00
parent 1d71cb5ef6
commit b8b66f1a9f
3 changed files with 409 additions and 165 deletions
--- a/assets/resources/gui/items.plist
+++ b/assets/resources/gui/items.plist
@@ -15,7 +15,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1264,1},{50,56}}</string>
+                <string>{{1402,117},{50,56}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -30,7 +30,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1264,59},{50,56}}</string>
+                <string>{{1402,175},{50,56}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -45,7 +45,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1264,117},{50,56}}</string>
+                <string>{{1193,358},{50,56}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -60,7 +60,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1144,433},{56,50}}</string>
+                <string>{{1245,351},{56,50}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -75,9 +75,9 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1202,437},{56,50}}</string>
+                <string>{{1303,351},{56,50}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>1006.png</key>
            <dict>
@@ -90,7 +90,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1260,437},{56,50}}</string>
+                <string>{{242,246},{56,50}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -105,7 +105,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1268,175},{48,56}}</string>
+                <string>{{1193,300},{48,56}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -120,9 +120,9 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1268,233},{48,56}}</string>
+                <string>{{300,246},{48,56}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>1009.png</key>
            <dict>
@@ -135,9 +135,9 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{666,433},{48,56}}</string>
+                <string>{{358,246},{48,56}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>1010.png</key>
            <dict>
@@ -150,7 +150,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{716,431},{50,54}}</string>
+                <string>{{818,428},{50,54}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -165,7 +165,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{768,431},{50,54}}</string>
+                <string>{{870,428},{50,54}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -180,7 +180,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{820,427},{50,54}}</string>
+                <string>{{1331,429},{50,54}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -195,7 +195,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1072,317},{58,58}}</string>
+                <string>{{447,446},{58,58}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -210,7 +210,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{606,433},{58,58}}</string>
+                <string>{{1183,180},{58,58}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -225,7 +225,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{540,433},{64,62}}</string>
+                <string>{{381,446},{64,62}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -240,7 +240,7 @@
                <key>spriteSourceSize</key>
                <string>{64,64}</string>
                <key>textureRect</key>
-                <string>{{1084,437},{58,58}}</string>
+                <string>{{1183,240},{58,58}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -255,7 +255,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{424,337},{114,116}}</string>
+                <string>{{833,310},{114,116}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -270,9 +270,54 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{556,317},{114,116}}</string>
+                <string>{{1077,306},{114,116}}</string>
                <key>textureRotated</key>
-                <true/>
+                <false/>
+            </dict>
+            <key>2007.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{239,127}</string>
+                <key>spriteSourceSize</key>
+                <string>{239,127}</string>
+                <key>textureRect</key>
+                <string>{{1,202},{239,127}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>2008.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{239,127}</string>
+                <key>spriteSourceSize</key>
+                <string>{239,127}</string>
+                <key>textureRect</key>
+                <string>{{253,1},{239,127}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>2009.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{115,93}</string>
+                <key>spriteSourceSize</key>
+                <string>{115,93}</string>
+                <key>textureRect</key>
+                <string>{{701,412},{115,93}}</string>
+                <key>textureRotated</key>
+                <false/>
            </dict>
            <key>2301.png</key>
            <dict>
@@ -285,7 +330,7 @@
                <key>spriteSourceSize</key>
                <string>{256,256}</string>
                <key>textureRect</key>
-                <string>{{1140,203},{126,138}}</string>
+                <string>{{381,306},{126,138}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -300,9 +345,9 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{1,392},{84,98}}</string>
+                <string>{{603,310},{84,98}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>2303.png</key>
            <dict>
@@ -315,7 +360,7 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{852,191},{124,142}}</string>
+                <string>{{895,180},{124,142}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -330,9 +375,9 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{296,191},{128,144}}</string>
+                <string>{{603,180},{128,144}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>2305.png</key>
            <dict>
@@ -345,9 +390,9 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{892,317},{88,92}}</string>
+                <string>{{509,306},{88,92}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>2306.png</key>
            <dict>
@@ -360,7 +405,7 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{704,191},{122,146}}</string>
+                <string>{{1254,117},{122,146}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -375,7 +420,7 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{556,191},{124,146}}</string>
+                <string>{{455,180},{124,146}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -390,7 +435,7 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{996,191},{124,142}}</string>
+                <string>{{1039,180},{124,142}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -405,9 +450,9 @@
                <key>spriteSourceSize</key>
                <string>{192,192}</string>
                <key>textureRect</key>
-                <string>{{426,191},{128,144}}</string>
+                <string>{{749,180},{128,144}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>2310.png</key>
            <dict>
@@ -420,7 +465,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{982,317},{88,92}}</string>
+                <string>{{1355,241},{88,92}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -435,7 +480,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{892,411},{84,94}}</string>
+                <string>{{1049,424},{84,94}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -450,7 +495,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{87,392},{84,98}}</string>
+                <string>{{615,396},{84,98}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -465,9 +510,9 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{1132,343},{88,92}}</string>
+                <string>{{1241,416},{88,92}}</string>
                <key>textureRotated</key>
-                <true/>
+                <false/>
            </dict>
            <key>2314.png</key>
            <dict>
@@ -480,7 +525,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{988,411},{84,94}}</string>
+                <string>{{1145,424},{84,94}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -495,7 +540,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{173,404},{84,98}}</string>
+                <string>{{949,424},{84,98}}</string>
                <key>textureRotated</key>
                <true/>
            </dict>
@@ -510,7 +555,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{1226,343},{88,92}}</string>
+                <string>{{1355,335},{88,92}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -525,7 +570,22 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{780,317},{110,108}}</string>
+                <string>{{1243,241},{110,108}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>5016.Png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>spriteOffset</key>
+                <string>{0,0}</string>
+                <key>spriteSize</key>
+                <string>{128,100}</string>
+                <key>spriteSourceSize</key>
+                <string>{128,128}</string>
+                <key>textureRect</key>
+                <string>{{703,310},{128,100}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -540,7 +600,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{296,337},{126,116}}</string>
+                <string>{{949,306},{126,116}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -555,7 +615,7 @@
                <key>spriteSourceSize</key>
                <string>{128,128}</string>
                <key>textureRect</key>
-                <string>{{674,317},{104,112}}</string>
+                <string>{{509,396},{104,112}}</string>
                <key>textureRotated</key>
                <false/>
            </dict>
@@ -570,9 +630,9 @@
                <key>spriteSourceSize</key>
                <string>{200,114}</string>
                <key>textureRect</key>
-                <string>{{1148,1},{200,114}}</string>
+                <string>{{1254,1},{200,114}}</string>
                <key>textureRotated</key>
-                <true/>
+                <false/>
            </dict>
            <key>card2.png</key>
            <dict>
@@ -585,9 +645,9 @@
                <key>spriteSourceSize</key>
                <string>{200,114}</string>
                <key>textureRect</key>
-                <string>{{180,202},{200,114}}</string>
+                <string>{{253,130},{200,114}}</string>
                <key>textureRotated</key>
-                <true/>
+                <false/>
            </dict>
            <key>equipment_frame_blue.png</key>
            <dict>
@@ -600,9 +660,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{1,202},{177,188}}</string>
+                <string>{{1,331},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>equipment_frame_brown.png</key>
            <dict>
@@ -615,9 +675,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{253,1},{177,188}}</string>
+                <string>{{191,331},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>equipment_frame_green.png</key>
            <dict>
@@ -630,9 +690,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{432,1},{177,188}}</string>
+                <string>{{494,1},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>equipment_frame_purple.png</key>
            <dict>
@@ -645,9 +705,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{611,1},{177,188}}</string>
+                <string>{{684,1},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>equipment_frame_red.png</key>
            <dict>
@@ -660,9 +720,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{790,1},{177,188}}</string>
+                <string>{{874,1},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>equipment_frame_yellow.png</key>
            <dict>
@@ -675,9 +735,9 @@
                <key>spriteSourceSize</key>
                <string>{177,188}</string>
                <key>textureRect</key>
-                <string>{{969,1},{177,188}}</string>
+                <string>{{1064,1},{177,188}}</string>
                <key>textureRotated</key>
-                <false/>
+                <true/>
            </dict>
            <key>icon.png</key>
            <dict>
@@ -706,9 +766,9 @@
            <key>realTextureFileName</key>
            <string>items.png</string>
            <key>size</key>
-            <string>{1317,496}</string>
+            <string>{1455,509}</string>
            <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:0f31fc8265514a8eed8f06c160105b84:9a8fe8b0517c69e30b13f5fc9587d13d:9b2c40378ce3448cae3ca053079d3001$</string>
+            <string>$TexturePacker:SmartUpdate:09500f941f46f1b14b497070d49a2878:cd7302f6d6f5183989f7cf780b7ce5b7:9b2c40378ce3448cae3ca053079d3001$</string>
            <key>textureFileName</key>
            <string>items.png</string>
        </dict>
--- a/assets/resources/gui/items.plist.meta
+++ b/assets/resources/gui/items.plist.meta
@@ -16,11 +16,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": -2,
-        "trimX": 1202,
-        "trimY": 437,
+        "trimX": 1303,
+        "trimY": 351,
        "width": 56,
        "height": 50,
        "rawWidth": 64,
@@ -65,8 +65,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 606,
-        "trimY": 433,
+        "trimX": 1183,
+        "trimY": 180,
        "width": 58,
        "height": 58,
        "rawWidth": 64,
@@ -108,10 +108,10 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 432,
+        "trimX": 494,
        "trimY": 1,
        "width": 177,
        "height": 188,
@@ -157,8 +157,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": -2,
-        "trimX": 1260,
-        "trimY": 437,
+        "trimX": 242,
+        "trimY": 246,
        "width": 56,
        "height": 50,
        "rawWidth": 64,
@@ -203,8 +203,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1264,
-        "trimY": 1,
+        "trimX": 1402,
+        "trimY": 117,
        "width": 50,
        "height": 56,
        "rawWidth": 64,
@@ -249,8 +249,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1264,
-        "trimY": 59,
+        "trimX": 1402,
+        "trimY": 175,
        "width": 50,
        "height": 56,
        "rawWidth": 64,
@@ -295,8 +295,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1264,
-        "trimY": 117,
+        "trimX": 1193,
+        "trimY": 358,
        "width": 50,
        "height": 56,
        "rawWidth": 64,
@@ -341,8 +341,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": -2,
-        "trimX": 1144,
-        "trimY": 433,
+        "trimX": 1245,
+        "trimY": 351,
        "width": 56,
        "height": 50,
        "rawWidth": 64,
@@ -387,8 +387,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1268,
-        "trimY": 175,
+        "trimX": 1193,
+        "trimY": 300,
        "width": 48,
        "height": 56,
        "rawWidth": 64,
@@ -430,11 +430,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1268,
-        "trimY": 233,
+        "trimX": 300,
+        "trimY": 246,
        "width": 48,
        "height": 56,
        "rawWidth": 64,
@@ -476,11 +476,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 666,
-        "trimY": 433,
+        "trimX": 358,
+        "trimY": 246,
        "width": 48,
        "height": 56,
        "rawWidth": 64,
@@ -525,8 +525,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 716,
-        "trimY": 431,
+        "trimX": 818,
+        "trimY": 428,
        "width": 50,
        "height": 54,
        "rawWidth": 64,
@@ -571,8 +571,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 768,
-        "trimY": 431,
+        "trimX": 870,
+        "trimY": 428,
        "width": 50,
        "height": 54,
        "rawWidth": 64,
@@ -617,8 +617,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 820,
-        "trimY": 427,
+        "trimX": 1331,
+        "trimY": 429,
        "width": 50,
        "height": 54,
        "rawWidth": 64,
@@ -663,8 +663,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1072,
-        "trimY": 317,
+        "trimX": 447,
+        "trimY": 446,
        "width": 58,
        "height": 58,
        "rawWidth": 64,
@@ -709,8 +709,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 540,
-        "trimY": 433,
+        "trimX": 381,
+        "trimY": 446,
        "width": 64,
        "height": 62,
        "rawWidth": 64,
@@ -755,8 +755,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1084,
-        "trimY": 437,
+        "trimX": 1183,
+        "trimY": 240,
        "width": 58,
        "height": 58,
        "rawWidth": 64,
@@ -801,8 +801,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 424,
-        "trimY": 337,
+        "trimX": 833,
+        "trimY": 310,
        "width": 114,
        "height": 116,
        "rawWidth": 128,
@@ -844,11 +844,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 556,
-        "trimY": 317,
+        "trimX": 1077,
+        "trimY": 306,
        "width": 114,
        "height": 116,
        "rawWidth": 128,
@@ -881,6 +881,144 @@
      ],
      "subMetas": {}
    },
+    "ab954": {
+      "importer": "sprite-frame",
+      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@ab954",
+      "displayName": "",
+      "id": "ab954",
+      "name": "2007",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 1,
+        "trimY": 202,
+        "width": 239,
+        "height": 127,
+        "rawWidth": 239,
+        "rawHeight": 127,
+        "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": {}
+    },
+    "efaae": {
+      "importer": "sprite-frame",
+      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@efaae",
+      "displayName": "",
+      "id": "efaae",
+      "name": "2008",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 253,
+        "trimY": 1,
+        "width": 239,
+        "height": 127,
+        "rawWidth": 239,
+        "rawHeight": 127,
+        "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": {}
+    },
+    "f44c3": {
+      "importer": "sprite-frame",
+      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@f44c3",
+      "displayName": "",
+      "id": "f44c3",
+      "name": "2009",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 701,
+        "trimY": 412,
+        "width": 115,
+        "height": 93,
+        "rawWidth": 115,
+        "rawHeight": 93,
+        "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": {}
+    },
    "224f9": {
      "importer": "sprite-frame",
      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@224f9",
@@ -893,8 +1031,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1140,
-        "trimY": 203,
+        "trimX": 381,
+        "trimY": 306,
        "width": 126,
        "height": 138,
        "rawWidth": 256,
@@ -936,11 +1074,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": -4,
-        "trimX": 1,
-        "trimY": 392,
+        "trimX": 603,
+        "trimY": 310,
        "width": 84,
        "height": 98,
        "rawWidth": 128,
@@ -985,8 +1123,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -6,
-        "trimX": 852,
-        "trimY": 191,
+        "trimX": 895,
+        "trimY": 180,
        "width": 124,
        "height": 142,
        "rawWidth": 192,
@@ -1028,11 +1166,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": -1,
        "offsetY": -6,
-        "trimX": 296,
-        "trimY": 191,
+        "trimX": 603,
+        "trimY": 180,
        "width": 128,
        "height": 144,
        "rawWidth": 192,
@@ -1074,11 +1212,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": -1,
        "offsetY": -4,
-        "trimX": 892,
-        "trimY": 317,
+        "trimX": 509,
+        "trimY": 306,
        "width": 88,
        "height": 92,
        "rawWidth": 128,
@@ -1123,8 +1261,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -6,
-        "trimX": 704,
-        "trimY": 191,
+        "trimX": 1254,
+        "trimY": 117,
        "width": 122,
        "height": 146,
        "rawWidth": 192,
@@ -1169,8 +1307,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -6,
-        "trimX": 556,
-        "trimY": 191,
+        "trimX": 455,
+        "trimY": 180,
        "width": 124,
        "height": 146,
        "rawWidth": 192,
@@ -1215,8 +1353,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -6,
-        "trimX": 996,
-        "trimY": 191,
+        "trimX": 1039,
+        "trimY": 180,
        "width": 124,
        "height": 142,
        "rawWidth": 192,
@@ -1258,11 +1396,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": -1,
        "offsetY": -6,
-        "trimX": 426,
-        "trimY": 191,
+        "trimX": 749,
+        "trimY": 180,
        "width": 128,
        "height": 144,
        "rawWidth": 192,
@@ -1307,8 +1445,8 @@
        "rotated": false,
        "offsetX": -1,
        "offsetY": -4,
-        "trimX": 982,
-        "trimY": 317,
+        "trimX": 1355,
+        "trimY": 241,
        "width": 88,
        "height": 92,
        "rawWidth": 128,
@@ -1353,8 +1491,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -4,
-        "trimX": 892,
-        "trimY": 411,
+        "trimX": 1049,
+        "trimY": 424,
        "width": 84,
        "height": 94,
        "rawWidth": 128,
@@ -1399,8 +1537,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": -4,
-        "trimX": 87,
-        "trimY": 392,
+        "trimX": 615,
+        "trimY": 396,
        "width": 84,
        "height": 98,
        "rawWidth": 128,
@@ -1442,11 +1580,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
        "offsetX": -1,
        "offsetY": -4,
-        "trimX": 1132,
-        "trimY": 343,
+        "trimX": 1241,
+        "trimY": 416,
        "width": 88,
        "height": 92,
        "rawWidth": 128,
@@ -1491,8 +1629,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -4,
-        "trimX": 988,
-        "trimY": 411,
+        "trimX": 1145,
+        "trimY": 424,
        "width": 84,
        "height": 94,
        "rawWidth": 128,
@@ -1537,8 +1675,8 @@
        "rotated": true,
        "offsetX": 0,
        "offsetY": -4,
-        "trimX": 173,
-        "trimY": 404,
+        "trimX": 949,
+        "trimY": 424,
        "width": 84,
        "height": 98,
        "rawWidth": 128,
@@ -1583,8 +1721,8 @@
        "rotated": false,
        "offsetX": -1,
        "offsetY": -4,
-        "trimX": 1226,
-        "trimY": 343,
+        "trimX": 1355,
+        "trimY": 335,
        "width": 88,
        "height": 92,
        "rawWidth": 128,
@@ -1629,8 +1767,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 780,
-        "trimY": 317,
+        "trimX": 1243,
+        "trimY": 241,
        "width": 110,
        "height": 108,
        "rawWidth": 128,
@@ -1663,6 +1801,52 @@
      ],
      "subMetas": {}
    },
+    "7ff41": {
+      "importer": "sprite-frame",
+      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@7ff41",
+      "displayName": "",
+      "id": "7ff41",
+      "name": "5016",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 703,
+        "trimY": 310,
+        "width": 128,
+        "height": 100,
+        "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": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
    "094d8": {
      "importer": "sprite-frame",
      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@094d8",
@@ -1675,8 +1859,8 @@
        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 296,
-        "trimY": 337,
+        "trimX": 949,
+        "trimY": 306,
        "width": 126,
        "height": 116,
        "rawWidth": 128,
@@ -1721,8 +1905,8 @@
        "rotated": false,
        "offsetX": -1,
        "offsetY": 0,
-        "trimX": 674,
-        "trimY": 317,
+        "trimX": 509,
+        "trimY": 396,
        "width": 104,
        "height": 112,
        "rawWidth": 128,
@@ -1764,10 +1948,10 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 1148,
+        "trimX": 1254,
        "trimY": 1,
        "width": 200,
        "height": 114,
@@ -1810,11 +1994,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 180,
-        "trimY": 202,
+        "trimX": 253,
+        "trimY": 130,
        "width": 200,
        "height": 114,
        "rawWidth": 200,
@@ -1856,11 +2040,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
        "trimX": 1,
-        "trimY": 202,
+        "trimY": 331,
        "width": 177,
        "height": 188,
        "rawWidth": 177,
@@ -1902,11 +2086,11 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 253,
-        "trimY": 1,
+        "trimX": 191,
+        "trimY": 331,
        "width": 177,
        "height": 188,
        "rawWidth": 177,
@@ -1948,10 +2132,10 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 611,
+        "trimX": 684,
        "trimY": 1,
        "width": 177,
        "height": 188,
@@ -1994,10 +2178,10 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 790,
+        "trimX": 874,
        "trimY": 1,
        "width": 177,
        "height": 188,
@@ -2040,10 +2224,10 @@
      "userData": {
        "trimType": "auto",
        "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
        "offsetX": 0,
        "offsetY": 0,
-        "trimX": 969,
+        "trimX": 1064,
        "trimY": 1,
        "width": 177,
        "height": 188,
--- a/assets/resources/gui/items.png
+++ b/assets/resources/gui/items.png