diff --git a/assets/resources/gui/element/item_info.prefab b/assets/resources/gui/element/item_info.prefab
index fcb97a4a..045d9678 100644
--- a/assets/resources/gui/element/item_info.prefab
+++ b/assets/resources/gui/element/item_info.prefab
@@ -216,7 +216,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "tiem_bg",
+    "_name": "item_bg",
     "_objFlags": 0,
     "__editorExtras__": {},
     "_parent": {
diff --git a/assets/resources/gui/items.plist b/assets/resources/gui/items.plist
index 7435102b..b7d2641f 100644
--- a/assets/resources/gui/items.plist
+++ b/assets/resources/gui/items.plist
@@ -17,7 +17,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1150,197},{50,56}}</string>
+                <string>{{189,542},{50,56}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -34,7 +34,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1202,193},{50,56}}</string>
+                <string>{{189,600},{50,56}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -51,9 +51,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1254,193},{50,56}}</string>
+                <string>{{59,648},{50,56}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1004.png</key>
             <dict>
@@ -68,7 +68,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{922,204},{56,50}}</string>
+                <string>{{61,596},{56,50}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -85,7 +85,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{980,204},{56,50}}</string>
+                <string>{{1,625},{56,50}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -102,9 +102,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1306,193},{56,50}}</string>
+                <string>{{119,602},{56,50}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>1007.png</key>
             <dict>
@@ -119,7 +119,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{806,207},{48,56}}</string>
+                <string>{{1,677},{48,56}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -136,7 +136,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{864,207},{48,56}}</string>
+                <string>{{117,654},{48,56}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -153,9 +153,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1358,193},{48,56}}</string>
+                <string>{{59,700},{48,56}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1010.png</key>
             <dict>
@@ -170,9 +170,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1038,201},{50,54}}</string>
+                <string>{{175,658},{50,54}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1011.png</key>
             <dict>
@@ -187,9 +187,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1408,193},{50,54}}</string>
+                <string>{{117,704},{50,54}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>1012.png</key>
             <dict>
@@ -204,7 +204,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1460,191},{50,54}}</string>
+                <string>{{173,710},{50,54}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -221,7 +221,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{65,178},{58,58}}</string>
+                <string>{{69,536},{58,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -238,7 +238,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{125,178},{58,58}}</string>
+                <string>{{1,565},{58,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -255,9 +255,9 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1,178},{64,62}}</string>
+                <string>{{137,478},{64,62}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>2004.png</key>
             <dict>
@@ -272,7 +272,7 @@
                 <key>spriteSourceSize</key>
                 <string>{64,64}</string>
                 <key>textureRect</key>
-                <string>{{1090,197},{58,58}}</string>
+                <string>{{129,542},{58,58}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -285,13 +285,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{114,116}</string>
+                <string>{75,77}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{83,83}</string>
                 <key>textureRect</key>
-                <string>{{408,1},{114,116}}</string>
+                <string>{{81,137},{75,77}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2006.Png</key>
             <dict>
@@ -302,13 +302,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{114,116}</string>
+                <string>{75,77}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{83,83}</string>
                 <key>textureRect</key>
-                <string>{{524,1},{114,116}}</string>
+                <string>{{1,160},{75,77}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2009.png</key>
             <dict>
@@ -319,13 +319,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{115,93}</string>
+                <string>{81,65}</string>
                 <key>spriteSourceSize</key>
-                <string>{115,93}</string>
+                <string>{81,65}</string>
                 <key>textureRect</key>
-                <string>{{529,119},{115,93}}</string>
+                <string>{{86,70},{81,65}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>2301.png</key>
             <dict>
@@ -336,13 +336,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{89,99}</string>
+                <string>{64,70}</string>
                 <key>spriteSourceSize</key>
-                <string>{179,179}</string>
+                <string>{128,128}</string>
                 <key>textureRect</key>
-                <string>{{896,103},{89,99}}</string>
+                <string>{{169,83},{64,70}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2302.png</key>
             <dict>
@@ -351,13 +351,13 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{84,98}</string>
+                <string>{68,80}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{102,102}</string>
                 <key>textureRect</key>
-                <string>{{910,1},{84,98}}</string>
+                <string>{{171,1},{68,80}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
@@ -368,15 +368,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-5}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,100}</string>
+                <string>{64,72}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{806,105},{88,100}}</string>
+                <string>{{1,305},{64,72}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2304.png</key>
             <dict>
@@ -385,15 +385,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{90,102}</string>
+                <string>{66,74}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{714,107},{90,102}}</string>
+                <string>{{80,214},{66,74}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2305.png</key>
             <dict>
@@ -402,15 +402,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{-1,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,92}</string>
+                <string>{64,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1432,97},{88,92}}</string>
+                <string>{{1,433},{64,66}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2306.png</key>
             <dict>
@@ -419,15 +419,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{86,104}</string>
+                <string>{62,74}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{640,1},{86,104}}</string>
+                <string>{{77,282},{62,74}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2307.png</key>
             <dict>
@@ -436,15 +436,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,104}</string>
+                <string>{64,74}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{624,119},{88,104}}</string>
+                <string>{{156,218},{64,74}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2308.png</key>
             <dict>
@@ -453,15 +453,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-5}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,100}</string>
+                <string>{64,72}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{820,1},{88,100}}</string>
+                <string>{{153,284},{64,72}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2309.png</key>
             <dict>
@@ -470,15 +470,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{90,102}</string>
+                <string>{66,74}</string>
                 <key>spriteSourceSize</key>
-                <string>{134,134}</string>
+                <string>{96,96}</string>
                 <key>textureRect</key>
-                <string>{{728,1},{90,102}}</string>
+                <string>{{1,237},{66,74}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2310.png</key>
             <dict>
@@ -487,15 +487,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{-1,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,92}</string>
+                <string>{64,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1441,1},{88,92}}</string>
+                <string>{{143,412},{64,66}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2311.png</key>
             <dict>
@@ -504,15 +504,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{84,94}</string>
+                <string>{60,68}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1346,97},{84,94}}</string>
+                <string>{{147,350},{60,68}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2312.png</key>
             <dict>
@@ -521,15 +521,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{84,98}</string>
+                <string>{60,70}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{987,101},{84,98}}</string>
+                <string>{{75,346},{60,70}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2313.png</key>
             <dict>
@@ -538,15 +538,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{-1,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,92}</string>
+                <string>{64,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1522,95},{88,92}}</string>
+                <string>{{69,470},{64,66}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2314.png</key>
             <dict>
@@ -555,15 +555,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{84,94}</string>
+                <string>{60,68}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1355,1},{84,94}}</string>
+                <string>{{73,408},{60,68}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2315.png</key>
             <dict>
@@ -572,15 +572,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{0,-4}</string>
+                <string>{0,-3}</string>
                 <key>spriteSize</key>
-                <string>{84,98}</string>
+                <string>{60,70}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{996,1},{84,98}}</string>
+                <string>{{1,371},{60,70}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>2316.png</key>
             <dict>
@@ -589,15 +589,15 @@
                 <key>anchor</key>
                 <string>{0.5,0.5}</string>
                 <key>spriteOffset</key>
-                <string>{-1,-4}</string>
+                <string>{-1,-3}</string>
                 <key>spriteSize</key>
-                <string>{88,92}</string>
+                <string>{64,66}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{1531,1},{88,92}}</string>
+                <string>{{1,499},{64,66}}</string>
                 <key>textureRotated</key>
-                <false/>
+                <true/>
             </dict>
             <key>5007.Png</key>
             <dict>
@@ -608,13 +608,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{110,108}</string>
+                <string>{78,78}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{90,90}</string>
                 <key>textureRect</key>
-                <string>{{291,143},{110,108}}</string>
+                <string>{{1,80},{78,78}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>5016.Png</key>
             <dict>
@@ -625,13 +625,13 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{128,100}</string>
+                <string>{83,67}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{83,83}</string>
                 <key>textureRect</key>
-                <string>{{306,1},{128,100}}</string>
+                <string>{{86,1},{83,67}}</string>
                 <key>textureRotated</key>
-                <true/>
+                <false/>
             </dict>
             <key>5017.Png</key>
             <dict>
@@ -642,32 +642,15 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{126,116}</string>
+                <string>{83,77}</string>
                 <key>spriteSourceSize</key>
-                <string>{128,128}</string>
+                <string>{83,83}</string>
                 <key>textureRect</key>
-                <string>{{401,131},{126,116}}</string>
+                <string>{{1,1},{83,77}}</string>
                 <key>textureRotated</key>
                 <false/>
             </dict>
-            <key>PictoIcon_Exp.Png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{-1,0}</string>
-                <key>spriteSize</key>
-                <string>{104,112}</string>
-                <key>spriteSourceSize</key>
-                <string>{128,128}</string>
-                <key>textureRect</key>
-                <string>{{185,143},{104,112}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>card1.png</key>
+            <key>9001.png</key>
             <dict>
                 <key>aliases</key>
                 <array/>
@@ -676,147 +659,11 @@
                 <key>spriteOffset</key>
                 <string>{0,0}</string>
                 <key>spriteSize</key>
-                <string>{140,80}</string>
+                <string>{67,75}</string>
                 <key>spriteSourceSize</key>
-                <string>{140,80}</string>
+                <string>{67,75}</string>
                 <key>textureRect</key>
-                <string>{{142,1},{140,80}}</string>
-                <key>textureRotated</key>
-                <true/>
-            </dict>
-            <key>card2.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{140,80}</string>
-                <key>spriteSourceSize</key>
-                <string>{140,80}</string>
-                <key>textureRect</key>
-                <string>{{224,1},{140,80}}</string>
-                <key>textureRotated</key>
-                <true/>
-            </dict>
-            <key>equipment_frame_blue.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1073,101},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>equipment_frame_brown.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1082,1},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>equipment_frame_green.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1164,97},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>equipment_frame_purple.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1173,1},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>equipment_frame_red.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1255,97},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>equipment_frame_yellow.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{89,94}</string>
-                <key>spriteSourceSize</key>
-                <string>{89,94}</string>
-                <key>textureRect</key>
-                <string>{{1264,1},{89,94}}</string>
-                <key>textureRotated</key>
-                <false/>
-            </dict>
-            <key>icon.png</key>
-            <dict>
-                <key>aliases</key>
-                <array/>
-                <key>anchor</key>
-                <string>{0.5,0.5}</string>
-                <key>spriteOffset</key>
-                <string>{0,0}</string>
-                <key>spriteSize</key>
-                <string>{175,139}</string>
-                <key>spriteSourceSize</key>
-                <string>{175,139}</string>
-                <key>textureRect</key>
-                <string>{{1,1},{175,139}}</string>
+                <string>{{160,149},{67,75}}</string>
                 <key>textureRotated</key>
                 <true/>
             </dict>
@@ -832,9 +679,9 @@
             <key>realTextureFileName</key>
             <string>items.png</string>
             <key>size</key>
-            <string>{1620,256}</string>
+            <string>{240,765}</string>
             <key>smartupdate</key>
-            <string>$TexturePacker:SmartUpdate:9cb6bde828e803f58a340938c886ee1b:e93a81657904e775072a5fd851992336:9b2c40378ce3448cae3ca053079d3001$</string>
+            <string>$TexturePacker:SmartUpdate:1e9b811f57b421db7d7fc91408b110c1:e1d6756d1c18347ee84e4cf1f7e4f441:9b2c40378ce3448cae3ca053079d3001$</string>
             <key>textureFileName</key>
             <string>items.png</string>
         </dict>
diff --git a/assets/resources/gui/items.plist.meta b/assets/resources/gui/items.plist.meta
index 424078e9..0fd5a73d 100644
--- a/assets/resources/gui/items.plist.meta
+++ b/assets/resources/gui/items.plist.meta
@@ -19,8 +19,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 980,
-        "trimY": 204,
+        "trimX": 1,
+        "trimY": 625,
         "width": 56,
         "height": 50,
         "rawWidth": 64,
@@ -65,8 +65,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 125,
-        "trimY": 178,
+        "trimX": 1,
+        "trimY": 565,
         "width": 58,
         "height": 58,
         "rawWidth": 64,
@@ -99,52 +99,6 @@
       ],
       "subMetas": {}
     },
-    "60270": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@60270",
-      "displayName": "",
-      "id": "60270",
-      "name": "equipment_frame_green",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1164,
-        "trimY": 97,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "94586": {
       "importer": "sprite-frame",
       "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@94586",
@@ -154,11 +108,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 1306,
-        "trimY": 193,
+        "trimX": 119,
+        "trimY": 602,
         "width": 56,
         "height": 50,
         "rawWidth": 64,
@@ -203,8 +157,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1150,
-        "trimY": 197,
+        "trimX": 189,
+        "trimY": 542,
         "width": 50,
         "height": 56,
         "rawWidth": 64,
@@ -249,8 +203,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1202,
-        "trimY": 193,
+        "trimX": 189,
+        "trimY": 600,
         "width": 50,
         "height": 56,
         "rawWidth": 64,
@@ -292,11 +246,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1254,
-        "trimY": 193,
+        "trimX": 59,
+        "trimY": 648,
         "width": 50,
         "height": 56,
         "rawWidth": 64,
@@ -341,8 +295,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": -2,
-        "trimX": 922,
-        "trimY": 204,
+        "trimX": 61,
+        "trimY": 596,
         "width": 56,
         "height": 50,
         "rawWidth": 64,
@@ -387,8 +341,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 806,
-        "trimY": 207,
+        "trimX": 1,
+        "trimY": 677,
         "width": 48,
         "height": 56,
         "rawWidth": 64,
@@ -433,8 +387,8 @@
         "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 864,
-        "trimY": 207,
+        "trimX": 117,
+        "trimY": 654,
         "width": 48,
         "height": 56,
         "rawWidth": 64,
@@ -476,11 +430,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1358,
-        "trimY": 193,
+        "trimX": 59,
+        "trimY": 700,
         "width": 48,
         "height": 56,
         "rawWidth": 64,
@@ -522,11 +476,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1038,
-        "trimY": 201,
+        "trimX": 175,
+        "trimY": 658,
         "width": 50,
         "height": 54,
         "rawWidth": 64,
@@ -568,11 +522,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1408,
-        "trimY": 193,
+        "trimX": 117,
+        "trimY": 704,
         "width": 50,
         "height": 54,
         "rawWidth": 64,
@@ -617,8 +571,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1460,
-        "trimY": 191,
+        "trimX": 173,
+        "trimY": 710,
         "width": 50,
         "height": 54,
         "rawWidth": 64,
@@ -663,8 +617,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 65,
-        "trimY": 178,
+        "trimX": 69,
+        "trimY": 536,
         "width": 58,
         "height": 58,
         "rawWidth": 64,
@@ -706,11 +660,11 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1,
-        "trimY": 178,
+        "trimX": 137,
+        "trimY": 478,
         "width": 64,
         "height": 62,
         "rawWidth": 64,
@@ -755,8 +709,8 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 1090,
-        "trimY": 197,
+        "trimX": 129,
+        "trimY": 542,
         "width": 58,
         "height": 58,
         "rawWidth": 64,
@@ -798,15 +752,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 408,
-        "trimY": 1,
-        "width": 114,
-        "height": 116,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "trimX": 81,
+        "trimY": 137,
+        "width": 75,
+        "height": 77,
+        "rawWidth": 83,
+        "rawHeight": 83,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -844,15 +798,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 524,
-        "trimY": 1,
-        "width": 114,
-        "height": 116,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "trimX": 1,
+        "trimY": 160,
+        "width": 75,
+        "height": 77,
+        "rawWidth": 83,
+        "rawHeight": 83,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -890,15 +844,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 529,
-        "trimY": 119,
-        "width": 115,
-        "height": 93,
-        "rawWidth": 115,
-        "rawHeight": 93,
+        "trimX": 86,
+        "trimY": 70,
+        "width": 81,
+        "height": 65,
+        "rawWidth": 81,
+        "rawHeight": 65,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -936,15 +890,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 896,
-        "trimY": 103,
-        "width": 89,
-        "height": 99,
-        "rawWidth": 179,
-        "rawHeight": 179,
+        "trimX": 169,
+        "trimY": 83,
+        "width": 64,
+        "height": 70,
+        "rawWidth": 128,
+        "rawHeight": 128,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -984,13 +938,13 @@
         "trimThreshold": 1,
         "rotated": false,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 910,
+        "offsetY": -3,
+        "trimX": 171,
         "trimY": 1,
-        "width": 84,
-        "height": 98,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "width": 68,
+        "height": 80,
+        "rawWidth": 102,
+        "rawHeight": 102,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1028,15 +982,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -5,
-        "trimX": 806,
-        "trimY": 105,
-        "width": 88,
-        "height": 100,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "offsetY": -3,
+        "trimX": 1,
+        "trimY": 305,
+        "width": 64,
+        "height": 72,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1074,15 +1028,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 714,
-        "trimY": 107,
-        "width": 90,
-        "height": 102,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "rotated": true,
+        "offsetX": -1,
+        "offsetY": -3,
+        "trimX": 80,
+        "trimY": 214,
+        "width": 66,
+        "height": 74,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1120,15 +1074,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
-        "offsetY": -4,
-        "trimX": 1432,
-        "trimY": 97,
-        "width": 88,
-        "height": 92,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 1,
+        "trimY": 433,
+        "width": 64,
+        "height": 66,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1166,15 +1120,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 640,
-        "trimY": 1,
-        "width": 86,
-        "height": 104,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "offsetY": -3,
+        "trimX": 77,
+        "trimY": 282,
+        "width": 62,
+        "height": 74,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1212,15 +1166,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 624,
-        "trimY": 119,
-        "width": 88,
-        "height": 104,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "offsetY": -3,
+        "trimX": 156,
+        "trimY": 218,
+        "width": 64,
+        "height": 74,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1258,15 +1212,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -5,
-        "trimX": 820,
-        "trimY": 1,
-        "width": 88,
-        "height": 100,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "offsetY": -3,
+        "trimX": 153,
+        "trimY": 284,
+        "width": 64,
+        "height": 72,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1304,15 +1258,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 728,
-        "trimY": 1,
-        "width": 90,
-        "height": 102,
-        "rawWidth": 134,
-        "rawHeight": 134,
+        "rotated": true,
+        "offsetX": -1,
+        "offsetY": -3,
+        "trimX": 1,
+        "trimY": 237,
+        "width": 66,
+        "height": 74,
+        "rawWidth": 96,
+        "rawHeight": 96,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1350,15 +1304,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
-        "offsetY": -4,
-        "trimX": 1441,
-        "trimY": 1,
-        "width": 88,
-        "height": 92,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 143,
+        "trimY": 412,
+        "width": 64,
+        "height": 66,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1396,15 +1350,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 1346,
-        "trimY": 97,
-        "width": 84,
-        "height": 94,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 147,
+        "trimY": 350,
+        "width": 60,
+        "height": 68,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1442,15 +1396,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 987,
-        "trimY": 101,
-        "width": 84,
-        "height": 98,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 75,
+        "trimY": 346,
+        "width": 60,
+        "height": 70,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1488,15 +1442,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
-        "offsetY": -4,
-        "trimX": 1522,
-        "trimY": 95,
-        "width": 88,
-        "height": 92,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 69,
+        "trimY": 470,
+        "width": 64,
+        "height": 66,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1534,15 +1488,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 1355,
-        "trimY": 1,
-        "width": 84,
-        "height": 94,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 73,
+        "trimY": 408,
+        "width": 60,
+        "height": 68,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1580,15 +1534,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": 0,
-        "offsetY": -4,
-        "trimX": 996,
-        "trimY": 1,
-        "width": 84,
-        "height": 98,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 1,
+        "trimY": 371,
+        "width": 60,
+        "height": 70,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1626,15 +1580,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": false,
+        "rotated": true,
         "offsetX": -1,
-        "offsetY": -4,
-        "trimX": 1531,
-        "trimY": 1,
-        "width": 88,
-        "height": 92,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "offsetY": -3,
+        "trimX": 1,
+        "trimY": 499,
+        "width": 64,
+        "height": 66,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1672,15 +1626,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 291,
-        "trimY": 143,
-        "width": 110,
-        "height": 108,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "trimX": 1,
+        "trimY": 80,
+        "width": 78,
+        "height": 78,
+        "rawWidth": 90,
+        "rawHeight": 90,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1718,15 +1672,15 @@
       "userData": {
         "trimType": "auto",
         "trimThreshold": 1,
-        "rotated": true,
+        "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 306,
+        "trimX": 86,
         "trimY": 1,
-        "width": 128,
-        "height": 100,
-        "rawWidth": 128,
-        "rawHeight": 128,
+        "width": 83,
+        "height": 67,
+        "rawWidth": 83,
+        "rawHeight": 83,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -1767,426 +1721,58 @@
         "rotated": false,
         "offsetX": 0,
         "offsetY": 0,
-        "trimX": 401,
-        "trimY": 131,
-        "width": 126,
-        "height": 116,
-        "rawWidth": 128,
-        "rawHeight": 128,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "8e7ba": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@8e7ba",
-      "displayName": "",
-      "id": "8e7ba",
-      "name": "PictoIcon_Exp",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": -1,
-        "offsetY": 0,
-        "trimX": 185,
-        "trimY": 143,
-        "width": 104,
-        "height": 112,
-        "rawWidth": 128,
-        "rawHeight": 128,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "12e1b": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@12e1b",
-      "displayName": "",
-      "id": "12e1b",
-      "name": "card1",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": true,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 142,
-        "trimY": 1,
-        "width": 140,
-        "height": 80,
-        "rawWidth": 140,
-        "rawHeight": 80,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "6d6e1": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@6d6e1",
-      "displayName": "",
-      "id": "6d6e1",
-      "name": "card2",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": true,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 224,
-        "trimY": 1,
-        "width": 140,
-        "height": 80,
-        "rawWidth": 140,
-        "rawHeight": 80,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "33ae9": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@33ae9",
-      "displayName": "",
-      "id": "33ae9",
-      "name": "equipment_frame_blue",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1073,
-        "trimY": 101,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "c6dbc": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@c6dbc",
-      "displayName": "",
-      "id": "c6dbc",
-      "name": "equipment_frame_brown",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1082,
-        "trimY": 1,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "bccc6": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@bccc6",
-      "displayName": "",
-      "id": "bccc6",
-      "name": "equipment_frame_purple",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1173,
-        "trimY": 1,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "65b35": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@65b35",
-      "displayName": "",
-      "id": "65b35",
-      "name": "equipment_frame_red",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1255,
-        "trimY": 97,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "f72af": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@f72af",
-      "displayName": "",
-      "id": "f72af",
-      "name": "equipment_frame_yellow",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": false,
-        "offsetX": 0,
-        "offsetY": 0,
-        "trimX": 1264,
-        "trimY": 1,
-        "width": 89,
-        "height": 94,
-        "rawWidth": 89,
-        "rawHeight": 94,
-        "borderTop": 0,
-        "borderBottom": 0,
-        "borderLeft": 0,
-        "borderRight": 0,
-        "packable": true,
-        "pixelsToUnit": 100,
-        "pivotX": 0.5,
-        "pivotY": 0.5,
-        "meshType": 0,
-        "vertices": {
-          "rawPosition": [],
-          "indexes": [],
-          "uv": [],
-          "nuv": [],
-          "minPos": [],
-          "maxPos": []
-        },
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
-        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
-      },
-      "ver": "1.0.12",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
-    "b61ea": {
-      "importer": "sprite-frame",
-      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@b61ea",
-      "displayName": "",
-      "id": "b61ea",
-      "name": "icon",
-      "userData": {
-        "trimType": "auto",
-        "trimThreshold": 1,
-        "rotated": true,
-        "offsetX": 0,
-        "offsetY": 0,
         "trimX": 1,
         "trimY": 1,
-        "width": 175,
-        "height": 139,
-        "rawWidth": 175,
-        "rawHeight": 139,
+        "width": 83,
+        "height": 77,
+        "rawWidth": 83,
+        "rawHeight": 83,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [],
+          "indexes": [],
+          "uv": [],
+          "nuv": [],
+          "minPos": [],
+          "maxPos": []
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "4ca85ea7-6d3d-4e52-bb59-e0ad41ff0599@6c48a",
+        "atlasUuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "c8366": {
+      "importer": "sprite-frame",
+      "uuid": "7b0e7263-3b25-4fec-8935-abdd67c4b86d@c8366",
+      "displayName": "",
+      "id": "c8366",
+      "name": "9001",
+      "userData": {
+        "trimType": "auto",
+        "trimThreshold": 1,
+        "rotated": true,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 160,
+        "trimY": 149,
+        "width": 67,
+        "height": 75,
+        "rawWidth": 67,
+        "rawHeight": 75,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
diff --git a/assets/resources/gui/items.png b/assets/resources/gui/items.png
index 9966f3e3..5e47b98f 100644
Binary files a/assets/resources/gui/items.png and b/assets/resources/gui/items.png differ
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index fbbfd8cd..10a5b757 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -4149,16 +4149,6 @@
     "handler": "do_x10",
     "customEventData": ""
   },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 2
-    },
-    "component": "",
-    "_componentId": "9cbe4j5jBRBt7aZKuB2MRoX",
-    "handler": "mission_end",
-    "customEventData": ""
-  },
   {
     "__type__": "cc.ClickEvent",
     "target": {
@@ -4169,6 +4159,16 @@
     "handler": "to_mission",
     "customEventData": ""
   },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 2
+    },
+    "component": "",
+    "_componentId": "9cbe4j5jBRBt7aZKuB2MRoX",
+    "handler": "mission_end",
+    "customEventData": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts
index 3980f3d1..e1e8dcac 100644
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -101,9 +101,15 @@ export class SingletonModuleComp extends ecs.Comp {
             1004:0,
             1005:0,
             1006:0,
-            1013:0,
-            1014:0,
-            1015:0,
+            1007:0,
+            1021:0,
+            1022:0,
+            1023:0,
+            1024:0,
+            1025:0,
+            1026:0,
+            1027:0,
+            1028:0,
         },
         heros:{
             9001:{uuid:9001,lv:1,exp:0,slv:1,stone:0},
diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts
index 85bc5b11..ddb345d1 100644
--- a/assets/script/game/common/config/Items.ts
+++ b/assets/script/game/common/config/Items.ts
@@ -6,8 +6,8 @@ type:
 */
 
 export const Items={
-     1001:{uuid: 1001,path: "2001",type: 1,r_num:10,name: "训练凭证",info:"通过训练，提升普等级", },
-     1002:{uuid: 1002,path: "2002",type: 1,r_num:10,name: "高级训练凭证",info:"通过高等级训练，提升高50级以上英雄等级", },
+     1001:{uuid: 1001,path: "5017",type: 1,r_num:10,name: "训练凭证",info:"通过训练，提升普等级", },
+     1002:{uuid: 1002,path: "2009",type: 1,r_num:10,name: "高级训练凭证",info:"通过高等级训练，提升高50级以上英雄等级", },
      1003:{uuid: 1003,path: "1002",type: 1,r_num:10,name: "英雄原石",info:"一星英雄升星", },
      1004:{uuid: 1004,path: "1005",type: 1,r_num:1,name: "高级英雄原石",info:"二星英雄升星", },
      1005:{uuid: 1005,path: "1008",type: 1,r_num:1,name: "稀有英雄原石",info:"三星英雄升星", },
@@ -21,6 +21,6 @@ export const Items={
      1026:{uuid: 1026,path: "2307",type: 1,r_num:1,name: "高级生命石",info:"增加装备生命值", },
      1027:{uuid: 1027,path: "2308",type: 1,r_num:1,name: "稀有生命石",info:"增加装备生命值", },
      1028:{uuid: 1028,path: "2309",type: 1,r_num:1,name: "传说生命石",info:"增加装备生命值", },
-     9001:{uuid: 1028,path: "2309",type: 1,r_num:1,name: "金币",info:"金币不是万能的，但是没有金币是万万不能的", },
+     9001:{uuid: 9001,path: "9001",type: 1,r_num:1,name: "金币",info:"金币不是万能的，但是没有金币是万万不能的", },
 }
 
diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts
index b00921cd..07c13737 100644
--- a/assets/script/game/common/config/MissionSet.ts
+++ b/assets/script/game/common/config/MissionSet.ts
@@ -20,7 +20,7 @@ export const MissionSet = [
 
 
 export const MissionReward = {
-    1:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1026,1027,1028],
-    2:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1026,1027,1028],
-    3:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1026,1027,1028],
+    1:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028],
+    2:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028],
+    3:[1001,1002,1003,1004,1005,1006,1007,1021,1022,1023,1024,1025,1026,1027,1028],
 }
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 33d3467c..4146ad59 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -1,7 +1,7 @@
 
 export const HeroInfo = {
    9001: {
-      uuid:9001,name: "骑士·白",path:"k1",type:1,hp: 50, hp_up:10,def:10,def_up:1,ap:20,ap_up:2,atp:1,vun:0,crit:20,crit_add:0,dodge:0,dis:100,a_cd:1,
+      uuid:9001,name: "骑士·白",path:"k1",type:1,hp: 20, hp_up:10,def:10,def_up:1,ap:20,ap_up:2,atp:1,vun:0,crit:20,crit_add:0,dodge:0,dis:100,a_cd:1,
       lvexp:2,slvexp:2, speed: 100,aep:1,uaep:1,dep:10,sk1:[9001,9001,9001,9001,9001],sk2: [2002,2002,2002,2002,2002],pw:0,pwm:15,pws:1, 
       akr:[10,20,30,40,50],akc:[1,1,1,1,1],uar:[10,20,30,40,50],uac:[1,1,1,1,1],dgr:[10,20,30,40,50],dgc:[1,1,1,1,1],crr:[10,20,30,40,50],crc:[1,1,1,1,1], 
       abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index 8ba7c59b..7f6b7de0 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -205,7 +205,7 @@ export class HeroViewComp extends CCComp {
     onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) {
     }
     update(dt: number){
-        if(!smc.vmdata.mission.play||smc.vmdata.pause) return
+        if(!smc.vmdata.mission.play||smc.vmdata.mission.pause) return
         if(this.is_dead) {
             if(!this.in_grave()) this.to_grave()
             return
diff --git a/assets/script/game/map/ItemComp.ts b/assets/script/game/map/ItemComp.ts
index aaea187f..ec5ee9df 100644
--- a/assets/script/game/map/ItemComp.ts
+++ b/assets/script/game/map/ItemComp.ts
@@ -19,7 +19,7 @@ export class ItemComp extends CCComp {
     }
 
     show_info(){
-        oops.gui.open(UIID.ItemInfo, { name:Items[this.i_uuid].name, info:Items[this.i_uuid].info});
+        oops.gui.open(UIID.ItemInfo, Items[this.i_uuid]);
     }
 
     /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */
diff --git a/assets/script/game/map/ItemInfoComp.ts b/assets/script/game/map/ItemInfoComp.ts
index 9ccf0590..ad07727a 100644
--- a/assets/script/game/map/ItemInfoComp.ts
+++ b/assets/script/game/map/ItemInfoComp.ts
@@ -1,4 +1,4 @@
-import { EventTouch, Label, Node,_decorator } from "cc";
+import { EventTouch, Label, Node,Sprite,SpriteAtlas,_decorator, resources } from "cc";
 import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
 import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
 import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
@@ -12,6 +12,12 @@ export class ItemInfoComp extends CCComp {
     onAdded(args: any) {
         this.node.getChildByName("name").getComponent(Label).string=args.name
         this.node.getChildByName("info").getComponent(Label).string=args.info
+        let url = "gui/items";
+        let pathName= args.path;
+        resources.load(url, SpriteAtlas, (err: any, atlas) => {
+            const sprite = this.node.getChildByName("item_bg").getChildByName("icon").getComponent(Sprite);
+            sprite.spriteFrame = atlas.getSpriteFrame(pathName);
+        });
     }
 
     private onTouchEnd(event: EventTouch) {
diff --git a/assets/script/game/map/MIssionController.ts b/assets/script/game/map/MIssionController.ts
index 7d7a9276..d282ce33 100644
--- a/assets/script/game/map/MIssionController.ts
+++ b/assets/script/game/map/MIssionController.ts
@@ -60,7 +60,7 @@ export class MissionComp extends CCComp {
     }
     
     protected update(dt: number): void {
-        if(!smc.vmdata.mission.play||smc.vmdata.pause){
+        if(!smc.vmdata.mission.play||smc.vmdata.mission.pause){
             return
         }
         if(this.fight_start){
@@ -99,9 +99,13 @@ export class MissionComp extends CCComp {
         this.node.getChildByName("mexp").getChildByName("hp").active = true
         this.mon_refresh()
         this.heros_call()
+    }
+    do_x10(){
+        
     }
     mission_end(){
         smc.vmdata.mission.play=false
+        smc.vmdata.mission.pause=false
         let heros:any= this.get_heros();;
         let monsters:any= this.get_mons();
         let hcards:any= ecs.query(ecs.allOf(HCardComp));
@@ -169,10 +173,6 @@ export class MissionComp extends CCComp {
         }
     }
     
-    do_reward(){
-        console.log("do_reward")
-        
-    }
     check_mon_num(){
         let mons:any = this.get_mons()
         let heros:any= this.get_heros()
@@ -194,10 +194,12 @@ export class MissionComp extends CCComp {
     }
     to_end_mission(){
         if (smc.vmdata.mission.is_victory){
-            this.VictoryComp.do_victiry()
+            this.VictoryComp.do_victiry(true)
+            smc.vmdata.mission.pause=true       
         }
         if (smc.vmdata.mission.is_defeat){
-            this.VictoryComp.do_defeat()
+            this.VictoryComp.do_victiry(false)
+            smc.vmdata.mission.pause=true        
         }
     }
     get_mons(){
diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts
index bfcaa466..bed3afbb 100644
--- a/assets/script/game/map/VictoryComp.ts
+++ b/assets/script/game/map/VictoryComp.ts
@@ -21,24 +21,18 @@ export class VictoryComp extends CCComp {
     
     reward_lv:number=1
     reward_num:number=2
-    rerawd_item:any={}
+    rewards:any=[]
     if_show:boolean=false
     /** 视图层逻辑代码分离演示 */
     start() {
+        this.rewards=[]
     }
-    private do_victiry() {
+    private do_victiry(is_victory:boolean) {
         if(this.if_show) return
+        this.getReward(is_victory)
+        this.node.getChildByName("Node").getChildByName("defeat").active = is_victory
+        this.node.getChildByName("Node").getChildByName("victory").active = !is_victory;   
         this.node.setPosition(0,this.node.position.y,0)
-        this.getReward(true)
-        this.node.getChildByName("Node").getChildByName("defeat").active = false
-        this.node.getChildByName("Node").getChildByName("victory").active = true;   
-    }
-    private do_defeat() {
-        if(this.if_show) return
-        this.node.setPosition(0,this.node.position.y,0)
-        this.getReward(false)
-        this.node.getChildByName("Node").getChildByName("victory").active = false; 
-        this.node.getChildByName("Node").getChildByName("defeat").active = true
     }
     getReward(is_victory:boolean){
         let conut =2
@@ -48,19 +42,42 @@ export class VictoryComp extends CCComp {
         let parent = this.node.getChildByName("Node").getChildByName("items")
         let reward:any = RandomManager.instance.getRandomByObjectList(MissionReward[this.reward_lv], conut);
         item1.load(9001,gold,parent)
+        this.rewards = [];
+        this.rewards[0]={uuid:9001,num:gold}
         for (let i = 0; i < conut; i++) {
             let item=ecs.getEntity<Item>(Item)
-            let im =Items[reward[i]]
+            
+            while (Items[reward[i]]==undefined) {
+                let r = RandomManager.instance.getRandomByObjectList(MissionReward[this.reward_lv], 1);
+                Items[reward[i]]=r[0]
+                console.log("getReward undefined",Items[reward[i]],i)
+            }
+            let im =Items[reward[i]]            
             item.load(im.uuid,im.r_num,parent)
+            this.rewards[i+1]={uuid:9001,num:gold}
         }
         this.if_show=true
     }
     do_x10(){
-        console.log("x10")
+        for (let i = 0; i < this.rewards.length; i++) {
+            if(this.rewards[i].uuid==9001){
+                smc.vmdata.role.gold+=this.rewards[i].num*10
+            }else{
+                smc.vmdata.items[this.rewards[i].uuid]+=this.rewards[i].num*10
+            }
+        }
+        console.log("do_x10",smc.vmdata)
         this.end_mission()
     }
     do_x1(){
-        console.log("x1")
+        for (let i = 0; i < this.rewards.length; i++) {
+            if(this.rewards[i].uuid==9001){
+                smc.vmdata.role.gold+=this.rewards[i].num
+            }else{
+                smc.vmdata.items[this.rewards[i].uuid]+=this.rewards[i].num
+            }
+        }
+        console.log("x1",smc.vmdata)
         this.end_mission()
     }
     end_mission(){
diff --git a/assets/script/game/skills/MSkillComp.ts b/assets/script/game/skills/MSkillComp.ts
index 95bdcf95..c8feb59d 100644
--- a/assets/script/game/skills/MSkillComp.ts
+++ b/assets/script/game/skills/MSkillComp.ts
@@ -27,7 +27,7 @@ export class MSkillComp extends CCComp {
         this.cd=this.cdt=this.skill.cd
     }
     protected update(dt: number): void {
-        if(!smc.vmdata.mission.play||smc.vmdata.pause||smc.vmdata.mission.is_victory||smc.vmdata.mission.is_defeat){
+        if(!smc.vmdata.mission.play||smc.vmdata.mission.pause){
             return
         }
         this.check_cd(dt)