diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index cd25c868..9c24c090 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -1062,7 +1062,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 435.147,
+      "y": 487.134,
       "z": 0
     },
     "_lrot": {
@@ -1453,7 +1453,7 @@
         "__id__": 72
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 80
@@ -1471,7 +1471,7 @@
     "_lpos": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 220.965,
+      "y": 208.926,
       "z": 0
     },
     "_lrot": {
@@ -1698,7 +1698,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -70,
+      "x": -20,
       "y": 0,
       "z": 0
     },
@@ -1840,7 +1840,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -47.013,
+      "x": 0,
       "y": 0,
       "z": 0
     },
@@ -2165,7 +2165,7 @@
     "_left": 0,
     "_right": 0,
     "_top": 0,
-    "_bottom": 435.147,
+    "_bottom": 487.134,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -2507,8 +2507,8 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -180,
-      "y": 154.567,
+      "x": 0,
+      "y": 442.302,
       "z": 0
     },
     "_lrot": {
@@ -2557,7 +2557,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -85.592,
+      "x": -26.797,
       "y": 0,
       "z": 0
     },
@@ -2716,7 +2716,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 9.236,
+      "x": 62.916,
       "y": 0,
       "z": 0
     },
@@ -2866,7 +2866,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 360,
+      "width": 720,
       "height": 45
     },
     "_anchorPoint": {
@@ -2940,9 +2940,9 @@
     "_alignFlags": 44,
     "_target": null,
     "_left": 0,
-    "_right": 360,
+    "_right": 0,
     "_top": 0,
-    "_bottom": 132.067,
+    "_bottom": 419.802,
     "_horizontalCenter": 0,
     "_verticalCenter": 0,
     "_isAbsLeft": true,
@@ -4938,7 +4938,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 180,
+      "x": 0,
       "y": 153.275,
       "z": 0
     },
@@ -5032,7 +5032,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 360,
+      "width": 720,
       "height": 45
     },
     "_anchorPoint": {
@@ -5139,8 +5139,6 @@
       "__id__": 0
     },
     "fileId": "35dr0lJV9CO5Ld8TLk7eCZ",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -5166,7 +5164,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -138.644,
+      "x": -35,
       "y": 0,
       "z": 0
     },
@@ -5278,8 +5276,6 @@
       "__id__": 0
     },
     "fileId": "e7dPNasr5IyqES0tbwxJX3",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -5308,7 +5304,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": -114.038,
+      "x": -15.457,
       "y": 0,
       "z": 0
     },
@@ -5464,8 +5460,6 @@
       "__id__": 0
     },
     "fileId": "65zRY1wpZPNLTXws9hsdcE",
-    "instance": null,
-    "targetOverrides": null,
     "nestedPrefabInstanceRoots": null
   },
   {
@@ -5482,7 +5476,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 360,
+      "width": 720,
       "height": 45
     },
     "_anchorPoint": {
@@ -5552,7 +5546,7 @@
     },
     "_alignFlags": 40,
     "_target": null,
-    "_left": 360,
+    "_left": 0,
     "_right": 0,
     "_top": 0,
     "_bottom": 0,
@@ -8775,7 +8769,7 @@
         "__id__": 491
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 497
@@ -10431,7 +10425,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 0,
+      "x": -85,
       "y": 0,
       "z": 0
     },
@@ -11648,7 +11642,7 @@
     },
     "_lpos": {
       "__type__": "cc.Vec3",
-      "x": 240,
+      "x": 185,
       "y": 0,
       "z": 0
     },
@@ -12087,14 +12081,14 @@
     "node": {
       "__id__": 552
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": {
       "__id__": 572
     },
     "_alignFlags": 33,
     "_target": null,
     "_left": 0,
-    "_right": 0,
+    "_right": 120,
     "_top": 40,
     "_bottom": 1078.082,
     "_horizontalCenter": 0,
@@ -12198,7 +12192,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 700,
+      "width": 590,
       "height": 150
     },
     "_anchorPoint": {
@@ -12232,11 +12226,11 @@
       "height": 40
     },
     "_startAxis": 0,
-    "_paddingLeft": 0,
+    "_paddingLeft": 100,
     "_paddingRight": 0,
     "_paddingTop": 0,
     "_paddingBottom": 0,
-    "_spacingX": 20,
+    "_spacingX": 50,
     "_spacingY": 0,
     "_verticalDirection": 1,
     "_horizontalDirection": 0,
@@ -12264,8 +12258,8 @@
     },
     "_alignFlags": 44,
     "_target": null,
-    "_left": 10,
-    "_right": 10,
+    "_left": 65,
+    "_right": 65,
     "_top": 1230,
     "_bottom": 7.988,
     "_horizontalCenter": 0,
@@ -12790,7 +12784,7 @@
         "__id__": 809
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 826
diff --git a/assets/resources/gui/ui3.plist b/assets/resources/gui/ui3.plist
index c8271818..2104477d 100644
--- a/assets/resources/gui/ui3.plist
+++ b/assets/resources/gui/ui3.plist
@@ -17,7 +17,7 @@
                 <key>spriteSourceSize</key>
                 <string>{60,386}</string>
                 <key>textureRect</key>
-                <string>{{474,1},{60,386}}</string>
+                <string>{{275,877},{60,386}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -34,7 +34,7 @@
                 <key>spriteSourceSize</key>
                 <string>{108,108}</string>
                 <key>textureRect</key>
-                <string>{{1797,1521},{108,108}}</string>
+                <string>{{1056,1482},{108,108}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -51,7 +51,7 @@
                 <key>spriteSourceSize</key>
                 <string>{108,108}</string>
                 <key>textureRect</key>
-                <string>{{1797,1521},{108,108}}</string>
+                <string>{{1056,1482},{108,108}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -68,7 +68,7 @@
                 <key>spriteSourceSize</key>
                 <string>{180,221}</string>
                 <key>textureRect</key>
-                <string>{{982,1324},{180,221}}</string>
+                <string>{{337,1091},{180,221}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -85,7 +85,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,253}</string>
                 <key>textureRect</key>
-                <string>{{612,1069},{204,253}}</string>
+                <string>{{69,1137},{204,253}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -102,9 +102,9 @@
                 <key>spriteSourceSize</key>
                 <string>{204,258}</string>
                 <key>textureRect</key>
-                <string>{{536,1},{204,258}}</string>
+                <string>{{419,349},{204,258}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>CardFrame_Rectangle_01_Green_Bg.png</key>
             <dict>
@@ -119,9 +119,9 @@
                 <key>spriteSourceSize</key>
                 <string>{180,221}</string>
                 <key>textureRect</key>
-                <string>{{1254,1},{180,221}}</string>
+                <string>{{679,352},{180,221}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>CardFrame_Rectangle_01_Green_Border.png</key>
             <dict>
@@ -136,7 +136,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,253}</string>
                 <key>textureRect</key>
-                <string>{{818,1069},{204,253}}</string>
+                <string>{{508,555},{204,253}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -153,7 +153,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,258}</string>
                 <key>textureRect</key>
-                <string>{{742,1},{204,258}}</string>
+                <string>{{69,877},{204,258}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -170,7 +170,7 @@
                 <key>spriteSourceSize</key>
                 <string>{180,221}</string>
                 <key>textureRect</key>
-                <string>{{1436,1},{180,221}}</string>
+                <string>{{714,534},{180,221}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -187,7 +187,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,253}</string>
                 <key>textureRect</key>
-                <string>{{893,767},{204,253}}</string>
+                <string>{{337,836},{204,253}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -204,9 +204,9 @@
                 <key>spriteSourceSize</key>
                 <string>{204,258}</string>
                 <key>textureRect</key>
-                <string>{{677,389},{204,258}}</string>
+                <string>{{798,146},{204,258}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>CardFrame_Rectangle_01_Red_Bg.png</key>
             <dict>
@@ -221,7 +221,7 @@
                 <key>spriteSourceSize</key>
                 <string>{180,221}</string>
                 <key>textureRect</key>
-                <string>{{1316,387},{180,221}}</string>
+                <string>{{902,352},{180,221}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -238,7 +238,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,253}</string>
                 <key>textureRect</key>
-                <string>{{1024,1066},{204,253}}</string>
+                <string>{{543,810},{204,253}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,7 +255,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,258}</string>
                 <key>textureRect</key>
-                <string>{{948,1},{204,258}}</string>
+                <string>{{1,1392},{204,258}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -272,9 +272,9 @@
                 <key>spriteSourceSize</key>
                 <string>{180,221}</string>
                 <key>textureRect</key>
-                <string>{{1205,1321},{180,221}}</string>
+                <string>{{896,575},{180,221}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>CardFrame_Rectangle_01_Yellow_Border.png</key>
             <dict>
@@ -289,7 +289,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,253}</string>
                 <key>textureRect</key>
-                <string>{{1099,767},{204,253}}</string>
+                <string>{{560,1065},{204,253}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -306,7 +306,7 @@
                 <key>spriteSourceSize</key>
                 <string>{204,258}</string>
                 <key>textureRect</key>
-                <string>{{883,387},{204,258}}</string>
+                <string>{{302,576},{204,258}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -323,9 +323,9 @@
                 <key>spriteSourceSize</key>
                 <string>{48,190}</string>
                 <key>textureRect</key>
-                <string>{{1250,1066},{48,190}}</string>
+                <string>{{207,1625},{48,190}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>CardFrame_Rectangle_02_Border.png</key>
             <dict>
@@ -340,9 +340,9 @@
                 <key>spriteSourceSize</key>
                 <string>{56,63}</string>
                 <key>textureRect</key>
-                <string>{{1230,1262},{56,63}}</string>
+                <string>{{694,1320},{56,63}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>CardFrame_Rectangle_02_FrontGradient.png</key>
             <dict>
@@ -357,7 +357,7 @@
                 <key>spriteSourceSize</key>
                 <string>{48,189}</string>
                 <key>textureRect</key>
-                <string>{{1300,1066},{48,189}}</string>
+                <string>{{1058,146},{48,189}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -374,7 +374,7 @@
                 <key>spriteSourceSize</key>
                 <string>{48,52}</string>
                 <key>textureRect</key>
-                <string>{{1996,292},{48,52}}</string>
+                <string>{{1728,1127},{48,52}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -391,7 +391,7 @@
                 <key>spriteSourceSize</key>
                 <string>{416,428}</string>
                 <key>textureRect</key>
-                <string>{{194,1083},{416,428}}</string>
+                <string>{{1,146},{416,428}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -408,7 +408,7 @@
                 <key>spriteSourceSize</key>
                 <string>{38,42}</string>
                 <key>textureRect</key>
-                <string>{{1101,1022},{38,42}}</string>
+                <string>{{517,1651},{38,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -425,7 +425,7 @@
                 <key>spriteSourceSize</key>
                 <string>{183,183}</string>
                 <key>textureRect</key>
-                <string>{{612,1324},{183,183}}</string>
+                <string>{{766,1025},{183,183}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -442,7 +442,7 @@
                 <key>spriteSourceSize</key>
                 <string>{183,183}</string>
                 <key>textureRect</key>
-                <string>{{797,1324},{183,183}}</string>
+                <string>{{766,1210},{183,183}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -459,7 +459,7 @@
                 <key>spriteSourceSize</key>
                 <string>{299,299}</string>
                 <key>textureRect</key>
-                <string>{{592,768},{299,299}}</string>
+                <string>{{1,576},{299,299}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -476,7 +476,7 @@
                 <key>spriteSourceSize</key>
                 <string>{231,225}</string>
                 <key>textureRect</key>
-                <string>{{1089,387},{231,225}}</string>
+                <string>{{207,1392},{231,225}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -493,9 +493,9 @@
                 <key>spriteSourceSize</key>
                 <string>{60,62}</string>
                 <key>textureRect</key>
-                <string>{{1295,1258},{60,62}}</string>
+                <string>{{1739,825},{60,62}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemFrame00~03_BgGlow.png</key>
             <dict>
@@ -510,7 +510,7 @@
                 <key>spriteSourceSize</key>
                 <string>{133,133}</string>
                 <key>textureRect</key>
-                <string>{{1895,1},{133,133}}</string>
+                <string>{{1225,558},{133,133}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -527,7 +527,7 @@
                 <key>spriteSourceSize</key>
                 <string>{50,39}</string>
                 <key>textureRect</key>
-                <string>{{1477,906},{50,39}}</string>
+                <string>{{1202,693},{50,39}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -544,7 +544,7 @@
                 <key>spriteSourceSize</key>
                 <string>{60,62}</string>
                 <key>textureRect</key>
-                <string>{{1572,533},{60,62}}</string>
+                <string>{{1739,889},{60,62}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -561,7 +561,7 @@
                 <key>spriteSourceSize</key>
                 <string>{110,110}</string>
                 <key>textureRect</key>
-                <string>{{1675,1321},{110,110}}</string>
+                <string>{{1616,1179},{110,110}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -578,7 +578,7 @@
                 <key>spriteSourceSize</key>
                 <string>{76,78}</string>
                 <key>textureRect</key>
-                <string>{{1447,1238},{76,78}}</string>
+                <string>{{1054,1394},{76,78}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -595,9 +595,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1763,1},{128,130}}</string>
+                <string>{{1360,558},{128,130}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemFrame03_Single_Gray.png</key>
             <dict>
@@ -612,7 +612,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1763,131},{128,130}}</string>
+                <string>{{1490,575},{128,130}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -629,9 +629,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1618,91},{128,130}}</string>
+                <string>{{434,1387},{128,130}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemFrame03_Single_Navy.png</key>
             <dict>
@@ -646,7 +646,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1642,383},{128,130}}</string>
+                <string>{{434,1519},{128,130}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -663,7 +663,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1772,383},{128,130}}</string>
+                <string>{{564,1320},{128,130}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -680,9 +680,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1811,515},{128,130}}</string>
+                <string>{{564,1452},{128,130}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemFrame03_Single_Yellow.png</key>
             <dict>
@@ -697,9 +697,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,130}</string>
                 <key>textureRect</key>
-                <string>{{1803,743},{128,130}}</string>
+                <string>{{694,1395},{128,130}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemFrame_Square_03_Bg.png</key>
             <dict>
@@ -714,7 +714,7 @@
                 <key>spriteSourceSize</key>
                 <string>{52,52}</string>
                 <key>textureRect</key>
-                <string>{{1695,889},{52,52}}</string>
+                <string>{{999,1629},{52,52}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -731,7 +731,7 @@
                 <key>spriteSourceSize</key>
                 <string>{52,52}</string>
                 <key>textureRect</key>
-                <string>{{1749,889},{52,52}}</string>
+                <string>{{1728,1073},{52,52}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -748,7 +748,7 @@
                 <key>spriteSourceSize</key>
                 <string>{48,48}</string>
                 <key>textureRect</key>
-                <string>{{1994,346},{48,48}}</string>
+                <string>{{1728,1181},{48,48}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -765,7 +765,7 @@
                 <key>spriteSourceSize</key>
                 <string>{40,40}</string>
                 <key>textureRect</key>
-                <string>{{1902,383},{40,40}}</string>
+                <string>{{1732,1271},{40,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -782,9 +782,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1329,947},{108,116}}</string>
+                <string>{{1614,1291},{108,116}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Battle.png</key>
             <dict>
@@ -799,7 +799,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1943,550},{128,104}}</string>
+                <string>{{1119,538},{128,104}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -816,7 +816,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{905,647},{120,118}}</string>
+                <string>{{1618,705},{120,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -833,9 +833,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{677,649},{112,116}}</string>
+                <string>{{1258,1061},{112,116}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Coin_Silver.png</key>
             <dict>
@@ -850,7 +850,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{791,649},{112,116}}</string>
+                <string>{{1376,1062},{112,116}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -867,7 +867,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1090,261},{120,120}}</string>
+                <string>{{1487,937},{120,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -884,7 +884,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{764,261},{124,108}}</string>
+                <string>{{1377,936},{124,108}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -901,9 +901,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{874,261},{124,108}}</string>
+                <string>{{1490,1181},{124,108}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_GearWheel.png</key>
             <dict>
@@ -918,7 +918,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{474,894},{116,120}}</string>
+                <string>{{1610,1057},{116,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -935,9 +935,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1935,680},{128,112}}</string>
+                <string>{{275,1273},{128,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Gear_Bow.png</key>
             <dict>
@@ -952,7 +952,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1921,1070},{108,112}}</string>
+                <string>{{1376,1180},{108,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -969,7 +969,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{387,1513},{124,120}}</string>
+                <string>{{694,1527},{124,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -986,7 +986,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1779,943},{114,120}}</string>
+                <string>{{1373,814},{114,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1003,7 +1003,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1807,1177},{108,112}}</string>
+                <string>{{1376,1290},{108,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1020,9 +1020,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1439,947},{116,108}}</string>
+                <string>{{1259,951},{116,108}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Gift_Yellow.png</key>
             <dict>
@@ -1037,7 +1037,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1525,1211},{116,108}}</string>
+                <string>{{1258,1175},{116,108}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1054,9 +1054,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{873,1509},{122,110}}</string>
+                <string>{{1615,825},{122,110}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Medal_Bronze_1.png</key>
             <dict>
@@ -1071,9 +1071,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1846,261},{120,104}}</string>
+                <string>{{1488,1513},{120,104}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Medal_Bronze_2.png</key>
             <dict>
@@ -1088,9 +1088,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1895,136},{120,104}}</string>
+                <string>{{824,1519},{120,104}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Medal_Gold_1.png</key>
             <dict>
@@ -1105,7 +1105,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1921,1180},{128,110}}</string>
+                <string>{{1622,575},{128,110}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1122,7 +1122,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1797,1287},{128,110}}</string>
+                <string>{{1142,756},{128,110}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1139,7 +1139,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1909,1310},{128,104}}</string>
+                <string>{{564,1584},{128,104}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1156,9 +1156,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1909,1416},{128,104}}</string>
+                <string>{{1153,886},{128,104}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Potion_Green.png</key>
             <dict>
@@ -1173,9 +1173,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{513,1513},{120,122}}</string>
+                <string>{{824,1395},{120,122}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Potion_Purple.png</key>
             <dict>
@@ -1190,7 +1190,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{637,1509},{120,122}}</string>
+                <string>{{1368,690},{120,122}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1207,9 +1207,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{985,1506},{122,108}}</string>
+                <string>{{1490,1291},{122,108}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Ranking_Gold.png</key>
             <dict>
@@ -1224,9 +1224,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1095,1506},{122,108}}</string>
+                <string>{{1132,1372},{122,108}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Scroll.png</key>
             <dict>
@@ -1241,9 +1241,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1734,261},{110,120}}</string>
+                <string>{{1490,1401},{110,120}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Scroll_Feather.png</key>
             <dict>
@@ -1258,9 +1258,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{759,1509},{122,112}}</string>
+                <string>{{1132,1258},{122,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Shop.png</key>
             <dict>
@@ -1275,7 +1275,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1549,946},{116,106}}</string>
+                <string>{{946,1395},{116,106}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1292,7 +1292,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1807,1065},{110,112}}</string>
+                <string>{{1376,1400},{110,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1309,9 +1309,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{474,768},{124,116}}</string>
+                <string>{{1489,819},{124,116}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Skill_Damage.png</key>
             <dict>
@@ -1326,9 +1326,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1935,810},{128,112}}</string>
+                <string>{{405,1273},{128,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Skill_DamageEnemy.png</key>
             <dict>
@@ -1343,7 +1343,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1935,940},{128,112}}</string>
+                <string>{{1254,693},{128,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1360,9 +1360,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1643,1211},{108,114}}</string>
+                <string>{{946,1513},{108,114}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Skill_Health.png</key>
             <dict>
@@ -1377,9 +1377,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{984,261},{124,104}}</string>
+                <string>{{1610,1517},{124,104}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Skull_Boss.png</key>
             <dict>
@@ -1394,9 +1394,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{536,261},{126,112}}</string>
+                <string>{{1490,705},{126,112}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ItemIcon_Skull_Boss_Red.png</key>
             <dict>
@@ -1411,7 +1411,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{650,261},{126,112}}</string>
+                <string>{{1259,823},{126,112}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1428,9 +1428,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1618,261},{114,120}}</string>
+                <string>{{1612,1401},{114,120}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Star.png</key>
             <dict>
@@ -1445,7 +1445,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1027,647},{120,118}}</string>
+                <string>{{1609,937},{120,118}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1462,9 +1462,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1657,945},{120,118}}</string>
+                <string>{{1490,1059},{120,118}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>ItemIcon_Ticket_Gold.png</key>
             <dict>
@@ -1479,7 +1479,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1944,420},{128,102}}</string>
+                <string>{{1154,1016},{128,102}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1496,9 +1496,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1907,1522},{128,98}}</string>
+                <string>{{1664,441},{128,98}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Loading_Circle_1.png</key>
             <dict>
@@ -1513,7 +1513,7 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1149,620},{142,144}}</string>
+                <string>{{1084,392},{142,144}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1530,9 +1530,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1519,1065},{144,142}}</string>
+                <string>{{1400,270},{144,142}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_11.png</key>
             <dict>
@@ -1547,9 +1547,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1531,1321},{144,142}}</string>
+                <string>{{1228,414},{144,142}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_12.png</key>
             <dict>
@@ -1564,9 +1564,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1621,743},{144,140}}</string>
+                <string>{{1546,289},{144,140}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_2.png</key>
             <dict>
@@ -1581,9 +1581,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1293,620},{142,144}}</string>
+                <string>{{1374,414},{142,144}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Loading_Circle_3.png</key>
             <dict>
@@ -1598,7 +1598,7 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1663,1065},{142,142}}</string>
+                <string>{{1520,431},{142,142}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1615,9 +1615,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1477,758},{146,142}}</string>
+                <string>{{1291,126},{146,142}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_5.png</key>
             <dict>
@@ -1632,9 +1632,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1387,1321},{144,142}}</string>
+                <string>{{1108,248},{144,142}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_6.png</key>
             <dict>
@@ -1649,9 +1649,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1445,1467},{144,142}}</string>
+                <string>{{1254,270},{144,142}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Loading_Circle_7.png</key>
             <dict>
@@ -1666,9 +1666,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1467,610},{142,146}}</string>
+                <string>{{1439,126},{142,146}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Loading_Circle_8.png</key>
             <dict>
@@ -1683,9 +1683,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1498,387},{142,144}}</string>
+                <string>{{1625,1},{142,144}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Loading_Circle_9.png</key>
             <dict>
@@ -1700,9 +1700,9 @@
                 <key>spriteSourceSize</key>
                 <string>{146,146}</string>
                 <key>textureRect</key>
-                <string>{{1611,597},{142,144}}</string>
+                <string>{{1587,145},{142,144}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Shape 674.png</key>
             <dict>
@@ -1717,9 +1717,9 @@
                 <key>spriteSourceSize</key>
                 <string>{81,86}</string>
                 <key>textureRect</key>
-                <string>{{1359,1238},{81,86}}</string>
+                <string>{{1119,668},{81,86}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>SkillFrame_01_Bg.png</key>
             <dict>
@@ -1734,7 +1734,7 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1387,1467},{56,58}}</string>
+                <string>{{881,1625},{56,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1751,7 +1751,7 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1695,515},{56,58}}</string>
+                <string>{{1731,953},{56,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1768,7 +1768,7 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1753,515},{56,58}}</string>
+                <string>{{1270,1555},{56,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1785,9 +1785,9 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1855,685},{56,58}}</string>
+                <string>{{1270,1615},{56,58}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>SkillFrame_01_Border_Red.png</key>
             <dict>
@@ -1802,9 +1802,9 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1803,873},{56,58}}</string>
+                <string>{{939,1629},{56,58}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>SkillFrame_01_Border_Yellow.png</key>
             <dict>
@@ -1819,7 +1819,7 @@
                 <key>spriteSourceSize</key>
                 <string>{56,58}</string>
                 <key>textureRect</key>
-                <string>{{1675,1433},{56,58}}</string>
+                <string>{{1731,1013},{56,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1836,9 +1836,9 @@
                 <key>spriteSourceSize</key>
                 <string>{150,28}</string>
                 <key>textureRect</key>
-                <string>{{440,1049},{150,28}}</string>
+                <string>{{1771,1},{150,28}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>Slider_Border_Tapered_02_Fill_Green.Png</key>
             <dict>
@@ -1853,7 +1853,7 @@
                 <key>spriteSourceSize</key>
                 <string>{150,28}</string>
                 <key>textureRect</key>
-                <string>{{1212,232},{150,28}}</string>
+                <string>{{1124,1089},{150,28}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1870,7 +1870,7 @@
                 <key>spriteSourceSize</key>
                 <string>{150,28}</string>
                 <key>textureRect</key>
-                <string>{{1242,232},{150,28}}</string>
+                <string>{{1733,145},{150,28}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1887,7 +1887,7 @@
                 <key>spriteSourceSize</key>
                 <string>{150,28}</string>
                 <key>textureRect</key>
-                <string>{{1437,610},{150,28}}</string>
+                <string>{{1692,289},{150,28}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1904,7 +1904,7 @@
                 <key>spriteSourceSize</key>
                 <string>{150,28}</string>
                 <key>textureRect</key>
-                <string>{{1447,762},{150,28}}</string>
+                <string>{{1763,153},{150,28}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1921,7 +1921,7 @@
                 <key>spriteSourceSize</key>
                 <string>{25,25}</string>
                 <key>textureRect</key>
-                <string>{{514,1016},{25,25}}</string>
+                <string>{{1156,1668},{25,25}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1938,7 +1938,7 @@
                 <key>spriteSourceSize</key>
                 <string>{23,24}</string>
                 <key>textureRect</key>
-                <string>{{541,1016},{23,24}}</string>
+                <string>{{535,1273},{23,24}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -1955,9 +1955,9 @@
                 <key>spriteSourceSize</key>
                 <string>{23,24}</string>
                 <key>textureRect</key>
-                <string>{{566,1016},{23,24}}</string>
+                <string>{{508,810},{23,24}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Slider_Play_01_Border.png</key>
             <dict>
@@ -1972,7 +1972,7 @@
                 <key>spriteSourceSize</key>
                 <string>{17,16}</string>
                 <key>textureRect</key>
-                <string>{{1089,620},{17,16}}</string>
+                <string>{{1546,270},{17,16}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -1989,9 +1989,9 @@
                 <key>spriteSourceSize</key>
                 <string>{4,18}</string>
                 <key>textureRect</key>
-                <string>{{1,1625},{4,18}}</string>
+                <string>{{896,534},{4,18}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Slider_Play_01_Fill_Red.png</key>
             <dict>
@@ -2006,9 +2006,9 @@
                 <key>spriteSourceSize</key>
                 <string>{4,18}</string>
                 <key>textureRect</key>
-                <string>{{21,1625},{4,18}}</string>
+                <string>{{896,554},{4,18}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Slider_Play_02_Fill_Red.png</key>
             <dict>
@@ -2023,9 +2023,9 @@
                 <key>spriteSourceSize</key>
                 <string>{194,18}</string>
                 <key>textureRect</key>
-                <string>{{1230,1066},{194,18}}</string>
+                <string>{{1,1675},{194,18}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>Title_Result_Victory.png</key>
             <dict>
@@ -2040,9 +2040,9 @@
                 <key>spriteSourceSize</key>
                 <string>{377,201}</string>
                 <key>textureRect</key>
-                <string>{{474,389},{377,201}}</string>
+                <string>{{419,146},{377,201}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>ToastMessage_Light2.png</key>
             <dict>
@@ -2057,7 +2057,7 @@
                 <key>spriteSourceSize</key>
                 <string>{181,120}</string>
                 <key>textureRect</key>
-                <string>{{204,1513},{181,120}}</string>
+                <string>{{1108,126},{181,120}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2074,7 +2074,7 @@
                 <key>spriteSourceSize</key>
                 <string>{72,72}</string>
                 <key>textureRect</key>
-                <string>{{1498,533},{72,72}}</string>
+                <string>{{1166,1482},{72,72}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2091,7 +2091,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1589,1522},{102,110}}</string>
+                <string>{{1154,1146},{102,110}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2108,9 +2108,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1693,1522},{102,110}}</string>
+                <string>{{1376,1512},{102,110}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>UI_Rewards_Medal_01_Silver.png</key>
             <dict>
@@ -2125,9 +2125,9 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1797,1417},{102,110}}</string>
+                <string>{{1166,1556},{102,110}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>UI_Rewards_Trophy_01_Bronze.png</key>
             <dict>
@@ -2142,7 +2142,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1205,1544},{118,88}}</string>
+                <string>{{1256,1285},{118,88}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2159,7 +2159,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1325,1544},{118,88}}</string>
+                <string>{{1256,1375},{118,88}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2176,7 +2176,7 @@
                 <key>spriteSourceSize</key>
                 <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{1642,1},{118,88}}</string>
+                <string>{{1256,1465},{118,88}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2193,7 +2193,7 @@
                 <key>spriteSourceSize</key>
                 <string>{96,98}</string>
                 <key>textureRect</key>
-                <string>{{1755,645},{96,98}}</string>
+                <string>{{1056,1592},{96,98}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2210,7 +2210,7 @@
                 <key>spriteSourceSize</key>
                 <string>{510,66}</string>
                 <key>textureRect</key>
-                <string>{{58,1083},{510,66}}</string>
+                <string>{{1,877},{510,66}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2227,9 +2227,9 @@
                 <key>spriteSourceSize</key>
                 <string>{510,66}</string>
                 <key>textureRect</key>
-                <string>{{126,1083},{510,66}}</string>
+                <string>{{1083,58},{510,66}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>bg_title.png</key>
             <dict>
@@ -2244,9 +2244,9 @@
                 <key>spriteSourceSize</key>
                 <string>{540,55}</string>
                 <key>textureRect</key>
-                <string>{{1,1083},{540,55}}</string>
+                <string>{{1083,1},{540,55}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>bg_top1.png</key>
             <dict>
@@ -2261,9 +2261,9 @@
                 <key>spriteSourceSize</key>
                 <string>{171,167}</string>
                 <key>textureRect</key>
-                <string>{{1350,1065},{171,167}}</string>
+                <string>{{980,920},{171,167}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>bg_top2.png</key>
             <dict>
@@ -2278,7 +2278,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,161}</string>
                 <key>textureRect</key>
-                <string>{{1272,224},{171,161}}</string>
+                <string>{{969,757},{171,161}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2295,7 +2295,7 @@
                 <key>spriteSourceSize</key>
                 <string>{171,161}</string>
                 <key>textureRect</key>
-                <string>{{1445,224},{171,161}}</string>
+                <string>{{951,1089},{171,161}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2312,9 +2312,9 @@
                 <key>spriteSourceSize</key>
                 <string>{229,98}</string>
                 <key>textureRect</key>
-                <string>{{1154,1},{229,98}}</string>
+                <string>{{749,925},{229,98}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>complete_yellow.png</key>
             <dict>
@@ -2331,7 +2331,7 @@
                 <key>textureRect</key>
                 <string>{{1,1},{1080,143}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_abstract.png</key>
             <dict>
@@ -2346,9 +2346,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{146,1049},{44,32}}</string>
+                <string>{{714,757},{44,32}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_archer.png</key>
             <dict>
@@ -2363,7 +2363,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,989},{36,36}}</string>
+                <string>{{1620,1623},{36,36}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2380,9 +2380,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1529,906},{40,38}}</string>
+                <string>{{1740,745},{40,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_assassin.png</key>
             <dict>
@@ -2397,7 +2397,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{979,1022},{36,44}}</string>
+                <string>{{1722,347},{36,44}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2414,7 +2414,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1613,906},{38,38}}</string>
+                <string>{{1732,1313},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2431,7 +2431,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1257,1022},{42,34}}</string>
+                <string>{{1764,435},{42,34}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2448,7 +2448,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{937,1022},{44,40}}</string>
+                <string>{{738,1649},{44,40}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2465,7 +2465,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{58,1595},{48,38}}</string>
+                <string>{{1728,1231},{48,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2482,7 +2482,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,1027},{36,36}}</string>
+                <string>{{1658,1623},{36,36}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2499,7 +2499,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1618,221},{38,38}}</string>
+                <string>{{1732,1353},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2516,9 +2516,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{236,1049},{38,32}}</string>
+                <string>{{1766,567},{38,32}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_cyclone.png</key>
             <dict>
@@ -2533,7 +2533,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1141,1022},{42,38}}</string>
+                <string>{{1760,349},{42,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2550,7 +2550,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1658,221},{38,38}}</string>
+                <string>{{1734,1393},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2567,9 +2567,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{108,1595},{48,38}}</string>
+                <string>{{1722,297},{48,38}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_dice.png</key>
             <dict>
@@ -2584,7 +2584,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,913},{36,38}}</string>
+                <string>{{1740,787},{36,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2601,7 +2601,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1759,1285},{36,34}}</string>
+                <string>{{1412,1658},{36,34}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2618,9 +2618,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{316,1049},{30,42}}</string>
+                <string>{{1734,571},{30,42}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_goal.png</key>
             <dict>
@@ -2635,7 +2635,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1698,221},{38,38}}</string>
+                <string>{{1734,1433},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2652,7 +2652,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1293,1022},{42,34}}</string>
+                <string>{{1764,479},{42,34}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2669,7 +2669,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1902,461},{38,38}}</string>
+                <string>{{1734,1473},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2686,7 +2686,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{2001,136},{46,40}}</string>
+                <string>{{1328,1555},{46,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2703,9 +2703,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{2001,220},{46,34}}</string>
+                <string>{{1722,393},{46,34}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_helmet_1.png</key>
             <dict>
@@ -2720,7 +2720,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1902,425},{34,40}}</string>
+                <string>{{1376,1616},{34,40}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2737,9 +2737,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{192,1049},{32,42}}</string>
+                <string>{{399,1625},{32,42}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_knight.png</key>
             <dict>
@@ -2754,7 +2754,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{893,1022},{42,44}}</string>
+                <string>{{694,1649},{42,44}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2771,7 +2771,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,645},{38,38}}</string>
+                <string>{{1736,1513},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2788,9 +2788,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{2001,256},{42,34}}</string>
+                <string>{{1764,523},{42,34}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_life_break.png</key>
             <dict>
@@ -2805,9 +2805,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1952,258},{42,34}}</string>
+                <string>{{1734,615},{42,34}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>function_icon_magic.png</key>
             <dict>
@@ -2822,7 +2822,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1061,1022},{38,42}}</string>
+                <string>{{477,1651},{38,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2839,7 +2839,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,951},{36,38}}</string>
+                <string>{{1736,1593},{36,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2856,9 +2856,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1571,906},{38,40}}</string>
+                <string>{{1740,703},{38,40}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_potion_2.png</key>
             <dict>
@@ -2873,9 +2873,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{276,1049},{32,38}}</string>
+                <string>{{302,836},{32,38}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_powerup.png</key>
             <dict>
@@ -2890,7 +2890,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1653,889},{54,40}}</string>
+                <string>{{1328,1639},{54,40}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -2907,7 +2907,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1759,1209},{36,36}}</string>
+                <string>{{1696,1623},{36,36}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2924,7 +2924,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{2001,178},{46,40}}</string>
+                <string>{{1328,1597},{46,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2941,7 +2941,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1759,1247},{36,36}}</string>
+                <string>{{1734,1631},{36,36}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2958,7 +2958,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1855,645},{38,38}}</string>
+                <string>{{1736,1553},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2975,7 +2975,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1763,743},{38,38}}</string>
+                <string>{{1460,1619},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -2992,7 +2992,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1181,1022},{42,38}}</string>
+                <string>{{1734,659},{42,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -3009,7 +3009,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1952,294},{40,40}}</string>
+                <string>{{1758,393},{40,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3026,7 +3026,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1221,1022},{34,42}}</string>
+                <string>{{1762,305},{34,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3043,7 +3043,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1017,1022},{42,42}}</string>
+                <string>{{433,1651},{42,42}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3060,7 +3060,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1763,783},{38,38}}</string>
+                <string>{{1500,1619},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3077,7 +3077,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1952,336},{40,40}}</string>
+                <string>{{1418,1616},{40,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3094,7 +3094,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1952,378},{40,40}}</string>
+                <string>{{1370,1652},{40,40}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3111,7 +3111,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{360,1049},{30,38}}</string>
+                <string>{{1450,1659},{30,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -3128,9 +3128,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{474,1016},{28,38}}</string>
+                <string>{{1595,58},{28,38}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>function_icon_volume_mute.png</key>
             <dict>
@@ -3145,7 +3145,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1763,823},{38,38}}</string>
+                <string>{{1540,1619},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3162,7 +3162,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1895,873},{38,38}}</string>
+                <string>{{1580,1623},{38,38}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3179,7 +3179,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{400,1049},{30,38}}</string>
+                <string>{{1490,1659},{30,38}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -3196,26 +3196,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{158,1595},{38,44}}</string>
+                <string>{{780,1649},{38,44}}</string>
                 <key>textureRotated</key>
-                <true/>
-            </dict>
-            <key>logo1.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{-6,-17}</string>
-                <key>spriteSize</key>
-                <string>{1046,326}</string>
-                <key>spriteSourceSize</key>
-                <string>{1328,1344}</string>
-                <key>textureRect</key>
-                <string>{{146,1},{1046,326}}</string>
-                <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>top_btn_back.png</key>
             <dict>
@@ -3230,9 +3213,9 @@
                 <key>spriteSourceSize</key>
                 <string>{179,140}</string>
                 <key>textureRect</key>
-                <string>{{1305,766},{179,140}}</string>
+                <string>{{951,1252},{179,140}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>userinfo_icon_crown.png</key>
             <dict>
@@ -3247,7 +3230,24 @@
                 <key>spriteSourceSize</key>
                 <string>{59,60}</string>
                 <key>textureRect</key>
-                <string>{{1634,533},{59,60}}</string>
+                <string>{{820,1625},{59,60}}</string>
+                <key>textureRotated</key>
+                <false/>
+            </dict>
+            <key>zlogo.png</key>
+            <dict>
+                <key>aliases</key>
+                <array/>
+                <key>anchor</key>
+                <string>{0.5,0.5}</string>
+                <key>spriteOffset</key>
+                <string>{0,-3}</string>
+                <key>spriteSize</key>
+                <string>{218,166}</string>
+                <key>spriteSourceSize</key>
+                <string>{276,276}</string>
+                <key>textureRect</key>
+                <string>{{749,757},{218,166}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -3263,9 +3263,9 @@
             <key>realTextureFileName</key>
             <string>ui3.png</string>
             <key>size</key>
-            <string>{2048,1634}</string>
+            <string>{1800,1694}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:513b262f52a183c0db864722ae182c0b:6a48bc9bd7d6d5accdaf5b4e9fe18853:e1bf24f6fd107d358e5ec626ea4dfc29$</string>
+            <string>$TexturePacker:SmartUpdate:18b17ded0ec5b8160f27064edb79a2fe:e48df35584b64f8b3e007aecfa26af64:e1bf24f6fd107d358e5ec626ea4dfc29$</string>
             <key>textureFileName</key>
             <string>ui3.png</string>
         </dict>
diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta
index 56e83f39..83f79ae4 100644
--- a/assets/resources/gui/ui3.plist.meta
+++ b/assets/resources/gui/ui3.plist.meta
@@ -18,8 +18,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1272,
-        "trimY": 224,
+        "trimX": 969,
+        "trimY": 757,
         "width": 171,
         "height": 161,
         "rawWidth": 171,
@@ -61,11 +61,11 @@
       "name": "ItemIcon_Medal_Bronze_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1895,
-        "trimY": 136,
+        "trimX": 824,
+        "trimY": 1519,
         "width": 120,
         "height": 104,
         "rawWidth": 128,
@@ -107,11 +107,11 @@
       "name": "function_icon_potion_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 276,
-        "trimY": 1049,
+        "trimX": 302,
+        "trimY": 836,
         "width": 32,
         "height": 38,
         "rawWidth": 64,
@@ -156,8 +156,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1797,
-        "trimY": 1287,
+        "trimX": 1142,
+        "trimY": 756,
         "width": 128,
         "height": 110,
         "rawWidth": 128,
@@ -199,11 +199,11 @@
       "name": "Slider_Border_Tapered_02_Fill_Blue",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 440,
-        "trimY": 1049,
+        "trimX": 1771,
+        "trimY": 1,
         "width": 150,
         "height": 28,
         "rawWidth": 150,
@@ -245,11 +245,11 @@
       "name": "Slider_Play_01_Fill_Green",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
-        "trimY": 1625,
+        "trimX": 896,
+        "trimY": 534,
         "width": 4,
         "height": 18,
         "rawWidth": 4,
@@ -294,8 +294,8 @@
         "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1525,
-        "trimY": 1211,
+        "trimX": 1258,
+        "trimY": 1175,
         "width": 116,
         "height": 108,
         "rawWidth": 128,
@@ -337,11 +337,11 @@
       "name": "function_icon_crown_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 236,
-        "trimY": 1049,
+        "trimX": 1766,
+        "trimY": 567,
         "width": 38,
         "height": 32,
         "rawWidth": 64,
@@ -386,8 +386,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1759,
-        "trimY": 1209,
+        "trimX": 1696,
+        "trimY": 1623,
         "width": 36,
         "height": 36,
         "rawWidth": 64,
@@ -429,11 +429,11 @@
       "name": "Slider_Level_03_InnerBorder1",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 566,
-        "trimY": 1016,
+        "trimX": 508,
+        "trimY": 810,
         "width": 23,
         "height": 24,
         "rawWidth": 23,
@@ -478,8 +478,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1572,
-        "trimY": 533,
+        "trimX": 1739,
+        "trimY": 889,
         "width": 60,
         "height": 62,
         "rawWidth": 60,
@@ -521,11 +521,11 @@
       "name": "ItemIcon_Medal_Bronze_1",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1846,
-        "trimY": 261,
+        "trimX": 1488,
+        "trimY": 1513,
         "width": 120,
         "height": 104,
         "rawWidth": 128,
@@ -567,11 +567,11 @@
       "name": "bg_title",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
-        "trimY": 1083,
+        "trimX": 1083,
+        "trimY": 1,
         "width": 540,
         "height": 55,
         "rawWidth": 540,
@@ -616,8 +616,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 474,
-        "trimY": 1,
+        "trimX": 275,
+        "trimY": 877,
         "width": 60,
         "height": 386,
         "rawWidth": 60,
@@ -662,8 +662,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1797,
-        "trimY": 1521,
+        "trimX": 1056,
+        "trimY": 1482,
         "width": 108,
         "height": 108,
         "rawWidth": 108,
@@ -708,8 +708,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1797,
-        "trimY": 1521,
+        "trimX": 1056,
+        "trimY": 1482,
         "width": 108,
         "height": 108,
         "rawWidth": 108,
@@ -754,8 +754,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 982,
-        "trimY": 1324,
+        "trimX": 337,
+        "trimY": 1091,
         "width": 180,
         "height": 221,
         "rawWidth": 180,
@@ -800,8 +800,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 612,
-        "trimY": 1069,
+        "trimX": 69,
+        "trimY": 1137,
         "width": 204,
         "height": 253,
         "rawWidth": 204,
@@ -843,11 +843,11 @@
       "name": "CardFrame_Rectangle_01_Blue_BorderGem",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 536,
-        "trimY": 1,
+        "trimX": 419,
+        "trimY": 349,
         "width": 204,
         "height": 258,
         "rawWidth": 204,
@@ -889,11 +889,11 @@
       "name": "CardFrame_Rectangle_01_Green_Bg",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1254,
-        "trimY": 1,
+        "trimX": 679,
+        "trimY": 352,
         "width": 180,
         "height": 221,
         "rawWidth": 180,
@@ -938,8 +938,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 818,
-        "trimY": 1069,
+        "trimX": 508,
+        "trimY": 555,
         "width": 204,
         "height": 253,
         "rawWidth": 204,
@@ -984,8 +984,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 742,
-        "trimY": 1,
+        "trimX": 69,
+        "trimY": 877,
         "width": 204,
         "height": 258,
         "rawWidth": 204,
@@ -1030,8 +1030,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1436,
-        "trimY": 1,
+        "trimX": 714,
+        "trimY": 534,
         "width": 180,
         "height": 221,
         "rawWidth": 180,
@@ -1076,8 +1076,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 893,
-        "trimY": 767,
+        "trimX": 337,
+        "trimY": 836,
         "width": 204,
         "height": 253,
         "rawWidth": 204,
@@ -1119,11 +1119,11 @@
       "name": "CardFrame_Rectangle_01_Purple_BorderGem",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 677,
-        "trimY": 389,
+        "trimX": 798,
+        "trimY": 146,
         "width": 204,
         "height": 258,
         "rawWidth": 204,
@@ -1168,8 +1168,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1316,
-        "trimY": 387,
+        "trimX": 902,
+        "trimY": 352,
         "width": 180,
         "height": 221,
         "rawWidth": 180,
@@ -1214,8 +1214,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1024,
-        "trimY": 1066,
+        "trimX": 543,
+        "trimY": 810,
         "width": 204,
         "height": 253,
         "rawWidth": 204,
@@ -1260,8 +1260,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 948,
-        "trimY": 1,
+        "trimX": 1,
+        "trimY": 1392,
         "width": 204,
         "height": 258,
         "rawWidth": 204,
@@ -1303,11 +1303,11 @@
       "name": "CardFrame_Rectangle_01_Yellow_Bg",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1205,
-        "trimY": 1321,
+        "trimX": 896,
+        "trimY": 575,
         "width": 180,
         "height": 221,
         "rawWidth": 180,
@@ -1352,8 +1352,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1099,
-        "trimY": 767,
+        "trimX": 560,
+        "trimY": 1065,
         "width": 204,
         "height": 253,
         "rawWidth": 204,
@@ -1398,8 +1398,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 883,
-        "trimY": 387,
+        "trimX": 302,
+        "trimY": 576,
         "width": 204,
         "height": 258,
         "rawWidth": 204,
@@ -1441,11 +1441,11 @@
       "name": "CardFrame_Rectangle_02_BgGradient",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1250,
-        "trimY": 1066,
+        "trimX": 207,
+        "trimY": 1625,
         "width": 48,
         "height": 190,
         "rawWidth": 48,
@@ -1487,11 +1487,11 @@
       "name": "CardFrame_Rectangle_02_Border",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1230,
-        "trimY": 1262,
+        "trimX": 694,
+        "trimY": 1320,
         "width": 56,
         "height": 63,
         "rawWidth": 56,
@@ -1536,8 +1536,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1300,
-        "trimY": 1066,
+        "trimX": 1058,
+        "trimY": 146,
         "width": 48,
         "height": 189,
         "rawWidth": 48,
@@ -1582,8 +1582,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1996,
-        "trimY": 292,
+        "trimX": 1728,
+        "trimY": 1127,
         "width": 48,
         "height": 52,
         "rawWidth": 48,
@@ -1628,8 +1628,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 194,
-        "trimY": 1083,
+        "trimX": 1,
+        "trimY": 146,
         "width": 416,
         "height": 428,
         "rawWidth": 416,
@@ -1674,8 +1674,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1101,
-        "trimY": 1022,
+        "trimX": 517,
+        "trimY": 1651,
         "width": 38,
         "height": 42,
         "rawWidth": 38,
@@ -1720,8 +1720,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 612,
-        "trimY": 1324,
+        "trimX": 766,
+        "trimY": 1025,
         "width": 183,
         "height": 183,
         "rawWidth": 183,
@@ -1766,8 +1766,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 797,
-        "trimY": 1324,
+        "trimX": 766,
+        "trimY": 1210,
         "width": 183,
         "height": 183,
         "rawWidth": 183,
@@ -1812,8 +1812,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 592,
-        "trimY": 768,
+        "trimX": 1,
+        "trimY": 576,
         "width": 299,
         "height": 299,
         "rawWidth": 299,
@@ -1858,8 +1858,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1089,
-        "trimY": 387,
+        "trimX": 207,
+        "trimY": 1392,
         "width": 231,
         "height": 225,
         "rawWidth": 231,
@@ -1901,11 +1901,11 @@
       "name": "ItemFrame00~03_Bg",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1295,
-        "trimY": 1258,
+        "trimX": 1739,
+        "trimY": 825,
         "width": 60,
         "height": 62,
         "rawWidth": 60,
@@ -1950,8 +1950,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 1,
+        "trimX": 1225,
+        "trimY": 558,
         "width": 133,
         "height": 133,
         "rawWidth": 133,
@@ -1996,8 +1996,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1477,
-        "trimY": 906,
+        "trimX": 1202,
+        "trimY": 693,
         "width": 50,
         "height": 39,
         "rawWidth": 50,
@@ -2042,8 +2042,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1675,
-        "trimY": 1321,
+        "trimX": 1616,
+        "trimY": 1179,
         "width": 110,
         "height": 110,
         "rawWidth": 110,
@@ -2088,8 +2088,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1447,
-        "trimY": 1238,
+        "trimX": 1054,
+        "trimY": 1394,
         "width": 76,
         "height": 78,
         "rawWidth": 76,
@@ -2131,11 +2131,11 @@
       "name": "ItemFrame03_Single_Blue",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1763,
-        "trimY": 1,
+        "trimX": 1360,
+        "trimY": 558,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2180,8 +2180,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1763,
-        "trimY": 131,
+        "trimX": 1490,
+        "trimY": 575,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2223,11 +2223,11 @@
       "name": "ItemFrame03_Single_Green",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1618,
-        "trimY": 91,
+        "trimX": 434,
+        "trimY": 1387,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2272,8 +2272,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1642,
-        "trimY": 383,
+        "trimX": 434,
+        "trimY": 1519,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2318,8 +2318,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1772,
-        "trimY": 383,
+        "trimX": 564,
+        "trimY": 1320,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2361,11 +2361,11 @@
       "name": "ItemFrame03_Single_Red",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1811,
-        "trimY": 515,
+        "trimX": 564,
+        "trimY": 1452,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2407,11 +2407,11 @@
       "name": "ItemFrame03_Single_Yellow",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1803,
-        "trimY": 743,
+        "trimX": 694,
+        "trimY": 1395,
         "width": 128,
         "height": 130,
         "rawWidth": 128,
@@ -2456,8 +2456,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1695,
-        "trimY": 889,
+        "trimX": 999,
+        "trimY": 1629,
         "width": 52,
         "height": 52,
         "rawWidth": 52,
@@ -2502,8 +2502,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1749,
-        "trimY": 889,
+        "trimX": 1728,
+        "trimY": 1073,
         "width": 52,
         "height": 52,
         "rawWidth": 52,
@@ -2548,8 +2548,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1994,
-        "trimY": 346,
+        "trimX": 1728,
+        "trimY": 1181,
         "width": 48,
         "height": 48,
         "rawWidth": 48,
@@ -2594,8 +2594,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1902,
-        "trimY": 383,
+        "trimX": 1732,
+        "trimY": 1271,
         "width": 40,
         "height": 40,
         "rawWidth": 40,
@@ -2637,11 +2637,11 @@
       "name": "ItemIcon_Ad",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1329,
-        "trimY": 947,
+        "trimX": 1614,
+        "trimY": 1291,
         "width": 108,
         "height": 116,
         "rawWidth": 128,
@@ -2686,8 +2686,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1943,
-        "trimY": 550,
+        "trimX": 1119,
+        "trimY": 538,
         "width": 128,
         "height": 104,
         "rawWidth": 128,
@@ -2732,8 +2732,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 905,
-        "trimY": 647,
+        "trimX": 1618,
+        "trimY": 705,
         "width": 120,
         "height": 118,
         "rawWidth": 128,
@@ -2775,11 +2775,11 @@
       "name": "ItemIcon_Coin_Gold",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 677,
-        "trimY": 649,
+        "trimX": 1258,
+        "trimY": 1061,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -2824,8 +2824,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 791,
-        "trimY": 649,
+        "trimX": 1376,
+        "trimY": 1062,
         "width": 112,
         "height": 116,
         "rawWidth": 128,
@@ -2870,8 +2870,8 @@
         "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1090,
-        "trimY": 261,
+        "trimX": 1487,
+        "trimY": 937,
         "width": 120,
         "height": 120,
         "rawWidth": 128,
@@ -2916,8 +2916,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 764,
-        "trimY": 261,
+        "trimX": 1377,
+        "trimY": 936,
         "width": 124,
         "height": 108,
         "rawWidth": 128,
@@ -2959,11 +2959,11 @@
       "name": "ItemIcon_Friend",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 874,
-        "trimY": 261,
+        "trimX": 1490,
+        "trimY": 1181,
         "width": 124,
         "height": 108,
         "rawWidth": 128,
@@ -3008,8 +3008,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 474,
-        "trimY": 894,
+        "trimX": 1610,
+        "trimY": 1057,
         "width": 116,
         "height": 120,
         "rawWidth": 128,
@@ -3051,11 +3051,11 @@
       "name": "ItemIcon_Gear_Armor",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1935,
-        "trimY": 680,
+        "trimX": 275,
+        "trimY": 1273,
         "width": 128,
         "height": 112,
         "rawWidth": 128,
@@ -3100,8 +3100,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1921,
-        "trimY": 1070,
+        "trimX": 1376,
+        "trimY": 1180,
         "width": 108,
         "height": 112,
         "rawWidth": 128,
@@ -3146,8 +3146,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 387,
-        "trimY": 1513,
+        "trimX": 694,
+        "trimY": 1527,
         "width": 124,
         "height": 120,
         "rawWidth": 128,
@@ -3192,8 +3192,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1779,
-        "trimY": 943,
+        "trimX": 1373,
+        "trimY": 814,
         "width": 114,
         "height": 120,
         "rawWidth": 128,
@@ -3238,8 +3238,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1807,
-        "trimY": 1177,
+        "trimX": 1376,
+        "trimY": 1290,
         "width": 108,
         "height": 112,
         "rawWidth": 128,
@@ -3281,11 +3281,11 @@
       "name": "ItemIcon_Gift_Purple",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1439,
-        "trimY": 947,
+        "trimX": 1259,
+        "trimY": 951,
         "width": 116,
         "height": 108,
         "rawWidth": 128,
@@ -3327,11 +3327,11 @@
       "name": "ItemIcon_Map",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 873,
-        "trimY": 1509,
+        "trimX": 1615,
+        "trimY": 825,
         "width": 122,
         "height": 110,
         "rawWidth": 128,
@@ -3376,8 +3376,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1921,
-        "trimY": 1180,
+        "trimX": 1622,
+        "trimY": 575,
         "width": 128,
         "height": 110,
         "rawWidth": 128,
@@ -3422,8 +3422,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1909,
-        "trimY": 1310,
+        "trimX": 564,
+        "trimY": 1584,
         "width": 128,
         "height": 104,
         "rawWidth": 128,
@@ -3465,11 +3465,11 @@
       "name": "ItemIcon_Medal_Silver_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1909,
-        "trimY": 1416,
+        "trimX": 1153,
+        "trimY": 886,
         "width": 128,
         "height": 104,
         "rawWidth": 128,
@@ -3511,11 +3511,11 @@
       "name": "ItemIcon_Potion_Green",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 1,
-        "trimX": 513,
-        "trimY": 1513,
+        "trimX": 824,
+        "trimY": 1395,
         "width": 120,
         "height": 122,
         "rawWidth": 128,
@@ -3560,8 +3560,8 @@
         "rotated": false,
         "offsetX": -1,
         "offsetY": 1,
-        "trimX": 637,
-        "trimY": 1509,
+        "trimX": 1368,
+        "trimY": 690,
         "width": 120,
         "height": 122,
         "rawWidth": 128,
@@ -3603,11 +3603,11 @@
       "name": "ItemIcon_Ranking",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 985,
-        "trimY": 1506,
+        "trimX": 1490,
+        "trimY": 1291,
         "width": 122,
         "height": 108,
         "rawWidth": 128,
@@ -3649,11 +3649,11 @@
       "name": "ItemIcon_Ranking_Gold",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1095,
-        "trimY": 1506,
+        "trimX": 1132,
+        "trimY": 1372,
         "width": 122,
         "height": 108,
         "rawWidth": 128,
@@ -3695,11 +3695,11 @@
       "name": "ItemIcon_Scroll",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1734,
-        "trimY": 261,
+        "trimX": 1490,
+        "trimY": 1401,
         "width": 110,
         "height": 120,
         "rawWidth": 128,
@@ -3741,11 +3741,11 @@
       "name": "ItemIcon_Scroll_Feather",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 759,
-        "trimY": 1509,
+        "trimX": 1132,
+        "trimY": 1258,
         "width": 122,
         "height": 112,
         "rawWidth": 128,
@@ -3790,8 +3790,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1549,
-        "trimY": 946,
+        "trimX": 946,
+        "trimY": 1395,
         "width": 116,
         "height": 106,
         "rawWidth": 128,
@@ -3836,8 +3836,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1807,
-        "trimY": 1065,
+        "trimX": 1376,
+        "trimY": 1400,
         "width": 110,
         "height": 112,
         "rawWidth": 128,
@@ -3879,11 +3879,11 @@
       "name": "ItemIcon_Skill_Critical",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 474,
-        "trimY": 768,
+        "trimX": 1489,
+        "trimY": 819,
         "width": 124,
         "height": 116,
         "rawWidth": 128,
@@ -3925,11 +3925,11 @@
       "name": "ItemIcon_Skill_Damage",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1935,
-        "trimY": 810,
+        "trimX": 405,
+        "trimY": 1273,
         "width": 128,
         "height": 112,
         "rawWidth": 128,
@@ -3974,8 +3974,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1935,
-        "trimY": 940,
+        "trimX": 1254,
+        "trimY": 693,
         "width": 128,
         "height": 112,
         "rawWidth": 128,
@@ -4017,11 +4017,11 @@
       "name": "ItemIcon_Skill_Defense",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1643,
-        "trimY": 1211,
+        "trimX": 946,
+        "trimY": 1513,
         "width": 108,
         "height": 114,
         "rawWidth": 128,
@@ -4063,11 +4063,11 @@
       "name": "ItemIcon_Skill_Health",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 984,
-        "trimY": 261,
+        "trimX": 1610,
+        "trimY": 1517,
         "width": 124,
         "height": 104,
         "rawWidth": 128,
@@ -4109,11 +4109,11 @@
       "name": "ItemIcon_Skull_Boss",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 536,
-        "trimY": 261,
+        "trimX": 1490,
+        "trimY": 705,
         "width": 126,
         "height": 112,
         "rawWidth": 128,
@@ -4158,8 +4158,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 650,
-        "trimY": 261,
+        "trimX": 1259,
+        "trimY": 823,
         "width": 126,
         "height": 112,
         "rawWidth": 128,
@@ -4201,11 +4201,11 @@
       "name": "ItemIcon_Spin",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1618,
-        "trimY": 261,
+        "trimX": 1612,
+        "trimY": 1401,
         "width": 114,
         "height": 120,
         "rawWidth": 128,
@@ -4250,8 +4250,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1027,
-        "trimY": 647,
+        "trimX": 1609,
+        "trimY": 937,
         "width": 120,
         "height": 118,
         "rawWidth": 128,
@@ -4293,11 +4293,11 @@
       "name": "ItemIcon_Star_Disable",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1657,
-        "trimY": 945,
+        "trimX": 1490,
+        "trimY": 1059,
         "width": 120,
         "height": 118,
         "rawWidth": 128,
@@ -4342,8 +4342,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1944,
-        "trimY": 420,
+        "trimX": 1154,
+        "trimY": 1016,
         "width": 128,
         "height": 102,
         "rawWidth": 128,
@@ -4385,11 +4385,11 @@
       "name": "ItemIcon_Trophy",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1907,
-        "trimY": 1522,
+        "trimX": 1664,
+        "trimY": 441,
         "width": 128,
         "height": 98,
         "rawWidth": 128,
@@ -4434,8 +4434,8 @@
         "rotated": false,
         "offsetX": -2,
         "offsetY": 1,
-        "trimX": 1149,
-        "trimY": 620,
+        "trimX": 1084,
+        "trimY": 392,
         "width": 142,
         "height": 144,
         "rawWidth": 146,
@@ -4477,11 +4477,11 @@
       "name": "Loading_Circle_10",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1519,
-        "trimY": 1065,
+        "trimX": 1400,
+        "trimY": 270,
         "width": 144,
         "height": 142,
         "rawWidth": 146,
@@ -4523,11 +4523,11 @@
       "name": "Loading_Circle_11",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1531,
-        "trimY": 1321,
+        "trimX": 1228,
+        "trimY": 414,
         "width": 144,
         "height": 142,
         "rawWidth": 146,
@@ -4569,11 +4569,11 @@
       "name": "Loading_Circle_12",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": -1,
         "offsetY": -1,
-        "trimX": 1621,
-        "trimY": 743,
+        "trimX": 1546,
+        "trimY": 289,
         "width": 144,
         "height": 140,
         "rawWidth": 146,
@@ -4615,11 +4615,11 @@
       "name": "Loading_Circle_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -2,
         "offsetY": 1,
-        "trimX": 1293,
-        "trimY": 620,
+        "trimX": 1374,
+        "trimY": 414,
         "width": 142,
         "height": 144,
         "rawWidth": 146,
@@ -4664,8 +4664,8 @@
         "rotated": false,
         "offsetX": -2,
         "offsetY": 2,
-        "trimX": 1663,
-        "trimY": 1065,
+        "trimX": 1520,
+        "trimY": 431,
         "width": 142,
         "height": 142,
         "rawWidth": 146,
@@ -4707,11 +4707,11 @@
       "name": "Loading_Circle_4",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 2,
-        "trimX": 1477,
-        "trimY": 758,
+        "trimX": 1291,
+        "trimY": 126,
         "width": 146,
         "height": 142,
         "rawWidth": 146,
@@ -4753,11 +4753,11 @@
       "name": "Loading_Circle_5",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 2,
-        "trimX": 1387,
-        "trimY": 1321,
+        "trimX": 1108,
+        "trimY": 248,
         "width": 144,
         "height": 142,
         "rawWidth": 146,
@@ -4799,11 +4799,11 @@
       "name": "Loading_Circle_6",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 2,
-        "trimX": 1445,
-        "trimY": 1467,
+        "trimX": 1254,
+        "trimY": 270,
         "width": 144,
         "height": 142,
         "rawWidth": 146,
@@ -4845,11 +4845,11 @@
       "name": "Loading_Circle_7",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1467,
-        "trimY": 610,
+        "trimX": 1439,
+        "trimY": 126,
         "width": 142,
         "height": 146,
         "rawWidth": 146,
@@ -4891,11 +4891,11 @@
       "name": "Loading_Circle_8",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1498,
-        "trimY": 387,
+        "trimX": 1625,
+        "trimY": 1,
         "width": 142,
         "height": 144,
         "rawWidth": 146,
@@ -4937,11 +4937,11 @@
       "name": "Loading_Circle_9",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1611,
-        "trimY": 597,
+        "trimX": 1587,
+        "trimY": 145,
         "width": 142,
         "height": 144,
         "rawWidth": 146,
@@ -4983,11 +4983,11 @@
       "name": "Shape 674",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1359,
-        "trimY": 1238,
+        "trimX": 1119,
+        "trimY": 668,
         "width": 81,
         "height": 86,
         "rawWidth": 81,
@@ -5032,8 +5032,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1387,
-        "trimY": 1467,
+        "trimX": 881,
+        "trimY": 1625,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5078,8 +5078,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1695,
-        "trimY": 515,
+        "trimX": 1731,
+        "trimY": 953,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5124,8 +5124,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1753,
-        "trimY": 515,
+        "trimX": 1270,
+        "trimY": 1555,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5167,11 +5167,11 @@
       "name": "SkillFrame_01_Border_Purple",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1855,
-        "trimY": 685,
+        "trimX": 1270,
+        "trimY": 1615,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5213,11 +5213,11 @@
       "name": "SkillFrame_01_Border_Red",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1803,
-        "trimY": 873,
+        "trimX": 939,
+        "trimY": 1629,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5262,8 +5262,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1675,
-        "trimY": 1433,
+        "trimX": 1731,
+        "trimY": 1013,
         "width": 56,
         "height": 58,
         "rawWidth": 56,
@@ -5308,8 +5308,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1212,
-        "trimY": 232,
+        "trimX": 1124,
+        "trimY": 1089,
         "width": 150,
         "height": 28,
         "rawWidth": 150,
@@ -5354,8 +5354,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1242,
-        "trimY": 232,
+        "trimX": 1733,
+        "trimY": 145,
         "width": 150,
         "height": 28,
         "rawWidth": 150,
@@ -5400,8 +5400,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1437,
-        "trimY": 610,
+        "trimX": 1692,
+        "trimY": 289,
         "width": 150,
         "height": 28,
         "rawWidth": 150,
@@ -5446,8 +5446,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1447,
-        "trimY": 762,
+        "trimX": 1763,
+        "trimY": 153,
         "width": 150,
         "height": 28,
         "rawWidth": 150,
@@ -5492,8 +5492,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 514,
-        "trimY": 1016,
+        "trimX": 1156,
+        "trimY": 1668,
         "width": 25,
         "height": 25,
         "rawWidth": 25,
@@ -5538,8 +5538,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 541,
-        "trimY": 1016,
+        "trimX": 535,
+        "trimY": 1273,
         "width": 23,
         "height": 24,
         "rawWidth": 23,
@@ -5584,8 +5584,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1089,
-        "trimY": 620,
+        "trimX": 1546,
+        "trimY": 270,
         "width": 17,
         "height": 16,
         "rawWidth": 17,
@@ -5627,11 +5627,11 @@
       "name": "Slider_Play_01_Fill_Red",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 21,
-        "trimY": 1625,
+        "trimX": 896,
+        "trimY": 554,
         "width": 4,
         "height": 18,
         "rawWidth": 4,
@@ -5673,11 +5673,11 @@
       "name": "Slider_Play_02_Fill_Red",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1230,
-        "trimY": 1066,
+        "trimX": 1,
+        "trimY": 1675,
         "width": 194,
         "height": 18,
         "rawWidth": 194,
@@ -5719,11 +5719,11 @@
       "name": "Title_Result_Victory",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 474,
-        "trimY": 389,
+        "trimX": 419,
+        "trimY": 146,
         "width": 377,
         "height": 201,
         "rawWidth": 377,
@@ -5768,8 +5768,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 204,
-        "trimY": 1513,
+        "trimX": 1108,
+        "trimY": 126,
         "width": 181,
         "height": 120,
         "rawWidth": 181,
@@ -5814,8 +5814,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1498,
-        "trimY": 533,
+        "trimX": 1166,
+        "trimY": 1482,
         "width": 72,
         "height": 72,
         "rawWidth": 72,
@@ -5860,8 +5860,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1589,
-        "trimY": 1522,
+        "trimX": 1154,
+        "trimY": 1146,
         "width": 102,
         "height": 110,
         "rawWidth": 128,
@@ -5903,11 +5903,11 @@
       "name": "UI_Rewards_Medal_01_Gold",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1693,
-        "trimY": 1522,
+        "trimX": 1376,
+        "trimY": 1512,
         "width": 102,
         "height": 110,
         "rawWidth": 128,
@@ -5949,11 +5949,11 @@
       "name": "UI_Rewards_Medal_01_Silver",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1797,
-        "trimY": 1417,
+        "trimX": 1166,
+        "trimY": 1556,
         "width": 102,
         "height": 110,
         "rawWidth": 128,
@@ -5998,8 +5998,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 1205,
-        "trimY": 1544,
+        "trimX": 1256,
+        "trimY": 1285,
         "width": 118,
         "height": 88,
         "rawWidth": 128,
@@ -6044,8 +6044,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 1325,
-        "trimY": 1544,
+        "trimX": 1256,
+        "trimY": 1375,
         "width": 118,
         "height": 88,
         "rawWidth": 128,
@@ -6090,8 +6090,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 1642,
-        "trimY": 1,
+        "trimX": 1256,
+        "trimY": 1465,
         "width": 118,
         "height": 88,
         "rawWidth": 128,
@@ -6136,8 +6136,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1755,
-        "trimY": 645,
+        "trimX": 1056,
+        "trimY": 1592,
         "width": 96,
         "height": 98,
         "rawWidth": 96,
@@ -6182,8 +6182,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 58,
-        "trimY": 1083,
+        "trimX": 1,
+        "trimY": 877,
         "width": 510,
         "height": 66,
         "rawWidth": 510,
@@ -6225,11 +6225,11 @@
       "name": "bg_list2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 126,
-        "trimY": 1083,
+        "trimX": 1083,
+        "trimY": 58,
         "width": 510,
         "height": 66,
         "rawWidth": 510,
@@ -6271,11 +6271,11 @@
       "name": "bg_top1",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1350,
-        "trimY": 1065,
+        "trimX": 980,
+        "trimY": 920,
         "width": 171,
         "height": 167,
         "rawWidth": 171,
@@ -6320,8 +6320,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1445,
-        "trimY": 224,
+        "trimX": 951,
+        "trimY": 1089,
         "width": 171,
         "height": 161,
         "rawWidth": 171,
@@ -6363,11 +6363,11 @@
       "name": "btn_yellow2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1154,
-        "trimY": 1,
+        "trimX": 749,
+        "trimY": 925,
         "width": 229,
         "height": 98,
         "rawWidth": 229,
@@ -6409,7 +6409,7 @@
       "name": "complete_yellow",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
         "trimX": 1,
@@ -6455,11 +6455,11 @@
       "name": "function_icon_abstract",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 146,
-        "trimY": 1049,
+        "trimX": 714,
+        "trimY": 757,
         "width": 44,
         "height": 32,
         "rawWidth": 64,
@@ -6504,8 +6504,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 989,
+        "trimX": 1620,
+        "trimY": 1623,
         "width": 36,
         "height": 36,
         "rawWidth": 64,
@@ -6547,11 +6547,11 @@
       "name": "function_icon_arrow",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1529,
-        "trimY": 906,
+        "trimX": 1740,
+        "trimY": 745,
         "width": 40,
         "height": 38,
         "rawWidth": 64,
@@ -6596,8 +6596,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 979,
-        "trimY": 1022,
+        "trimX": 1722,
+        "trimY": 347,
         "width": 36,
         "height": 44,
         "rawWidth": 64,
@@ -6642,8 +6642,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1613,
-        "trimY": 906,
+        "trimX": 1732,
+        "trimY": 1313,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -6688,8 +6688,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1257,
-        "trimY": 1022,
+        "trimX": 1764,
+        "trimY": 435,
         "width": 42,
         "height": 34,
         "rawWidth": 64,
@@ -6734,8 +6734,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 937,
-        "trimY": 1022,
+        "trimX": 738,
+        "trimY": 1649,
         "width": 44,
         "height": 40,
         "rawWidth": 64,
@@ -6780,8 +6780,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 58,
-        "trimY": 1595,
+        "trimX": 1728,
+        "trimY": 1231,
         "width": 48,
         "height": 38,
         "rawWidth": 64,
@@ -6826,8 +6826,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 1027,
+        "trimX": 1658,
+        "trimY": 1623,
         "width": 36,
         "height": 36,
         "rawWidth": 64,
@@ -6872,8 +6872,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1618,
-        "trimY": 221,
+        "trimX": 1732,
+        "trimY": 1353,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -6918,8 +6918,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 1141,
-        "trimY": 1022,
+        "trimX": 1760,
+        "trimY": 349,
         "width": 42,
         "height": 38,
         "rawWidth": 64,
@@ -6964,8 +6964,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1658,
-        "trimY": 221,
+        "trimX": 1734,
+        "trimY": 1393,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -7007,11 +7007,11 @@
       "name": "function_icon_death",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 108,
-        "trimY": 1595,
+        "trimX": 1722,
+        "trimY": 297,
         "width": 48,
         "height": 38,
         "rawWidth": 64,
@@ -7056,8 +7056,8 @@
         "rotated": true,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 913,
+        "trimX": 1740,
+        "trimY": 787,
         "width": 36,
         "height": 38,
         "rawWidth": 64,
@@ -7102,8 +7102,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1759,
-        "trimY": 1285,
+        "trimX": 1412,
+        "trimY": 1658,
         "width": 36,
         "height": 34,
         "rawWidth": 64,
@@ -7145,11 +7145,11 @@
       "name": "function_icon_fire",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 316,
-        "trimY": 1049,
+        "trimX": 1734,
+        "trimY": 571,
         "width": 30,
         "height": 42,
         "rawWidth": 64,
@@ -7194,8 +7194,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1698,
-        "trimY": 221,
+        "trimX": 1734,
+        "trimY": 1433,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -7240,8 +7240,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1293,
-        "trimY": 1022,
+        "trimX": 1764,
+        "trimY": 479,
         "width": 42,
         "height": 34,
         "rawWidth": 64,
@@ -7286,8 +7286,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1902,
-        "trimY": 461,
+        "trimX": 1734,
+        "trimY": 1473,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -7332,8 +7332,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 2001,
-        "trimY": 136,
+        "trimX": 1328,
+        "trimY": 1555,
         "width": 46,
         "height": 40,
         "rawWidth": 64,
@@ -7375,11 +7375,11 @@
       "name": "function_icon_heart",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 2001,
-        "trimY": 220,
+        "trimX": 1722,
+        "trimY": 393,
         "width": 46,
         "height": 34,
         "rawWidth": 64,
@@ -7424,8 +7424,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1902,
-        "trimY": 425,
+        "trimX": 1376,
+        "trimY": 1616,
         "width": 34,
         "height": 40,
         "rawWidth": 64,
@@ -7467,11 +7467,11 @@
       "name": "function_icon_helmet_2",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 192,
-        "trimY": 1049,
+        "trimX": 399,
+        "trimY": 1625,
         "width": 32,
         "height": 42,
         "rawWidth": 64,
@@ -7516,8 +7516,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 893,
-        "trimY": 1022,
+        "trimX": 694,
+        "trimY": 1649,
         "width": 42,
         "height": 44,
         "rawWidth": 64,
@@ -7562,8 +7562,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 645,
+        "trimX": 1736,
+        "trimY": 1513,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -7605,11 +7605,11 @@
       "name": "function_icon_life",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 2001,
-        "trimY": 256,
+        "trimX": 1764,
+        "trimY": 523,
         "width": 42,
         "height": 34,
         "rawWidth": 64,
@@ -7651,11 +7651,11 @@
       "name": "function_icon_life_break",
       "userData": {
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1952,
-        "trimY": 258,
+        "trimX": 1734,
+        "trimY": 615,
         "width": 42,
         "height": 34,
         "rawWidth": 64,
@@ -7700,8 +7700,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1061,
-        "trimY": 1022,
+        "trimX": 477,
+        "trimY": 1651,
         "width": 38,
         "height": 42,
         "rawWidth": 64,
@@ -7746,8 +7746,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 951,
+        "trimX": 1736,
+        "trimY": 1593,
         "width": 36,
         "height": 38,
         "rawWidth": 64,
@@ -7789,11 +7789,11 @@
       "name": "function_icon_paw",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1571,
-        "trimY": 906,
+        "trimX": 1740,
+        "trimY": 703,
         "width": 38,
         "height": 40,
         "rawWidth": 64,
@@ -7838,8 +7838,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1653,
-        "trimY": 889,
+        "trimX": 1328,
+        "trimY": 1639,
         "width": 54,
         "height": 40,
         "rawWidth": 64,
@@ -7884,8 +7884,8 @@
         "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 2001,
-        "trimY": 178,
+        "trimX": 1328,
+        "trimY": 1597,
         "width": 46,
         "height": 40,
         "rawWidth": 64,
@@ -7930,8 +7930,8 @@
         "rotated": false,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 1759,
-        "trimY": 1247,
+        "trimX": 1734,
+        "trimY": 1631,
         "width": 36,
         "height": 36,
         "rawWidth": 64,
@@ -7976,8 +7976,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1855,
-        "trimY": 645,
+        "trimX": 1736,
+        "trimY": 1553,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -8022,8 +8022,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1763,
-        "trimY": 743,
+        "trimX": 1460,
+        "trimY": 1619,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -8068,8 +8068,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1181,
-        "trimY": 1022,
+        "trimX": 1734,
+        "trimY": 659,
         "width": 42,
         "height": 38,
         "rawWidth": 64,
@@ -8114,8 +8114,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1952,
-        "trimY": 294,
+        "trimX": 1758,
+        "trimY": 393,
         "width": 40,
         "height": 40,
         "rawWidth": 64,
@@ -8160,8 +8160,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1221,
-        "trimY": 1022,
+        "trimX": 1762,
+        "trimY": 305,
         "width": 34,
         "height": 42,
         "rawWidth": 64,
@@ -8206,8 +8206,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1017,
-        "trimY": 1022,
+        "trimX": 433,
+        "trimY": 1651,
         "width": 42,
         "height": 42,
         "rawWidth": 64,
@@ -8252,8 +8252,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1763,
-        "trimY": 783,
+        "trimX": 1500,
+        "trimY": 1619,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -8298,8 +8298,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1952,
-        "trimY": 336,
+        "trimX": 1418,
+        "trimY": 1616,
         "width": 40,
         "height": 40,
         "rawWidth": 64,
@@ -8344,8 +8344,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1952,
-        "trimY": 378,
+        "trimX": 1370,
+        "trimY": 1652,
         "width": 40,
         "height": 40,
         "rawWidth": 64,
@@ -8390,8 +8390,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 360,
-        "trimY": 1049,
+        "trimX": 1450,
+        "trimY": 1659,
         "width": 30,
         "height": 38,
         "rawWidth": 64,
@@ -8433,11 +8433,11 @@
       "name": "function_icon_volume",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 474,
-        "trimY": 1016,
+        "trimX": 1595,
+        "trimY": 58,
         "width": 28,
         "height": 38,
         "rawWidth": 64,
@@ -8482,8 +8482,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1763,
-        "trimY": 823,
+        "trimX": 1540,
+        "trimY": 1619,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -8528,8 +8528,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1895,
-        "trimY": 873,
+        "trimX": 1580,
+        "trimY": 1623,
         "width": 38,
         "height": 38,
         "rawWidth": 64,
@@ -8574,8 +8574,8 @@
         "rotated": true,
         "offsetX": -1,
         "offsetY": 0,
-        "trimX": 400,
-        "trimY": 1049,
+        "trimX": 1490,
+        "trimY": 1659,
         "width": 30,
         "height": 38,
         "rawWidth": 64,
@@ -8617,11 +8617,11 @@
       "name": "function_icon_wizard",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 1,
-        "trimX": 158,
-        "trimY": 1595,
+        "trimX": 780,
+        "trimY": 1649,
         "width": 38,
         "height": 44,
         "rawWidth": 64,
@@ -8655,52 +8655,6 @@
       ],
       "subMetas": {}
     },
-    "a557f": {
-      "importer": "sprite-frame",
-      "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@a557f",
-      "displayName": "",
-      "id": "a557f",
-      "name": "logo1",
-      "userData": {
-        "trimThreshold": 1,
-        "rotated": true,
-        "offsetX": -6,
-        "offsetY": -17,
-        "trimX": 146,
-        "trimY": 1,
-        "width": 1046,
-        "height": 326,
-        "rawWidth": 1328,
-        "rawHeight": 1344,
-        "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": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
-        "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
-        "trimType": "auto"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "c874e": {
       "importer": "sprite-frame",
       "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@c874e",
@@ -8709,11 +8663,11 @@
       "name": "top_btn_back",
       "userData": {
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1305,
-        "trimY": 766,
+        "trimX": 951,
+        "trimY": 1252,
         "width": 179,
         "height": 140,
         "rawWidth": 179,
@@ -8758,8 +8712,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1634,
-        "trimY": 533,
+        "trimX": 820,
+        "trimY": 1625,
         "width": 59,
         "height": 60,
         "rawWidth": 59,
@@ -8792,6 +8746,52 @@
         ".json"
       ],
       "subMetas": {}
+    },
+    "e5c7b": {
+      "importer": "sprite-frame",
+      "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@e5c7b",
+      "displayName": "",
+      "id": "e5c7b",
+      "name": "zlogo",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": -3,
+        "trimX": 749,
+        "trimY": 757,
+        "width": 218,
+        "height": 166,
+        "rawWidth": 276,
+        "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": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+        "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
     }
   },
   "userData": {
diff --git a/assets/resources/gui/ui3.png b/assets/resources/gui/ui3.png
index 5c44dfd5..4ec610c3 100644
Binary files a/assets/resources/gui/ui3.png and b/assets/resources/gui/ui3.png differ
diff --git a/assets/resources/loading/prefab/loading.prefab b/assets/resources/loading/prefab/loading.prefab
index 66497527..b8762a71 100644
--- a/assets/resources/loading/prefab/loading.prefab
+++ b/assets/resources/loading/prefab/loading.prefab
@@ -1819,8 +1819,8 @@
     },
     "_lscale": {
       "__type__": "cc.Vec3",
-      "x": 1.5,
-      "y": 1.5,
+      "x": 2,
+      "y": 2,
       "z": 1
     },
     "_mobility": 0,
@@ -1847,8 +1847,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 421,
-      "height": 132
+      "width": 218,
+      "height": 166
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1884,12 +1884,12 @@
       "a": 255
     },
     "_spriteFrame": {
-      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@a557f",
+      "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e5c7b",
       "__expectedType__": "cc.SpriteFrame"
     },
     "_type": 0,
     "_fillType": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillCenter": {
       "__type__": "cc.Vec2",
       "x": 0,
diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts
index 18d0316c..d8670c61 100644
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -22,8 +22,6 @@ export enum CardLV {
     LV1 = 1,
     LV2 = 2,
     LV3 = 3,
-    LV4 = 4,
-    LV5 = 5,
 }
 
 /** 通用卡牌配置 */
@@ -59,9 +57,9 @@ export const CARD_POOL_UPGRADE_DISCOUNT_PER_WAVE = 10
 /** 卡池默认初始等级 */
 export const CARD_POOL_INIT_LEVEL = CardLV.LV1
 /** 卡池等级上限 */
-export const CARD_POOL_MAX_LEVEL = CardLV.LV5
+export const CARD_POOL_MAX_LEVEL = CardLV.LV3
 /** 英雄最高等级限制 */
-export const CARD_HERO_MAX_LEVEL = 3
+export const CARD_HERO_MAX_LEVEL = 2
 /** 基础卡池（英雄、技能、功能） */
 
 export const CardPoolList: CardConfig[] = [
@@ -70,30 +68,30 @@ export const CardPoolList: CardConfig[] = [
     { uuid: 5201, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 },
     { uuid: 5301, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 },
 
-    { uuid: 5003, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5102, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5302, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5003, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5102, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5302, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 1, kind: CKind.Hero, hero_lv: 1 },
     
-    { uuid: 5002, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5103, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5202, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5002, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5103, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5202, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
 
-    { uuid: 5004, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 4, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5104, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 4, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5303, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 4, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5004, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5104, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5303, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 2, kind: CKind.Hero, hero_lv: 1 },
 
-    { uuid: 5105, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 5, kind: CKind.Hero, hero_lv: 1 },
-    { uuid: 5304, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 5, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5105, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 },
+    { uuid: 5304, type: CardType.Hero, cost: 3, weight: 25, pool_lv: 3, kind: CKind.Hero, hero_lv: 1 },
 
     // 技能卡牌 (以增益/辅助为主，因为在备战期没有敌人)
     { uuid: 6401, type: CardType.Skill, cost: 2, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: "单体攻击", info: "随机1个友方+5攻击", is_inst: true, t_times: 1, t_inv: 0 },
     { uuid: 6402, type: CardType.Skill, cost: 2, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: "单体生命", info: "随机1个友方+20最大生命值", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6403, type: CardType.Skill, cost: 3, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: "单体全能", info: "随机1个友方+2攻击,+10最大生命值", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6404, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: "群体攻击", info: "随机3个友方+2攻击", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6405, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: "群体生命", info: "随机3个友方+10最大生命值", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6406, type: CardType.Skill, cost: 5, weight: 20, pool_lv: 4, kind: CKind.Skill, card_lv: 1, name: "群体全能", info: "为随机3个友方单位增加攻击力和生命上限", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6304, type: CardType.Skill, cost: 3, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: "神圣治疗", info: "恢复场上随机3个友方单位的生命值", is_inst: true, t_times: 1, t_inv: 0 },
-    { uuid: 6305, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 4, kind: CKind.Skill, card_lv: 1, name: "群体护盾", info: "随机3个友方获得2次伤害免疫", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6403, type: CardType.Skill, cost: 3, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: "单体全能", info: "随机1个友方+2攻击,+10最大生命值", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6404, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 1, kind: CKind.Skill, card_lv: 1, name: "群体攻击", info: "随机3个友方+2攻击", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6405, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: "群体生命", info: "随机3个友方+10最大生命值", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6406, type: CardType.Skill, cost: 5, weight: 20, pool_lv: 2, kind: CKind.Skill, card_lv: 1, name: "群体全能", info: "为随机3个友方单位增加攻击力和生命上限", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6304, type: CardType.Skill, cost: 3, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: "神圣治疗", info: "恢复场上随机3个友方单位的生命值", is_inst: true, t_times: 1, t_inv: 0 },
+    { uuid: 6305, type: CardType.Skill, cost: 4, weight: 20, pool_lv: 3, kind: CKind.Skill, card_lv: 1, name: "群体护盾", info: "随机3个友方获得2次伤害免疫", is_inst: true, t_times: 1, t_inv: 0 },
 
     { uuid: 7001, type: CardType.SpecialUpgrade, cost: 6, weight: 16, pool_lv: 1 ,kind: CKind.Card },
     { uuid: 7002, type: CardType.SpecialUpgrade, cost: 6, weight: 14, pool_lv: 2 ,kind: CKind.Card },
diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts
index b67b0556..11f6649b 100644
--- a/assets/script/game/map/MissionCardComp.ts
+++ b/assets/script/game/map/MissionCardComp.ts
@@ -201,11 +201,11 @@ export class MissionCardComp extends CCComp {
         this.clearHeroInfoPanels();
         this.layoutCardSlots();
         this.clearAllCards();
-        if (this.cards_up) {
-            this.cards_up.active = true;
-        }
+        // if (this.cards_up) {
+        //     this.cards_up.active = true;
+        // }
         this.resetButtonScale(this.cards_chou);
-        this.resetButtonScale(this.cards_up);
+        // this.resetButtonScale(this.cards_up);
         this.updateCoinAndCostUI();
         this.updateHeroNumUI(false, false);
         this.node.active = true;
@@ -269,9 +269,9 @@ export class MissionCardComp extends CCComp {
         this.cards_chou?.on(NodeEventType.TOUCH_START, this.onDrawTouchStart, this);
         this.cards_chou?.on(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this);
         this.cards_chou?.on(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this);
-        this.cards_up?.on(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this);
-        this.cards_up?.on(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this);
-        this.cards_up?.on(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this);
+        // this.cards_up?.on(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this);
+        // this.cards_up?.on(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this);
+        // this.cards_up?.on(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this);
     }
     // ======================== 事件回调 ========================
 
@@ -318,9 +318,9 @@ export class MissionCardComp extends CCComp {
         this.cards_chou?.off(NodeEventType.TOUCH_START, this.onDrawTouchStart, this);
         this.cards_chou?.off(NodeEventType.TOUCH_END, this.onDrawTouchEnd, this);
         this.cards_chou?.off(NodeEventType.TOUCH_CANCEL, this.onDrawTouchCancel, this);
-        this.cards_up?.off(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this);
-        this.cards_up?.off(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this);
-        this.cards_up?.off(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this);
+        // this.cards_up?.off(NodeEventType.TOUCH_START, this.onUpgradeTouchStart, this);
+        // this.cards_up?.off(NodeEventType.TOUCH_END, this.onUpgradeTouchEnd, this);
+        // this.cards_up?.off(NodeEventType.TOUCH_CANCEL, this.onUpgradeTouchCancel, this);
     }
 
     /**
@@ -462,18 +462,18 @@ export class MissionCardComp extends CCComp {
     private onDrawTouchCancel() {
         this.playButtonResetAnim(this.cards_chou);
     }
-    /** 升级按钮按下反馈 */
-    private onUpgradeTouchStart() {
-        this.playButtonPressAnim(this.cards_up);
-    }
-    /** 升级按钮释放 → 执行升级逻辑 */
-    private onUpgradeTouchEnd() {
-        this.playButtonClickAnim(this.cards_up, () => this.onClickUpgrade());
-    }
-    /** 升级按钮取消 → 恢复缩放 */
-    private onUpgradeTouchCancel() {
-        this.playButtonResetAnim(this.cards_up);
-    }
+    // /** 升级按钮按下反馈 */
+    // private onUpgradeTouchStart() {
+    //     this.playButtonPressAnim(this.cards_up);
+    // }
+    // /** 升级按钮释放 → 执行升级逻辑 */
+    // private onUpgradeTouchEnd() {
+    //     this.playButtonClickAnim(this.cards_up, () => this.onClickUpgrade());
+    // }
+    // /** 升级按钮取消 → 恢复缩放 */
+    // private onUpgradeTouchCancel() {
+    //     this.playButtonResetAnim(this.cards_up);
+    // }
 
     /** 将四个卡槽节点映射为 CardComp，形成固定顺序控制数组 */
     private cacheCardComps() {
@@ -516,34 +516,34 @@ export class MissionCardComp extends CCComp {
         this.dispatchCardsToSlots(cards);
     }
 
-    /** 升级按钮：仅提升卡池等级，卡槽是否更新由下一次抽卡触发 */
-    private onClickUpgrade() {
-        if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
-            mLogger.log(this.debugMode, "MissionCardComp", "pool already max", this.poolLv);
-            return;
-        }
-        const cost = this.getUpgradeCost(this.poolLv);
-        const currentCoin = this.getMissionCoin();
-        if (currentCoin < cost) {
-            oops.gui.toast(`金币不足，升级需要${cost}`);
-            this.updateCoinAndCostUI();
-            mLogger.log(this.debugMode, "MissionCardComp", "pool upgrade coin not enough", {
-                poolLv: this.poolLv,
-                currentCoin,
-                cost
-            });
-            return;
-        }
-        this.setMissionCoin(currentCoin - cost);
-        this.poolLv += 1;
-        this.playCoinChangeAnim(false);
-        this.updateCoinAndCostUI();
-        mLogger.log(this.debugMode, "MissionCardComp", "pool level up", {
-            poolLv: this.poolLv,
-            cost,
-            leftCoin: this.getMissionCoin()
-        });
-    }
+    // /** 升级按钮：仅提升卡池等级，卡槽是否更新由下一次抽卡触发 */
+    // private onClickUpgrade() {
+    //     if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
+    //         mLogger.log(this.debugMode, "MissionCardComp", "pool already max", this.poolLv);
+    //         return;
+    //     }
+    //     const cost = this.getUpgradeCost(this.poolLv);
+    //     const currentCoin = this.getMissionCoin();
+    //     if (currentCoin < cost) {
+    //         oops.gui.toast(`金币不足，升级需要${cost}`);
+    //         this.updateCoinAndCostUI();
+    //         mLogger.log(this.debugMode, "MissionCardComp", "pool upgrade coin not enough", {
+    //             poolLv: this.poolLv,
+    //             currentCoin,
+    //             cost
+    //         });
+    //         return;
+    //     }
+    //     this.setMissionCoin(currentCoin - cost);
+    //     this.poolLv += 1;
+    //     this.playCoinChangeAnim(false);
+    //     this.updateCoinAndCostUI();
+    //     mLogger.log(this.debugMode, "MissionCardComp", "pool level up", {
+    //         poolLv: this.poolLv,
+    //         cost,
+    //         leftCoin: this.getMissionCoin()
+    //     });
+    // }
 
     // ======================== 阶段切换 ========================
 
@@ -685,23 +685,23 @@ export class MissionCardComp extends CCComp {
     }
     /** 更新升级按钮上的等级文案，反馈当前卡池层级 */
     private updatePoolLvUI() {
-        if (this.cards_up) {
-            const nobg = this.cards_up.getChildByName("nobg");
-            if (nobg) {
-                nobg.active = !this.canUpPool();
-            }
-            const coinNode = this.cards_up.getChildByName("coin");
-            const label = coinNode?.getChildByName("num")?.getComponent(Label);
-            if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
-                if (label) {
-                    label.string = `0`;
-                }
-            } else {
-                if (label) {
-                    label.string = `${this.getUpgradeCost(this.poolLv)}`;
-                }
-            }
-        }
+        // if (this.cards_up) {
+        //     const nobg = this.cards_up.getChildByName("nobg");
+        //     if (nobg) {
+        //         nobg.active = !this.canUpPool();
+        //     }
+        //     const coinNode = this.cards_up.getChildByName("coin");
+        //     const label = coinNode?.getChildByName("num")?.getComponent(Label);
+        //     if (this.poolLv >= CARD_POOL_MAX_LEVEL) {
+        //         if (label) {
+        //             label.string = `0`;
+        //         }
+        //     } else {
+        //         if (label) {
+        //             label.string = `${this.getUpgradeCost(this.poolLv)}`;
+        //         }
+        //     }
+        // }
         if (this.pool_lv_node) {
             this.pool_lv_node.active = true;
             const lv = Math.max(CARD_POOL_INIT_LEVEL, Math.min(CARD_POOL_MAX_LEVEL, Math.floor(this.poolLv)));
@@ -1059,7 +1059,7 @@ export class MissionCardComp extends CCComp {
     reset() {
         this.clearHeroInfoPanels();
         this.resetButtonScale(this.cards_chou);
-        this.resetButtonScale(this.cards_up);
+        // this.resetButtonScale(this.cards_up);
         this.node.destroy();
     }
 }
diff --git a/assets/script/game/map/RogueConfig.ts b/assets/script/game/map/RogueConfig.ts
index 8dbfb730..2bd1ead2 100644
--- a/assets/script/game/map/RogueConfig.ts
+++ b/assets/script/game/map/RogueConfig.ts
@@ -122,13 +122,20 @@ export const WaveSlotConfig: { [wave: number]: IWaveSlot[] } = {
 
      /** 第 1 波：2 近战 + 1 近战Boss(默认占3格) */
     1: [
-        { type: MonType.Long, count: 2 },
+        { type: MonType.Melee, count: 1 },
     ],
     2: [
+        { type: MonType.Melee, count: 1 },
+        { type: MonType.Long, count: 1 },
+    ],
+    3: [
+        { type: MonType.Melee, count: 1 },
+        { type: MonType.Long, count: 2 },
+    ],
+    4: [
         { type: MonType.Melee, count: 2 },
         { type: MonType.Long, count: 2 },
     ],
-    
     /** 第 1 波：2 近战 + 1 近战Boss(默认占3格) */
     10: [
         { type: MonType.MeleeBoss, count: 1 },