diff --git a/.objs/metas/jwedp6jy/ut66d.info b/.objs/metas/jwedp6jy/ut66d.info
new file mode 100644
index 0000000..c612e20
--- /dev/null
+++ b/.objs/metas/jwedp6jy/ut66d.info
@@ -0,0 +1,46 @@
+{
+  "objectStatus": {
+    "n247_s9lh": {
+      "hidden": true
+    },
+    "n147_fzz8": {
+      "hidden": true
+    },
+    "n245_s9lh": {
+      "hidden": true
+    },
+    "n234_dpcj": {
+      "hidden": true
+    },
+    "n356_ogc9": {
+      "hidden": true
+    },
+    "n146_fzz8": {
+      "hidden": true
+    },
+    "n144_fzz8": {
+      "hidden": true
+    },
+    "n299_tivm": {
+      "hidden": true
+    },
+    "n148_fzz8": {
+      "hidden": true
+    },
+    "n246_s9lh": {
+      "hidden": true
+    },
+    "n140_fzz8": {
+      "hidden": true
+    },
+    "n297_tivm": {
+      "hidden": true
+    },
+    "n145_fzz8": {
+      "hidden": true
+    },
+    "n298_tivm": {
+      "hidden": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/.objs/metas/pmf3wbji/ez6k22.info b/.objs/metas/pmf3wbji/ez6k22.info
new file mode 100644
index 0000000..4d2d3a1
--- /dev/null
+++ b/.objs/metas/pmf3wbji/ez6k22.info
@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n5_mh28": {
+      "hidden": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/.objs/metas/qrqjiu5s/kmj6b.info b/.objs/metas/qrqjiu5s/kmj6b.info
index 62f0290..9e26dfe 100644
--- a/.objs/metas/qrqjiu5s/kmj6b.info
+++ b/.objs/metas/qrqjiu5s/kmj6b.info
@@ -1,7 +1 @@
-{
-  "objectStatus": {
-    "n3_kmj6": {
-      "hidden": true
-    }
-  }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/.objs/metas/wj1zvor9/pf31j.info b/.objs/metas/wj1zvor9/pf31j.info
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/.objs/metas/wj1zvor9/pf31j.info
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/.objs/workspace.json b/.objs/workspace.json
index 614bb90..eb5cc93 100644
--- a/.objs/workspace.json
+++ b/.objs/workspace.json
@@ -5,18 +5,37 @@
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://e9w4rbkqkbzo4",
+  "doc.activeDoc": "ui://qmomwx89n5d58",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "qrqjiu5s",
+    "wj1zvor9",
     "/",
-    "qrqjiu5s",
+    "wj1zvor9",
+    "/com/",
+    "wj1zvor9",
+    "/com_new/",
+    "wj1zvor9",
+    "/new_img/",
+    "qmomwx89",
+    "/",
+    "qmomwx89",
     "/com/"
   ],
   "doc.openedDocs": [
-    "ui://e9w4rbkqkbzo26",
-    "ui://e9w4rbkqkbzoe",
-    "ui://e9w4rbkqkbzo4"
+    "ui://wj1zvor9pf31j",
+    "ui://qw9x6rf3lbaa0",
+    "ui://jwedp6jyut66d",
+    "ui://qw9x6rf3ngxz38",
+    "ui://qmomwx89lbaa0",
+    "ui://qmomwx89n5d58",
+    "ui://tm1qhgb4n5d50",
+    "ui://jwedp6jyqgv24k",
+    "ui://jwedp6jyqgv24f",
+    "ui://u5bqcwhxf6p00",
+    "ui://u5bqcwhxf6p05",
+    "ui://u5bqcwhxf6p04",
+    "ui://jwedp6jyes171x",
+    "ui://wj1zvor9pf31z"
   ],
   "snapToGrid": true,
   "gridColor": 80,
diff --git a/assets/ACommon/btn/btn_record.xml b/assets/ACommon/btn/btn_record.xml
index 62d1a80..ae941eb 100644
--- a/assets/ACommon/btn/btn_record.xml
+++ b/assets/ACommon/btn/btn_record.xml
@@ -2,7 +2,7 @@
 <component size="150,122" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_f6p0" name="n4" src="ez6ku" fileName="img/record_icon.png" xy="0,0"/>
+    <image id="n4_f6p0" name="n4" src="ez6ku" fileName="img/record_icon.png" xy="26,10"/>
   </displayList>
   <Button/>
 </component>
\ No newline at end of file
diff --git a/assets/ACommon/com/btn_fight.xml b/assets/ACommon/com/btn_fight.xml
index 8d25800..d2bd896 100644
--- a/assets/ACommon/com/btn_fight.xml
+++ b/assets/ACommon/com/btn_fight.xml
@@ -9,7 +9,7 @@
       <gearXY controller="cont_select" pages="1" values="114,33" default="114,50"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <text id="n55_iscl" name="n55" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Result">
+    <text id="n55_iscl" name="n55" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Play">
       <gearDisplay controller="cont_select" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </text>
diff --git a/assets/ACommon/com/btn_h5.xml b/assets/ACommon/com/btn_h5.xml
index 96726fe..b4e66b6 100644
--- a/assets/ACommon/com/btn_h5.xml
+++ b/assets/ACommon/com/btn_h5.xml
@@ -9,7 +9,7 @@
       <gearXY controller="cont_select" pages="0,1" values="111,55|111,33"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <text id="n60_nr06" name="n60" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Shop">
+    <text id="n60_nr06" name="n60" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Exchange">
       <gearDisplay controller="cont_select" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </text>
diff --git a/assets/ACommon/com/btn_main.xml b/assets/ACommon/com/btn_main.xml
index 58a96ed..4cd238f 100644
--- a/assets/ACommon/com/btn_main.xml
+++ b/assets/ACommon/com/btn_main.xml
@@ -9,7 +9,7 @@
       <gearXY controller="cont_select" pages="1" values="115,33" default="114,50"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n55_iscl" name="n55" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Play">
+    <text id="n55_iscl" name="n55" xy="0,157" size="359,59" fontSize="34" color="#9bdfff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#2160a6" strokeSize="2" text="Todos">
       <gearDisplay controller="cont_select" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </text>
diff --git a/assets/ACommon/com/com_di.xml b/assets/ACommon/com/com_di.xml
index 220983a..6c83e4c 100644
--- a/assets/ACommon/com/com_di.xml
+++ b/assets/ACommon/com/com_di.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,258">
-  <controller name="gift" pages="0,a,1,b" selected="0"/>
+  <controller name="gift" pages="0,a,1,b" selected="1"/>
   <displayList>
     <image id="n60_mobs" name="n60" src="jbnwha" fileName="img/7.png" xy="0,0" size="1080,258">
       <relation target="" sidePair="width-width"/>
     </image>
-    <component id="n53_g5x4" name="btn_main" src="okk5gd" fileName="com/btn_main.xml" xy="0,25" size="270,233">
+    <component id="n67_n4ed" name="btn_main" src="og7vpiz" fileName="com/btn_fight.xml" xy="0,24" size="360,233"/>
+    <component id="n55_g5x4" name="btn_shop" src="okk5gc" fileName="com/btn_h5.xml" xy="360,25" size="360,233">
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n55_g5x4" name="btn_shop" src="okk5gc" fileName="com/btn_h5.xml" xy="270,25" size="270,233">
-      <relation target="" sidePair="center-center"/>
-    </component>
-    <component id="n56_g5x4" name="btn_tab_redem" src="okk5ge" fileName="com/btn_todo.xml" xy="540,25">
+    <component id="n56_g5x4" name="btn_fight" src="okk5ge" fileName="com/btn_todo.xml" xy="-746,55" visible="false">
       <relation target="" sidePair="center-center"/>
     </component>
     <component id="n61_112ep" name="btn_hall" src="112epia" fileName="com/btn_hall.xml" xy="-834,40" visible="false"/>
-    <image id="n63_nr06" name="n63" src="nr06piq" fileName="img/Competition_down_line.png" xy="270,24"/>
-    <image id="n64_nr06" name="n64" src="nr06piq" fileName="img/Competition_down_line.png" xy="540,24"/>
-    <component id="n65_og7v" name="btn_fight" src="og7vpiz" fileName="com/btn_fight.xml" xy="810,25" size="270,233"/>
-    <image id="n66_og7v" name="n66" src="nr06piq" fileName="img/Competition_down_line.png" xy="810,24"/>
+    <image id="n63_nr06" name="n63" src="nr06piq" fileName="img/Competition_down_line.png" xy="360,24"/>
+    <image id="n64_nr06" name="n64" src="nr06piq" fileName="img/Competition_down_line.png" xy="720,24"/>
+    <component id="n68_n4ed" name="btn_tab_redem" src="okk5gd" fileName="com/btn_main.xml" xy="720,25" size="360,233">
+      <relation target="" sidePair="center-center"/>
+    </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/assets/ACommon/com_broadcast1.xml b/assets/ACommon/com_broadcast1.xml
index 5ef9202..29e0b2e 100644
--- a/assets/ACommon/com_broadcast1.xml
+++ b/assets/ACommon/com_broadcast1.xml
@@ -9,11 +9,11 @@
     </group>
   </displayList>
   <transition name="t0">
-    <item time="0" type="XY" target="n8_f6p0" tween="true" startValue="1110.32,-,1.028,0" endValue="440,-,0.407,0" duration="18"/>
+    <item time="0" type="XY" target="n8_f6p0" tween="true" startValue="1110.32,-,1.028,0" endValue="340,-,0.315,0" duration="18"/>
     <item time="0" type="XY" target="n9_f6p0" tween="true" startValue="913,-,0.845,0" endValue="1088,-,1.007,-0.279" duration="18"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="XY" target="n8_f6p0" tween="true" startValue="440,-,0.407,0" endValue="1110,-,1.028,0" duration="18"/>
+    <item time="0" type="XY" target="n8_f6p0" tween="true" startValue="340,-,0.315,0" endValue="1110,-,1.028,0" duration="18"/>
     <item time="0" type="XY" target="n9_f6p0" tween="true" startValue="1088,-,1.007,-0.279" endValue="913,-,0.845,0" duration="18"/>
   </transition>
 </component>
\ No newline at end of file
diff --git a/assets/ACommon/com_broadcast_text1.xml b/assets/ACommon/com_broadcast_text1.xml
index 01a90b3..67d5874 100644
--- a/assets/ACommon/com_broadcast_text1.xml
+++ b/assets/ACommon/com_broadcast_text1.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="768,122" overflow="hidden">
   <displayList>
-    <graph id="n3_f6p0" name="bg_panel" xy="324,60" size="1,1" type="rect"/>
-    <richtext id="n0_ghqt" name="cast_text" xy="0,36" size="765,49" fontSize="34" color="#ffe450" vAlign="middle" ubb="true" autoSize="none" text="[color=#ffce7e][size=32]{0}[/size][/color] withdraw [color=#63f021][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color]">
-      <relation target="" sidePair="left-left"/>
-    </richtext>
-    <richtext id="n1_ngxz" name="hide_text" xy="0,36" size="761,49" visible="false" fontSize="36" color="#ffffff" vAlign="middle" ubb="true" autoSize="none" text="[color=#ffce7e][size=32]{0}[/size][/color] withdraw [color=#63f021][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color]">
+    <image id="n6_n4ed" name="n6" src="n4edpj3" fileName="img/20260603-104625.png" xy="-1,9" size="771,102"/>
+    <richtext id="n0_ghqt" name="cast_text" xy="87,36" size="680,51" fontSize="34" color="#344a81" vAlign="middle" ubb="true" autoSize="none" text="[color=#8A5802][size=32]{0}[/size][/color] withdraw &lt;img src=&apos;ui://pmf3wbji112epi7&apos;/&gt;[color=#63f021][size=36]{1} [/size][/color][color=#efc26b][size=22]{2}[/size][/color]">
       <relation target="" sidePair="left-left"/>
     </richtext>
     <component id="n5_mh28" name="btn_broad" src="xpk549" fileName="btn/btn_null.xml" xy="4,1" size="766,121"/>
+    <image id="n7_n4ed" name="n7" src="n4edpj4" fileName="img/20260603-104633.png" xy="1,15"/>
+    <image id="n8_n4ed" name="n8" src="n4edpj5" fileName="img/20260603-110822.jpg" xy="0,-171"/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/assets/ACommon/img/20260603-104625.png b/assets/ACommon/img/20260603-104625.png
new file mode 100644
index 0000000..1418b7b
Binary files /dev/null and b/assets/ACommon/img/20260603-104625.png differ
diff --git a/assets/ACommon/img/20260603-104633.png b/assets/ACommon/img/20260603-104633.png
new file mode 100644
index 0000000..e7e4b4c
Binary files /dev/null and b/assets/ACommon/img/20260603-104633.png differ
diff --git a/assets/ACommon/img/20260603-110822.jpg b/assets/ACommon/img/20260603-110822.jpg
new file mode 100644
index 0000000..bd7a4c4
Binary files /dev/null and b/assets/ACommon/img/20260603-110822.jpg differ
diff --git a/assets/ACommon/img/record_icon.png b/assets/ACommon/img/record_icon.png
index 7e0ff4a..dc3538d 100644
Binary files a/assets/ACommon/img/record_icon.png and b/assets/ACommon/img/record_icon.png differ
diff --git a/assets/ACommon/img/record_money.png b/assets/ACommon/img/record_money.png
deleted file mode 100644
index dbe5392..0000000
Binary files a/assets/ACommon/img/record_money.png and /dev/null differ
diff --git a/assets/ACommon/package.xml b/assets/ACommon/package.xml
index c923a33..aa69331 100644
--- a/assets/ACommon/package.xml
+++ b/assets/ACommon/package.xml
@@ -90,8 +90,10 @@
     <image id="og7vpj0" name="Competition_icon_battle.png" path="/img/"/>
     <image id="og7vpj1" name="zhanji_norecord.png" path="/img/" exported="true"/>
     <image id="x6ybgu" name="card.png" path="/img/" exported="true"/>
-    <image id="qbo98" name="record_money.png" path="/img/" exported="true"/>
     <image id="ogc9pj2" name="money_icon.png" path="/img/" exported="true"/>
+    <image id="n4edpj3" name="20260603-104625.png" path="/img/" scale="9grid" scale9grid="18,17,9,10"/>
+    <image id="n4edpj4" name="20260603-104633.png" path="/img/"/>
+    <image id="n4edpj5" name="20260603-110822.jpg" path="/img/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>
\ No newline at end of file
diff --git a/assets/Common_01/img/结算界面优化效果图标注.jpg b/assets/Common_01/img/结算界面优化效果图标注.jpg
deleted file mode 100644
index 90c8fce..0000000
Binary files a/assets/Common_01/img/结算界面优化效果图标注.jpg and /dev/null differ
diff --git a/assets/Common_01/package.xml b/assets/Common_01/package.xml
index ac28ef6..c6a0d41 100644
--- a/assets/Common_01/package.xml
+++ b/assets/Common_01/package.xml
@@ -147,7 +147,6 @@
     <component id="gz3ucf" name="btn_restore.xml" path="/btn/" exported="true"/>
     <component id="fhzacg" name="btn_task.xml" path="/btn/" exported="true"/>
     <image id="fhzach" name="20250819-112153.png" path="/img/"/>
-    <image id="lryfci" name="结算界面优化效果图标注.jpg" path="/img/"/>
     <component id="peww38" name="btn_claim3.xml" path="/btn/" exported="true"/>
     <component id="lryf2d" name="btn_claim2_new.xml" path="/btn/" exported="true"/>
     <image id="lryf2c" name="btn_green_new.png" path="/img/" exported="true"/>
diff --git a/assets/JMain/com_firstreward.xml b/assets/JMain/com_firstreward.xml
index 11688f3..093283f 100644
--- a/assets/JMain/com_firstreward.xml
+++ b/assets/JMain/com_firstreward.xml
@@ -13,7 +13,9 @@
     <text id="n26_10d20" name="txt_title" xy="272,322" pivot="0.5,0.5" size="527,122" group="n11_ngxz" fontSize="56" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" strokeColor="#147bb9" strokeSize="3" text="You Receive"/>
     <component id="n27_10d20" name="closeButton" src="kirmpiw" fileName="btn/btn_close_.xml" pkg="pmf3wbji" xy="911,377" group="n11_ngxz"/>
     <text id="n14_ttbj" name="text_num" xy="198,951" size="693,290" group="n11_ngxz" fontSize="110" color="#ffef6c" align="center" vAlign="middle" autoSize="shrink" strokeColor="#733f10" strokeSize="5" text="$20.00"/>
-    <component id="n30_e2aq" name="btn_get" src="cphly" fileName="btn/btn_get.xml" pkg="o9974uc5" xy="324,1306" group="n11_ngxz"/>
+    <component id="n30_e2aq" name="btn_get" src="cphly" fileName="btn/btn_get.xml" pkg="o9974uc5" xy="324,1306" group="n11_ngxz">
+      <Button title="Claim"/>
+    </component>
     <image id="n31_e2aq" name="img_gold" src="s9lhak" fileName="img/money_icon.png" pkg="o9974uc5" xy="332,630" size="391,297" group="n11_ngxz" aspect="true"/>
     <group id="n11_ngxz" name="n11" xy="22,284" size="1036,1320" advanced="true">
       <gearDisplay controller="state" pages="1"/>
diff --git a/assets/JMain/com_main.xml b/assets/JMain/com_main.xml
index 23383d8..700a78d 100644
--- a/assets/JMain/com_main.xml
+++ b/assets/JMain/com_main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <controller name="gift" pages="0,a,1,b" selected="0"/>
+<component size="1080,1920" opaque="false">
+  <controller name="gift" pages="0,a,1,b" selected="1"/>
   <controller name="type" pages="0,0,1,1,2,2" selected="0"/>
   <displayList>
-    <graph id="n27_pqqv" name="gp_fx" xy="540,940" pivot="0.5,0.5" anchor="true" size="100,100" touchable="false" type="rect" lineColor="#00000000" fillColor="#00ffffff">
+    <graph id="n27_pqqv" name="gp_fx" xy="540,605" pivot="0.5,0.5" anchor="true" size="100,100" touchable="false" type="rect" lineColor="#00000000" fillColor="#00ffffff">
       <gearXY controller="gift" pages="0,1" values="540,940|540,605"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
@@ -51,10 +51,6 @@
       <gearDisplay controller="gift" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n45_e2aq" name="btn_cashout" src="733f4b" fileName="btn/btn_red.xml" pkg="o9974uc5" xy="817,224">
-      <gearDisplay controller="gift" pages="1"/>
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
     <component id="n46_uaj0" name="btn_petty" src="uaj0pin" fileName="btn/btn_petty.xml" xy="70,1444">
       <gearDisplay controller="gift" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -62,7 +58,7 @@
     <component id="n47_ogc9" name="btn_play" src="uaj0pio" fileName="btn/btn_play.xml" xy="318,1407">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n49_ogc9" name="btn_wb" src="mfb0pif" fileName="btn/btn_hall_h5.xml" pkg="pmf3wbji" xy="870,577" pivot="0.5,0.5" visible="false">
+    <component id="n49_ogc9" name="btn_wb" src="mfb0pif" fileName="btn/btn_hall_h5.xml" pkg="pmf3wbji" xy="867,577" pivot="0.5,0.5" visible="false">
       <gearDisplay controller="gift" pages="1"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
diff --git a/assets/JMall/com/btn_redeem_coin.xml b/assets/JMall/com/btn_redeem_coin.xml
index 72fcdae..f8a7150 100644
--- a/assets/JMall/com/btn_redeem_coin.xml
+++ b/assets/JMall/com/btn_redeem_coin.xml
@@ -5,7 +5,7 @@
     <image id="n0_x6yb" name="n0" src="x6yb4" fileName="img/5.png" xy="0,0" size="338,89">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n1_x6yb" name="title" xy="101,-3" size="218,89" fontSize="40" color="#fffef6" align="center" vAlign="middle" autoSize="shrink" strokeColor="#307b09" strokeSize="3" singleLine="true" text="20000000">
+    <text id="n1_x6yb" name="title" xy="101,-3" size="218,89" fontSize="40" color="#fffef6" align="center" vAlign="middle" autoSize="shrink" strokeColor="#307b09" strokeSize="3" singleLine="true" text="20">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
     <image id="n3_og7v" name="n3" src="x6ybhi" fileName="img/15.png" pkg="pmf3wbji" xy="23,5" size="78,78" aspect="true">
diff --git a/assets/JMall/com_exchange.xml b/assets/JMall/com_exchange.xml
new file mode 100644
index 0000000..abc5c28
--- /dev/null
+++ b/assets/JMall/com_exchange.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <graph id="n22_pf31" name="n22" xy="0,0" size="1080,1920" type="rect" lineSize="0" fillColor="#ff2b6092">
+      <relation target="" sidePair="height-height,center-center"/>
+    </graph>
+    <image id="n1_pf31" name="n1" src="pf31q" fileName="new_img/shopx_01_bg.png" xy="54,225" size="465,590">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n3_pf31" name="n3" src="pf31r" fileName="new_img/shopx_02_bg.png" xy="560,225" size="465,592">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n4_pf31" name="n4" src="pf31v" fileName="new_img/shop_yys_bingo.png" xy="161,249">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <graph id="n5_pf31" name="n5" xy="150,527" size="292,63" type="rect" lineSize="0" fillColor="#ffcba640">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <component id="n6_pf31" name="btn_subcard" src="pf31x" fileName="com_new/btn_setnum.xml" xy="108,513" size="80,88">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <component id="n7_pf31" name="btn_addcard" src="pf31x" fileName="com_new/btn_setnum.xml" xy="392,514" size="80,88" controller="type,1">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <text id="n8_pf31" name="text_card_num" xy="222,520" size="131,69" fontSize="52" color="#fef5e4" align="center" vAlign="middle" autoSize="none" strokeColor="#c66800" strokeSize="3" text="1">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n9_pf31" name="btn_exchange_card" src="x6ybe" fileName="com/btn_redeem_coin.xml" xy="114,667" pivot="0.5,0.5">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <graph id="n10_pf31" name="n10" xy="640,527" size="292,63" type="rect" lineSize="0" fillColor="#ffc578ba">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <component id="n11_pf31" name="btn_subamazon" src="pf31x" fileName="com_new/btn_setnum.xml" xy="615,514" size="80,88">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <component id="n12_pf31" name="btn_addamazon" src="pf31x" fileName="com_new/btn_setnum.xml" xy="894,514" size="80,88" controller="type,1">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <text id="n13_pf31" name="text_amazon_num" xy="744,523" size="131,69" fontSize="52" color="#fef5e4" align="center" vAlign="middle" autoSize="none" strokeColor="#c66800" strokeSize="3" text="1">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n14_pf31" name="btn_exchange_amazon" src="x6ybe" fileName="com/btn_redeem_coin.xml" xy="622,668" pivot="0.5,0.5">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <image id="n15_pf31" name="n15" src="pf31w" fileName="new_img/shop_yys_giftk.png" xy="630,261">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <graph id="n16_pf31" name="n16" xy="682,311" size="133,135" type="rect" lineSize="0" fillColor="#ff000306">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </graph>
+    <text id="n17_pf31" name="text_amazon_ch" xy="675,361" size="131,69" fontSize="52" color="#fffffe" align="center" vAlign="middle" autoSize="none" strokeColor="#1a5416" strokeSize="3" text="1">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </text>
+    <component id="n18_pf31" name="com_makeup0" src="pf31z" fileName="com_new/com_makeup.xml" xy="54,836">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <component id="n19_pf31" name="com_makeup1" src="pf31z" fileName="com_new/com_makeup.xml" xy="55,1137">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+    <component id="n20_pf31" name="com_makeup2" src="pf31z" fileName="com_new/com_makeup.xml" xy="55,1435">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/assets/JMall/com_new/btn_setnum.xml b/assets/JMall/com_new/btn_setnum.xml
new file mode 100644
index 0000000..ce36c18
--- /dev/null
+++ b/assets/JMall/com_new/btn_setnum.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="113,109" pivot="0.5,0.5" extention="Button">
+  <controller name="type" exported="true" pages="0,0,1,1" selected="0"/>
+  <displayList>
+    <image id="n5_pf31" name="n5" src="112epi2" fileName="img/money_jdt_02.png" pkg="pmf3wbji" xy="-2,2" size="114,107">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n3_pf31" name="n3" src="pf31k" fileName="new_img/common_jiajian_icon1.png" xy="31,46">
+      <gearDisplay controller="type" pages="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n4_pf31" name="n4" src="pf31l" fileName="new_img/common_jiajian_icon2.png" xy="31,28">
+      <gearDisplay controller="type" pages="1"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>
\ No newline at end of file
diff --git a/assets/JMall/com_new/com_makeup.xml b/assets/JMall/com_new/com_makeup.xml
new file mode 100644
index 0000000..3a95358
--- /dev/null
+++ b/assets/JMall/com_new/com_makeup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="973,289">
+  <displayList>
+    <image id="n1_pf31" name="n1" src="pf31s" fileName="new_img/shopx_03_bg.png" xy="0,0" size="972,283"/>
+    <image id="n2_pf31" name="n2" src="112epik" fileName="img/60.png" pkg="pmf3wbji" xy="30,36" size="176,113" aspect="true"/>
+    <component id="n5_pf31" name="progress_makeup" src="pf3110" fileName="com_new/progress_makeup.xml" xy="50,177">
+      <ProgressBar value="100" max="100"/>
+    </component>
+    <text id="n6_pf31" name="text_progress" xy="68,173" size="395,52" fontSize="38" color="#fef5e4" align="center" vAlign="middle" autoSize="none" strokeColor="#13300a" strokeSize="3" text="100/300"/>
+    <component id="n9_pf31" name="btn_makeup" src="x6ybc" fileName="com/btn_redeem.xml" xy="626,92" pivot="0.5,0.5" size="317,108">
+      <Button title="Exchange"/>
+    </component>
+    <richtext id="n10_pf31" name="text_makeup" xy="219,30" size="392,123" fontSize="92" color="#fcfb50" autoSize="shrink" strokeColor="#a9590f" strokeSize="3" text="$500"/>
+  </displayList>
+</component>
\ No newline at end of file
diff --git a/assets/JMall/com_new/progress_makeup.xml b/assets/JMall/com_new/progress_makeup.xml
new file mode 100644
index 0000000..78118f6
--- /dev/null
+++ b/assets/JMall/com_new/progress_makeup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="431,47" extention="ProgressBar">
+  <displayList>
+    <image id="n2_pf31" name="n2" src="pf31t" fileName="new_img/shop_game_timebg_01.png" xy="0,0" size="428,44"/>
+    <image id="n3_pf31" name="bar" src="pf31u" fileName="new_img/shop_game_timebg_02.png" xy="7,7" size="415,30" color="#ffda2f"/>
+  </displayList>
+  <ProgressBar/>
+</component>
\ No newline at end of file
diff --git a/assets/JMall/new_img/common_jiajian_icon1.png b/assets/JMall/new_img/common_jiajian_icon1.png
new file mode 100644
index 0000000..96259bf
Binary files /dev/null and b/assets/JMall/new_img/common_jiajian_icon1.png differ
diff --git a/assets/JMall/new_img/common_jiajian_icon2.png b/assets/JMall/new_img/common_jiajian_icon2.png
new file mode 100644
index 0000000..7dce633
Binary files /dev/null and b/assets/JMall/new_img/common_jiajian_icon2.png differ
diff --git a/assets/JMall/new_img/common_jiajian_icon3.png b/assets/JMall/new_img/common_jiajian_icon3.png
new file mode 100644
index 0000000..07e717f
Binary files /dev/null and b/assets/JMall/new_img/common_jiajian_icon3.png differ
diff --git a/assets/JMall/new_img/qx.png b/assets/JMall/new_img/qx.png
new file mode 100644
index 0000000..a754cef
Binary files /dev/null and b/assets/JMall/new_img/qx.png differ
diff --git a/assets/JMall/new_img/shop1.png b/assets/JMall/new_img/shop1.png
new file mode 100644
index 0000000..907fbbb
Binary files /dev/null and b/assets/JMall/new_img/shop1.png differ
diff --git a/assets/JMall/new_img/shop2.png b/assets/JMall/new_img/shop2.png
new file mode 100644
index 0000000..7c1ad63
Binary files /dev/null and b/assets/JMall/new_img/shop2.png differ
diff --git a/assets/JMall/new_img/shop_game_timebg_01.png b/assets/JMall/new_img/shop_game_timebg_01.png
new file mode 100644
index 0000000..1de129d
Binary files /dev/null and b/assets/JMall/new_img/shop_game_timebg_01.png differ
diff --git a/assets/JMall/new_img/shop_game_timebg_02.png b/assets/JMall/new_img/shop_game_timebg_02.png
new file mode 100644
index 0000000..e3721d1
Binary files /dev/null and b/assets/JMall/new_img/shop_game_timebg_02.png differ
diff --git a/assets/JMall/new_img/shop_yys_bingo.png b/assets/JMall/new_img/shop_yys_bingo.png
new file mode 100644
index 0000000..25f4c38
Binary files /dev/null and b/assets/JMall/new_img/shop_yys_bingo.png differ
diff --git a/assets/JMall/new_img/shop_yys_giftk.png b/assets/JMall/new_img/shop_yys_giftk.png
new file mode 100644
index 0000000..b271a12
Binary files /dev/null and b/assets/JMall/new_img/shop_yys_giftk.png differ
diff --git a/assets/JMall/new_img/shopx_01_bg.png b/assets/JMall/new_img/shopx_01_bg.png
new file mode 100644
index 0000000..3ad4578
Binary files /dev/null and b/assets/JMall/new_img/shopx_01_bg.png differ
diff --git a/assets/JMall/new_img/shopx_02_bg.png b/assets/JMall/new_img/shopx_02_bg.png
new file mode 100644
index 0000000..91e081d
Binary files /dev/null and b/assets/JMall/new_img/shopx_02_bg.png differ
diff --git a/assets/JMall/new_img/shopx_03_bg.png b/assets/JMall/new_img/shopx_03_bg.png
new file mode 100644
index 0000000..0dcb4a9
Binary files /dev/null and b/assets/JMall/new_img/shopx_03_bg.png differ
diff --git a/assets/JMall/package.xml b/assets/JMall/package.xml
index 041a628..4a67f3b 100644
--- a/assets/JMall/package.xml
+++ b/assets/JMall/package.xml
@@ -18,6 +18,23 @@
     <image id="og7vg" name="shop_bg_big.jpg" path="/img/"/>
     <image id="og7vh" name="1.jpg" path="/img/" scale="9grid" scale9grid="270,1370,540,102"/>
     <image id="og7vi" name="shop_tips_pd.png" path="/img/"/>
+    <component id="pf31j" name="com_exchange.xml" path="/" exported="true"/>
+    <image id="pf31k" name="common_jiajian_icon1.png" path="/new_img/" exported="true"/>
+    <image id="pf31l" name="common_jiajian_icon2.png" path="/new_img/" exported="true"/>
+    <image id="pf31m" name="common_jiajian_icon3.png" path="/new_img/" exported="true"/>
+    <image id="pf31n" name="qx.png" path="/new_img/" exported="true"/>
+    <image id="pf31o" name="shop1.png" path="/new_img/" exported="true"/>
+    <image id="pf31p" name="shop2.png" path="/new_img/" exported="true"/>
+    <image id="pf31q" name="shopx_01_bg.png" path="/new_img/" exported="true" scale="9grid" scale9grid="116,397,232,10"/>
+    <image id="pf31r" name="shopx_02_bg.png" path="/new_img/" exported="true" scale="9grid" scale9grid="116,397,232,8"/>
+    <image id="pf31s" name="shopx_03_bg.png" path="/new_img/" exported="true" scale="9grid" scale9grid="649,69,22,140"/>
+    <image id="pf31t" name="shop_game_timebg_01.png" path="/new_img/" exported="true" scale="9grid" scale9grid="20,11,3,22"/>
+    <image id="pf31u" name="shop_game_timebg_02.png" path="/new_img/" exported="true" scale="9grid" scale9grid="13,7,4,14"/>
+    <image id="pf31v" name="shop_yys_bingo.png" path="/new_img/" exported="true"/>
+    <image id="pf31w" name="shop_yys_giftk.png" path="/new_img/" exported="true"/>
+    <component id="pf31x" name="btn_setnum.xml" path="/com_new/"/>
+    <component id="pf31z" name="com_makeup.xml" path="/com_new/"/>
+    <component id="pf3110" name="progress_makeup.xml" path="/com_new/"/>
   </resources>
   <publish name="" genCode="true"/>
 </packageDescription>
\ No newline at end of file
diff --git a/assets/JRewardPop/com_extraItem.xml b/assets/JRewardPop/com_extraItem.xml
index c1d7231..70c7534 100644
--- a/assets/JRewardPop/com_extraItem.xml
+++ b/assets/JRewardPop/com_extraItem.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <controller name="cont_extra" pages="0,extraCoin,1,extraCard,2,extracash3,3,extracash5,4,extraball,5,extracash" selected="0"/>
-  <controller name="curr_type" pages="0,gold,1,cash" selected="0"/>
+  <controller name="curr_type" pages="0,gold,1,cash" selected="1"/>
   <displayList>
     <image id="n22_og7v" name="n22" src="kirm3" fileName="img/com_bg_small.png" pkg="pmf3wbji" xy="26,296" size="1036,1316">
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -24,7 +24,12 @@
       <gearDisplay2 controller="curr_type" pages="0" condition="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n20_sbmd" name="n20" src="112epi5" fileName="img/money_big.png" pkg="pmf3wbji" xy="393,509">
+    <image id="n20_sbmd" name="img_diamond" src="112epi5" fileName="img/money_big.png" pkg="pmf3wbji" xy="393,509">
+      <gearDisplay controller="cont_extra" pages="0"/>
+      <gearDisplay2 controller="curr_type" pages="1" condition="0"/>
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n27_n4ed" name="img_ch" src="ogc9pj2" fileName="img/money_icon.png" pkg="pmf3wbji" xy="407,502">
       <gearDisplay controller="cont_extra" pages="0"/>
       <gearDisplay2 controller="curr_type" pages="1" condition="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
diff --git a/assets/bkg_jilu/com/com_record_item.xml b/assets/bkg_jilu/com/com_record_item.xml
index f388706..58da112 100644
--- a/assets/bkg_jilu/com/com_record_item.xml
+++ b/assets/bkg_jilu/com/com_record_item.xml
@@ -2,12 +2,13 @@
 <component size="816,94">
   <displayList>
     <image id="n9_f7nm" name="n9" src="f6p01" fileName="img/record_bg_l.png" xy="0,0" size="811,87"/>
-    <image id="n0_f6p0" name="n0" src="f6p03" fileName="img/paypal.png" xy="34,12"/>
-    <text id="n3_f6p0" name="name" xy="108,18" size="161,49" fontSize="36" color="#fef28a" vAlign="middle" strokeColor="#000000" strokeSize="3" text="xxxxxxx"/>
-    <text id="n4_f6p0" name="lab_claim" xy="276,17" size="170,54" fontSize="40" color="#607e96" vAlign="middle" text="claimed">
+    <image id="n0_f6p0" name="n0" src="f6p03" fileName="img/paypal.png" xy="23,12" group="n13_pf31"/>
+    <text id="n3_f6p0" name="name" xy="85,18" size="161,49" group="n13_pf31" fontSize="36" color="#fef28a" vAlign="middle" strokeColor="#000000" strokeSize="3" text="xxxxxxx"/>
+    <text id="n4_f6p0" name="lab_claim" xy="253,16" size="170,54" group="n13_pf31" fontSize="40" color="#607e96" vAlign="middle" text="claimed">
       <relation target="n3_f6p0" sidePair="left-right"/>
     </text>
-    <text id="n6_f6p0" name="time" xy="596,22" size="197,44" fontSize="32" color="#6d889f" vAlign="middle" text="2024.12.23"/>
-    <richtext id="n12_gism" name="num" xy="427,14" size="154,64" fontSize="48" color="#3c822f" align="center" vAlign="middle" ubb="true" vars="true" autoSize="shrink" text="3004"/>
+    <richtext id="n12_gism" name="num" xy="430,16" size="127,54" group="n13_pf31" fontSize="40" color="#3c822f" align="center" vAlign="middle" ubb="true" vars="true" text="3004"/>
+    <text id="n6_f6p0" name="time" xy="564,25" size="155,35" group="n13_pf31" fontSize="25" color="#6d889f" vAlign="middle" text="2024.12.23"/>
+    <group id="n13_pf31" name="n13" xy="23,12" size="696,64" advanced="true" layout="hz" colGap="7" excludeInvisibles="true"/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/assets/tixian/com/com_rank.xml b/assets/tixian/com/com_rank.xml
index 42208bf..b156e93 100644
--- a/assets/tixian/com/com_rank.xml
+++ b/assets/tixian/com/com_rank.xml
@@ -6,9 +6,9 @@
   <displayList>
     <image id="n32_dpcj" name="n32" src="s9lhaf" fileName="img/tc_dikuang_bg.png" xy="0,0" size="791,755"/>
     <image id="n27_s8rg" name="n27" src="s9lhaz" fileName="img/583_bg.png" xy="285,123"/>
-    <text id="n1_mb7a" name="lab_title_des" xy="-8,27" size="810,74" fontSize="56" color="#638092" align="center" vAlign="middle" autoSize="none" text="Your current  ranking"/>
+    <text id="n1_mb7a" name="lab_title_des" xy="-8,27" size="805,74" fontSize="56" color="#638092" align="center" vAlign="middle" autoSize="shrink" text="Your current  ranking"/>
     <text id="n3_mb7a" name="text_ranks" xy="315,125" size="160,84" fontSize="64" color="#ffed89" align="center" vAlign="middle" autoSize="shrink" strokeColor="#000000" strokeSize="5" text="583"/>
-    <text id="n4_mb7a" name="lab_rank_tips" xy="-12,224" size="816,127" fontSize="42" color="#7b9fb9" align="center" vAlign="middle" leading="0" autoSize="shrink" text="No waiting! Top spot in queue gets&#xA;automatic rewards"/>
+    <text id="n4_mb7a" name="lab_rank_tips" xy="8,224" size="790,127" fontSize="42" color="#7b9fb9" align="center" vAlign="middle" leading="0" autoSize="shrink" text="No waiting! Top spot in queue gets&#xA;automatic rewards"/>
     <text id="n11_qgv2" name="text_rank1" xy="10,393" size="773,104" fontSize="37" color="#66849c" leading="-8" ubb="true" vars="true" autoSize="none" text="1.Watching an advertisement can speed up [color=#ffda3c]{rank=2-5}[/color] rankings">
       <gearText controller="content1" pages="0,1" values="1.Watching an advertisement can speed up [color=#ffda3c]{rank=2-5}[/color] rankings|1.You have sped up [color=#feee88]{rank=2}[/color] ranks by &#xA;watching ads"/>
     </text>
@@ -27,7 +27,7 @@
     <image id="n35_dpcj" name="n35" src="s9lhag" fileName="img/sign_duigou.png" xy="722,634">
       <gearDisplay controller="content3" pages="1"/>
     </image>
-    <text id="n38_tivm" name="n38" xy="15,451" size="857,49" fontSize="36" color="#96baca" autoSize="none" underline="true" bold="true" text="                                                                          "/>
-    <text id="n39_tivm" name="n39" xy="15,550" size="857,49" fontSize="36" color="#96baca" autoSize="none" underline="true" bold="true" text="                                                                          "/>
+    <text id="n38_tivm" name="n38" xy="15,451" size="771,49" fontSize="36" color="#96baca" autoSize="none" underline="true" bold="true" text="                                                                          "/>
+    <text id="n39_tivm" name="n39" xy="15,550" size="767,49" fontSize="36" color="#96baca" autoSize="none" underline="true" bold="true" text="                                                                          "/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/assets/tixian/com/com_ticket_item.xml b/assets/tixian/com/com_ticket_item.xml
index 33738e9..7ace09c 100644
--- a/assets/tixian/com/com_ticket_item.xml
+++ b/assets/tixian/com/com_ticket_item.xml
@@ -5,7 +5,7 @@
     <image id="n1_tivm" name="n1" src="uznedw" fileName="img/wz9_ticket.png" xy="87,25" size="581,202"/>
     <text id="n3_tivm" name="n3" xy="133,32" size="226,73" fontSize="30" leading="-6" autoSize="none" text="DISCOUNT&#xA;COUPON"/>
     <image id="n4_tivm" name="n4" src="uzneea" fileName="img/wz9_ticket_line.png" xy="136,99" size="478,3"/>
-    <text id="n5_tivm" name="lab_num" xy="135,103" size="226,116" fontSize="90" leading="-6" autoSize="none" text="$8"/>
+    <text id="n5_tivm" name="lab_num" xy="135,103" size="226,116" fontSize="90" leading="-6" autoSize="shrink" text="$8"/>
     <component id="n9_tivm" name="btn_claim" src="tivmef" fileName="com/btn_kicket.xml" xy="392,116"/>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/assets/tixian/com/pb_bar.xml b/assets/tixian/com/pb_bar.xml
index 789bfff..6099bf0 100644
--- a/assets/tixian/com/pb_bar.xml
+++ b/assets/tixian/com/pb_bar.xml
@@ -5,7 +5,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n5_dpcj" name="bar" src="s9lhaq" fileName="img/jindu2.png" xy="2,2" size="771,42"/>
-    <richtext id="n7_gz3u" name="title" xy="137,-18" size="666,117" scale="0.7,0.7" fontSize="50" color="#ffffff" align="center" vAlign="middle" ubb="true" vars="true" autoSize="none" strokeColor="#000000" strokeSize="3" text="&lt;img src=&apos;ui://pmf3wbji112epi7&apos;/&gt; 50">
+    <richtext id="n7_gz3u" name="title" xy="57,-18" size="908,117" scale="0.7,0.7" fontSize="50" color="#ffffff" align="center" vAlign="middle" ubb="true" vars="true" autoSize="none" strokeColor="#000000" strokeSize="3" text="&lt;img src=&apos;ui://pmf3wbji112epi7&apos;/&gt; 50">
       <relation target="" sidePair="center-center,middle-middle"/>
     </richtext>
   </displayList>
diff --git a/assets/tixian/com_confirm.xml b/assets/tixian/com_confirm.xml
index 37954a3..bfa179f 100644
--- a/assets/tixian/com_confirm.xml
+++ b/assets/tixian/com_confirm.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="cont_state" pages="3,enter,4,confirm,5,task,1,query,6,step,7,level,8,kicket,9,code" selected="5"/>
-  <controller name="cont_confirm" pages="0,ready,1,none" selected="1"/>
-  <controller name="show_pay" pages="0,false,1,true" selected="1"/>
-  <controller name="level_state" pages="0,0,1,1" selected="1"/>
+  <controller name="cont_state" pages="3,enter,4,confirm,5,task,1,query,6,step,7,level,8,kicket,9,code" selected="7"/>
+  <controller name="cont_confirm" pages="0,ready,1,none" selected="0"/>
+  <controller name="show_pay" pages="0,false,1,true" selected="0"/>
+  <controller name="level_state" pages="0,0,1,1" selected="0"/>
   <displayList>
     <text id="n66_c2wf" name="n22" xy="120,1171" size="839,78" visible="false" fontSize="40" color="#678398" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="Please complete all conditions to cash out">
       <gearDisplay controller="cont_confirm" pages="1"/>
@@ -17,7 +17,7 @@
       <gearDisplay controller="cont_state" pages="4"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n211_s8rg" name="n211" src="s9lhaf" fileName="img/tc_dikuang_bg.png" xy="147,521" size="791,538">
+    <image id="n211_s8rg" name="n211" src="s9lhaf" fileName="img/tc_dikuang_bg.png" xy="148,644" size="791,538">
       <gearDisplay controller="cont_state" pages="7"/>
       <gearXY controller="level_state" pages="0,1" values="148,644|147,521"/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -26,7 +26,7 @@
       <gearDisplay controller="cont_state" pages="6"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <image id="n234_dpcj" name="n234" src="s9lhah" fileName="img/shop_watch_bg.png" xy="0,1506" size="1080,390">
+    <image id="n234_dpcj" name="n234" src="s9lhah" fileName="img/shop_watch_bg.png" xy="0,1506" size="1080,390" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
     <component id="n30_deiw" name="com_info" src="deiw1k" fileName="com/com_enter.xml" xy="158,691">
@@ -41,7 +41,7 @@
       <gearDisplay controller="cont_state" pages="3"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <text id="n11_jr4y" name="text_payhint" xy="1455,390" size="931,173" fontSize="46" color="#a68268" align="center" vAlign="middle" leading="7" ubb="true" vars="true" autoSize="shrink" text="Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page.">
+    <text id="n11_jr4y" name="text_payhint" xy="1452,390" size="931,173" fontSize="46" color="#a68268" align="center" vAlign="middle" leading="7" ubb="true" vars="true" autoSize="shrink" text="Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page.">
       <gearDisplay controller="cont_state" pages="1"/>
       <gearText controller="cont_state" pages="1" values="Processing the payment to&#xA;[color=#c49f82] {account=1234567@qq.com}[/color]" default="Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page."/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -79,9 +79,9 @@
       <gearText controller="cont_state" pages="1" values="Waiting in line to reach the first place for withdrawal." default="Please note that payment will take 3-5 days to deliver. You can check your payment status at withdrawals record page."/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n99_agfu" name="text_title" xy="284,270" size="511,102" fontSize="65" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="5" text="Enter  Account">
+    <text id="n99_agfu" name="text_title" xy="284,270" size="511,102" fontSize="65" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="5" text="Code">
       <gearDisplay controller="cont_state" pages="3,4,5,1,6,8,9"/>
-      <gearText controller="cont_state" pages="3,4,5,1,6,8,9" values="Account|Condition|Steps|Completed|Account|Redeem|Code" default="Enter  Account"/>
+      <gearText controller="cont_state" pages="3,4,5,1,6,8,9" values="Account|Condition|Exchange|Completed|Account|Redeem|Code" default="Enter  Account"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n105_agfu" name="pb_condi1" src="agfu41" fileName="com/pb_bar.xml" xy="170,1065" size="746,42">
@@ -118,40 +118,40 @@
       <gearDisplay controller="cont_state" pages="7"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n140_fzz8" name="text_chdate" xy="0,1518" size="1080,72" fontSize="54" color="#fdfcf8" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="4" text="Information({0})">
+    <text id="n140_fzz8" name="text_chdate" xy="0,1518" size="1080,72" visible="false" fontSize="54" color="#fdfcf8" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="4" text="Information({0})">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <image id="n245_s9lh" name="n245" src="s9lhat" fileName="img/in_bg1.png" xy="63,1644" size="268,116">
+    <image id="n245_s9lh" name="n245" src="s9lhat" fileName="img/in_bg1.png" xy="63,1644" size="268,116" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n246_s9lh" name="n246" src="s9lhat" fileName="img/in_bg1.png" xy="406,1644" size="268,116">
+    <image id="n246_s9lh" name="n246" src="s9lhat" fileName="img/in_bg1.png" xy="406,1644" size="268,116" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n247_s9lh" name="n247" src="s9lhat" fileName="img/in_bg1.png" xy="750,1644" size="268,116">
+    <image id="n247_s9lh" name="n247" src="s9lhat" fileName="img/in_bg1.png" xy="750,1644" size="268,116" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n297_tivm" name="n297" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="63,1618" size="287,244">
+    <image id="n297_tivm" name="n297" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="63,1618" size="287,244" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n298_tivm" name="n298" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="397,1618" size="287,244">
+    <image id="n298_tivm" name="n298" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="397,1618" size="287,244" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <image id="n299_tivm" name="n299" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="732,1618" size="287,244">
+    <image id="n299_tivm" name="n299" src="uznecr" fileName="img/wz_bottom_bg02.png" xy="732,1618" size="287,244" visible="false">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </image>
-    <text id="n144_fzz8" name="n144" xy="68,1757" size="272,105" fontSize="36" color="#627f95" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="People who passed today">
+    <text id="n144_fzz8" name="n144" xy="68,1757" size="272,105" visible="false" fontSize="36" color="#627f95" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="People who passed today">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <text id="n145_fzz8" name="n145" xy="394,1757" size="294,105" fontSize="36" color="#627f96" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="Number of challenger per capita">
+    <text id="n145_fzz8" name="n145" xy="394,1757" size="294,105" visible="false" fontSize="36" color="#627f96" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="Number of challenger per capita">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <text id="n146_fzz8" name="text_chdate3" xy="729,1759" size="294,105" fontSize="36" color="#627f96" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="Challenger withdrawal per capita">
+    <text id="n146_fzz8" name="text_chdate3" xy="729,1759" size="294,105" visible="false" fontSize="36" color="#627f96" align="center" vAlign="middle" leading="0" vars="true" autoSize="shrink" text="Challenger withdrawal per capita">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <text id="n147_fzz8" name="text_number0" xy="78,1639" size="256,105" fontSize="74" color="#2e71a6" align="center" vAlign="middle" leading="-14" vars="true" autoSize="shrink" text="1182">
+    <text id="n147_fzz8" name="text_number0" xy="78,1639" size="256,105" visible="false" fontSize="74" color="#2e71a6" align="center" vAlign="middle" leading="-14" vars="true" autoSize="shrink" text="1182">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <text id="n148_fzz8" name="text_number1" xy="412,1639" size="256,105" fontSize="74" color="#3d8230" align="center" vAlign="middle" leading="-14" vars="true" autoSize="shrink" text="39.55">
+    <text id="n148_fzz8" name="text_number1" xy="412,1639" size="256,105" visible="false" fontSize="74" color="#3d8230" align="center" vAlign="middle" leading="-14" vars="true" autoSize="shrink" text="39.55">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
     <component id="n196_of2j" name="btn_watch" src="heqb2k" fileName="com/btn_pay.xml" xy="304,1230" pivot="0.47,0.5">
@@ -168,7 +168,7 @@
       <gearDisplay controller="cont_state" pages="4"/>
       <gearText controller="cont_confirm" pages="0,1" values="Redeem|Complete"/>
       <relation target="" sidePair="center-center,middle-middle"/>
-      <Button title="Complete"/>
+      <Button title="Redeem"/>
     </component>
     <component id="n236_dpcj" name="btn_chout" src="cphly" fileName="com/btn_get.xml" xy="342,1232">
       <gearDisplay controller="cont_state" pages="5"/>
@@ -192,7 +192,7 @@
       <gearDisplay2 controller="level_state" pages="1" condition="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <text id="n134_fzz8" name="text_nowch" xy="209,890" size="665,124" fontSize="70" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="5" text="$226.20">
+    <text id="n134_fzz8" name="text_nowch" xy="214,1018" size="665,124" fontSize="70" color="#fdeb8c" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="5" text="$226.20">
       <gearDisplay controller="cont_state" pages="7"/>
       <gearXY controller="level_state" pages="0,1" values="214,1018|209,890"/>
       <gearColor controller="level_state" pages="0,1" values="#fdeb8c,#000000|#ffffff,#000000"/>
@@ -230,7 +230,7 @@
     <image id="n309_tivm" name="n309" src="uzned4" fileName="img/wz9_money_bg.png" xy="219,416" group="n316_tivm"/>
     <image id="n307_tivm" name="n307" src="uznedn" fileName="img/wz9_money.png" xy="149,394" group="n316_tivm"/>
     <image id="n308_tivm" name="n308" src="uznecv" fileName="img/wz9_money_small_bg.png" xy="622,418" group="n316_tivm"/>
-    <text id="n310_tivm" name="lab_mn" xy="247,422" size="197,66" group="n316_tivm" fontSize="45" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="300.00"/>
+    <text id="n310_tivm" name="lab_mn" xy="247,422" size="197,66" group="n316_tivm" fontSize="45" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#000000" strokeSize="3" text="300.00"/>
     <image id="n311_tivm" name="n311" src="uznedj" fileName="img/wz9_money_small.png" xy="660,426" group="n316_tivm"/>
     <text id="n312_tivm" name="n312" xy="690,422" size="90,66" group="n316_tivm" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="1"/>
     <text id="n313_tivm" name="n313" xy="807,422" size="90,66" group="n316_tivm" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="1"/>
@@ -259,7 +259,7 @@
     <image id="n327_tivm" name="n327" src="uznedw" fileName="img/wz9_ticket.png" xy="251,599" size="581,202" group="n340_tivm"/>
     <text id="n328_tivm" name="n328" xy="297,606" size="226,73" group="n340_tivm" fontSize="30" leading="-6" autoSize="none" text="DISCOUNT&#xA;COUPON"/>
     <image id="n329_tivm" name="n329" src="uzneea" fileName="img/wz9_ticket_line.png" xy="300,673" size="478,3" group="n340_tivm"/>
-    <text id="n330_tivm" name="lab_ticket" xy="299,677" size="226,116" group="n340_tivm" fontSize="90" leading="-6" autoSize="none" text="$8"/>
+    <text id="n330_tivm" name="lab_ticket" xy="299,677" size="226,116" group="n340_tivm" fontSize="90" leading="-6" autoSize="shrink" text="$8"/>
     <text id="n331_tivm" name="n331" xy="395,808" size="283,73" group="n340_tivm" fontSize="50" color="#90979d" align="center" vAlign="middle" leading="-6" autoSize="none" text="Claim Code"/>
     <text id="n332_tivm" name="lab_code" xy="99,865" size="882,73" group="n340_tivm" fontSize="50" color="#2c70a7" align="center" vAlign="middle" leading="-6" autoSize="none" text="Claim Code"/>
     <component id="n334_tivm" name="btn_copy" src="tivmeg" fileName="com/btn_code.xml" xy="347,948" group="n340_tivm"/>
@@ -309,7 +309,7 @@
       <gearDisplay2 controller="cont_confirm" pages="1" condition="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <richtext id="n356_ogc9" name="text_number2" xy="749,1638" size="367,150" scale="0.7,0.7" fontSize="80" color="#cd5153" vAlign="middle" ubb="true" autoSize="shrink" text="&lt;img src=&apos;ui://pmf3wbji112epi7&apos;/&gt;18818.36">
+    <richtext id="n356_ogc9" name="text_number2" xy="749,1638" size="367,150" scale="0.7,0.7" visible="false" fontSize="80" color="#cd5153" vAlign="middle" ubb="true" autoSize="shrink" text="&lt;img src=&apos;ui://pmf3wbji112epi7&apos;/&gt;18818.36">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </richtext>
     <component id="n357_ogc9" name="btn_watchad" src="b7ax1h" fileName="btn/btn_watchAd.xml" pkg="o9974uc5" xy="286,1236">
diff --git a/assets/tixian/com_saveingpot.xml b/assets/tixian/com_saveingpot.xml
index f5bef80..b42d963 100644
--- a/assets/tixian/com_saveingpot.xml
+++ b/assets/tixian/com_saveingpot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
-  <controller name="type" pages="0,0,1,1,2,2,3,3,4,4,5,5,6,6,10,7,11,8" selected="0"/>
+  <controller name="type" pages="0,0,1,1,2,2,3,3,4,4,5,5,6,6,10,7,11,8" selected="7"/>
   <controller name="cont_confirm" pages="0,0,1,1" selected="0"/>
   <controller name="isRDExchangeMode" pages="0,0,1,1" selected="0"/>
   <displayList>
@@ -57,7 +57,7 @@
       <gearDisplay controller="type" pages="2"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
-    <component id="n34_lsax" name="btn_confirm" src="lsax1y" fileName="com_saveing/btn_confirm.xml" xy="280,1274">
+    <component id="n34_lsax" name="btn_confirm" src="lsax1y" fileName="com_saveing/btn_confirm.xml" xy="253,1450">
       <gearDisplay controller="type" pages="1,2,3,4,6"/>
       <gearXY controller="type" pages="0,1,2,3,4,5,6" values="280,1274|302,1289|300,1285|304,1287|301,1286|280,1338|339,1243" default="253,1450"/>
       <gearText controller="cont_confirm" pages="0,1" values="Comfirm|Complete"/>
@@ -65,7 +65,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
       <Button title="Comfirm"/>
     </component>
-    <text id="n36_lsax" name="text_title" xy="118,325" size="842,102" fontSize="60" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="4" text="Condition">
+    <text id="n36_lsax" name="text_title" xy="118,325" size="842,102" fontSize="60" color="#ffffff" align="center" vAlign="middle" vars="true" autoSize="shrink" strokeColor="#000000" strokeSize="4" text="Redeem">
       <gearDisplay controller="type" pages="1,2,3,4,5,6,10,11"/>
       <gearText controller="type" pages="1,2,5,6,10,11" values="Account|Account|Compeleted|Compeleted|Redeem|Code" default="Condition"/>
       <relation target="" sidePair="center-center,middle-middle"/>
@@ -174,7 +174,7 @@
     </image>
     <image id="n144_tivm" name="n144" src="uzned4" fileName="img/wz9_money_bg.png" xy="221,471" group="n153_tivm"/>
     <image id="n146_tivm" name="n146" src="uznecv" fileName="img/wz9_money_small_bg.png" xy="624,473" group="n153_tivm"/>
-    <text id="n147_tivm" name="lab_mn" xy="249,477" size="197,66" group="n153_tivm" fontSize="45" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="300.00"/>
+    <text id="n147_tivm" name="lab_mn" xy="284,477" size="186,66" group="n153_tivm" fontSize="45" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" strokeColor="#000000" strokeSize="3" text="300.00"/>
     <text id="n149_tivm" name="n149" xy="692,477" size="90,66" group="n153_tivm" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="1"/>
     <text id="n150_tivm" name="n150" xy="809,477" size="90,66" group="n153_tivm" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" strokeColor="#000000" strokeSize="3" text="1"/>
     <image id="n181_tivm" name="n181" src="t9w7c4" fileName="img_saving/dh2_card.png" xy="161,475" group="n153_tivm" scale="0.6,0.6"/>
@@ -202,7 +202,7 @@
     <image id="n162_tivm" name="n162" src="uznedw" fileName="img/wz9_ticket.png" xy="251,653" size="581,202" group="n175_tivm"/>
     <text id="n163_tivm" name="n163" xy="297,660" size="226,73" group="n175_tivm" fontSize="30" leading="-6" autoSize="none" text="DISCOUNT&#xA;COUPON"/>
     <image id="n164_tivm" name="n164" src="uzneea" fileName="img/wz9_ticket_line.png" xy="300,727" size="478,3" group="n175_tivm"/>
-    <text id="n165_tivm" name="lab_ticket" xy="299,731" size="226,116" group="n175_tivm" fontSize="90" leading="-6" autoSize="none" text="$8"/>
+    <text id="n165_tivm" name="lab_ticket" xy="299,731" size="226,116" group="n175_tivm" fontSize="90" leading="-6" autoSize="shrink" text="$8"/>
     <text id="n166_tivm" name="n166" xy="395,862" size="283,73" group="n175_tivm" fontSize="50" color="#90979d" align="center" vAlign="middle" leading="-6" autoSize="none" text="Claim Code"/>
     <text id="n167_tivm" name="lab_code" xy="99,919" size="882,73" group="n175_tivm" fontSize="50" color="#2c70a7" align="center" vAlign="middle" leading="-6" autoSize="none" text="Claim Code"/>
     <component id="n168_tivm" name="btn_copy" src="tivmeg" fileName="com/btn_code.xml" xy="347,1002" group="n175_tivm"/>
@@ -239,7 +239,7 @@
       <gearDisplay controller="type" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </richtext>
-    <image id="n193_ogc9" name="text_ch" src="112epi7" fileName="img/money_small.png" pkg="pmf3wbji" xy="289,876" size="127,104" aspect="true">
+    <image id="n194_pf31" name="n194" src="t9w7c3" fileName="img/dh3_card.png" pkg="o9974uc5" xy="311,862" size="106,130" aspect="true">
       <gearDisplay controller="type" pages="0"/>
       <gearDisplay2 controller="isRDExchangeMode" pages="1" condition="0"/>
       <relation target="n192_ogc9" sidePair="middle-middle,right-left"/>