UI更新

fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info

@@ -0,0 +1,10 @@
+{
+  "objectStatus": {
+    "n94_cvc8": {
+      "hidden": true
+    },
+    "n95_cvc8": {
+      "hidden": true
+    }
+  }
+}

fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info

@@ -1,13 +1,13 @@
 {
   "objectStatus": {
+    "n69_vyn3": {
+      "hidden": true
+    },
     "n71_vyn3": {
       "hidden": true
     },
     "n70_vyn3": {
       "hidden": true
-    },
-    "n72_hp03": {
-      "hidden": true
     }
   },
   "adaptiveTest": true,

fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info

@@ -18,9 +18,6 @@
     "n130_naup": {
       "hidden": true
     },
-    "n140_csp4": {
-      "hidden": true
-    },
     "n50_lwcl": {
       "hidden": true
     },
@@ -30,9 +27,15 @@
     "n100_lumr": {
       "hidden": true
     },
+    "n139_csp4": {
+      "hidden": true
+    },
     "n49_lwcl": {
       "hidden": true
     },
+    "n110_ker3": {
+      "hidden": true
+    },
     "n119_g8kk": {
       "hidden": true
     },

fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info

@@ -6,15 +6,15 @@
     "n233_o6b1": {
       "hidden": true
     },
+    "n88_kxzv": {
+      "hidden": true
+    },
     "n78_i7lq": {
       "hidden": true
     },
     "n153_cioe": {
       "hidden": true
     },
-    "n176_mn85": {
-      "collapsed": true
-    },
     "n175_mn85": {
       "collapsed": true
     },

fk101/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info

@@ -1,7 +1 @@
-{
+{}
-  "objectStatus": {
-    "n120_l7wn": {
-      "collapsed": true
-    }
-  }
-}

fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info

@@ -1,7 +1 @@
-{
+{}
-  "objectStatus": {
-    "n90_omkm": {
-      "hidden": true
-    }
-  }
-}

fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info

@@ -1,10 +1,26 @@
 {
   "objectStatus": {
+    "n69_jd7v": {
+      "hidden": true
+    },
+    "n64_jd7v": {
+      "collapsed": true
+    },
     "n86_t1hq": {
       "hidden": true
     },
-    "n69_jd7v": {
+    "n35_rpaz": {
+      "hidden": true,
+      "collapsed": true
+    },
+    "n33_rpaz": {
       "hidden": true
+    },
+    "n89_t1hq": {
+      "collapsed": true
+    },
+    "n88_t1hq": {
+      "collapsed": true
     }
   },
   "adaptiveTest": true,

fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info

@@ -1,15 +1,12 @@
 {
   "objectStatus": {
-    "n58_ocx0": {
+    "n57_ocx0": {
       "hidden": true
     },
-    "n26_kwi0": {
-      "collapsed": true
-    },
     "n44_rpaz": {
       "collapsed": true
     },
-    "n57_ocx0": {
+    "n58_ocx0": {
       "hidden": true
     }
   }

fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info

@@ -1,6 +1,9 @@
 {
   "objectStatus": {
-    "n79_nk4v": {
+    "n130_yre9": {
+      "hidden": true
+    },
+    "n13_gls1": {
       "hidden": true
     },
     "n78_nk4v": {
@@ -9,10 +12,10 @@
     "n73_cioe": {
       "hidden": true
     },
-    "n13_gls1": {
+    "n79_nk4v": {
       "hidden": true
     },
-    "n130_yre9": {
+    "n98_yetw": {
       "hidden": true
     }
   }

fk101/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info

@@ -0,0 +1 @@
+{}

fk101/wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 297,
+  "libview.firstColumnWidth": 338,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -9,104 +9,52 @@
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://m7iejg4610snh5j",
-    "ui://visk5g30vbh57c",
-    "ui://0khx14are0py2",
-    "ui://0khx14arpcy012",
-    "ui://m7iejg46pfvz7i98",
-    "ui://m7iejg46pfvz7i99",
-    "ui://m7iejg46csp47i3z",
-    "ui://m7iejg46oviii0w",
-    "ui://2zlli80mr6cyce9",
-    "ui://2zlli80m9q7vciq",
-    "ui://2zlli80m9q7vcir",
-    "ui://m7iejg46r0qx7i6u",
-    "ui://m7iejg46ruljhmp",
-    "ui://m7iejg46r96th8e",
-    "ui://m7iejg4610xl7i1w",
-    "ui://m7iejg46l7wn7i80",
-    "ui://m7iejg46l7wn7i81",
-    "ui://m7iejg46l7wn7i82",
-    "ui://m7iejg46lf2qhju",
-    "ui://m7iejg46hsbhhjn",
-    "ui://m7iejg46cioehos",
-    "ui://m7iejg46ozazhxs",
-    "ui://m7iejg46gls1hif",
-    "ui://m7iejg46nwgkhx0",
-    "ui://m7iejg46nwgkhx2",
-    "ui://m7iejg46c0or7i7d",
-    "ui://m7iejg46nk4vhwh",
-    "ui://m7iejg46tqi8hwa",
-    "ui://boq0ohepotx0h",
-    "ui://d1qrzqprc4r116",
-    "ui://qubt49z8c4r116",
-    "ui://4wmd3o8gotx0h",
-    "ui://z3z0ysurygxgd",
-    "ui://442j0uepygxgd",
-    "ui://2d9xdj6zab5pcji",
-    "ui://2d9xdj6znaupko",
-    "ui://2d9xdj6znaupkn",
-    "ui://4skil1l6ms5spy",
-    "ui://4skil1l6ms5spw",
-    "ui://v0j9abjygq7ms6",
-    "ui://v6yvqp7wf55qwa",
-    "ui://m7iejg46l7wn7i83",
-    "ui://ypulwxjhl9mn1l",
-    "ui://egnzysm7ffp38j",
-    "ui://m7iejg46jvvohyf",
-    "ui://v2hilfzbgq7me6",
-    "ui://1hl55dqmq9sx0",
-    "ui://m7iejg46jvvohyd",
     "ui://m7iejg46z3847i6m",
-    "ui://m7iejg46z3847i6q",
+    "ui://4skil1l6bw4ghm",
-    "ui://m7iejg46mtk57i94",
+    "ui://4skil1l6bw4ghl",
-    "ui://awernf6xbazq7n",
+    "ui://xul2z8cts9wx7",
-    "ui://2d9xdj6zfn7fao",
+    "ui://bx1t0boos9wx7",
-    "ui://2d9xdj6zl7wn7cnf",
+    "ui://c7j2rnvqtpf02f",
-    "ui://2d9xdj6zvoxxit",
+    "ui://b50sd5s6s9wx7",
-    "ui://2d9xdj6zker3jg",
+    "ui://y8prev1ms9wxa",
-    "ui://2d9xdj6zoviicm0",
+    "ui://y8prev1ms9wx9",
-    "ui://2d9xdj6zker3je",
+    "ui://y8prev1ms9wx8",
-    "ui://2zlli80mw9te0",
+    "ui://y8prev1ms9wx7",
+    "ui://v0j9abjygq7med",
+    "ui://v0j9abjygq7mdj",
+    "ui://4skil1l6piv91ny",
+    "ui://4skil1l6piv91mh",
+    "ui://4skil1l6e54qhq",
     "ui://v0j9abjygq7ms8",
-    "ui://c7j2rnvqtpf0x",
-    "ui://c7j2rnvqtpf0n",
-    "ui://c7j2rnvqtpf0u",
-    "ui://c7j2rnvqtpf04m",
-    "ui://v0j9abjygq7ms5",
-    "ui://v0j9abjygq7ms4",
     "ui://v0j9abjygq7ms3",
-    "ui://v0j9abjygq7mcc",
+    "ui://v0j9abjygq7ms9",
-    "ui://visk5g30gq7mg",
+    "ui://v6yvqp7wf55qwd",
-    "ui://visk5g30gq7m22",
+    "ui://v0j9abjygq7ms4",
-    "ui://visk5g30gq7m23",
+    "ui://v0j9abjygq7ms5",
-    "ui://visk5g30gq7m24",
+    "ui://4skil1l6bw4ggt",
-    "ui://visk5g30gq7m8",
+    "ui://m7iejg46cioeho9",
-    "ui://9n9stu2eprgzf0",
+    "ui://m7iejg46kwi0hk1",
-    "ui://9n9stu2eprgzep",
+    "ui://2d9xdj6zfn7fao"
-    "ui://m7iejg46kwi0hlo",
-    "ui://27vd145bkio210",
-    "ui://m7iejg46kwi0hkb",
-    "ui://v0j9abjygq7ms2",
-    "ui://v0j9abjygq7m8f",
-    "ui://m7iejg46jr1l7i3c",
-    "ui://4skil1l6r6qo1kc",
-    "ui://v0j9abjygq7m6c",
-    "ui://m7iejg46mpllhv2",
-    "ui://m7iejg46kwi0hkl",
-    "ui://2d9xdj6zlumrgj",
-    "ui://1hl55dqmc4r115"
   ],
   "packageGroup.mine": [],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://2zlli80mr6cyce9",
+  "doc.activeDoc": "ui://4skil1l6piv91mh",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "2zlli80m",
+    "xul2z8ct",
     "/",
-    "2zlli80m",
+    "xul2z8ct",
-    "/commpoent/"
+    "/component/",
+    "xul2z8ct",
+    "/component/clearing/",
+    "4skil1l6",
+    "/",
+    "4skil1l6",
+    "/component/",
+    "4skil1l6",
+    "/component/clearing/"
   ],
   "auxline1": true,
   "snapToGrid": true,

fk101/wb_new_ui/assets/Common/MessageBox.xml

@@ -4,7 +4,7 @@
     <image id="n19_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="737,493">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
+    <text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#765151" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
     <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="90,391" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bl2997icd"/>
     </component>
@@ -12,7 +12,7 @@
       <Button title=" " icon="ui://27vd145bcvc87i5s"/>
     </component>
     <group id="n8_m0vo" name="n8" xy="90,391" size="559,82"/>
-    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="687,-26">
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="645,2">
       <Button icon="ui://27vd145bm0eibv"/>
     </component>
     <component id="n17_vtgq" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="286,324" visible="false">

fk101/wb_new_ui/assets/Common/MessageBox1.xml

@@ -4,11 +4,11 @@
     <image id="n17_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" xy="0,0" size="737,493">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n7_m0vo" name="tex_message" xy="17,81" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#495f55" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
+    <text id="n7_m0vo" name="tex_message" xy="19,92" size="705,289" font="ui://27vd145bqz637ij2" fontSize="34" color="#765151" align="center" vAlign="middle" ubb="true" autoSize="none" text="空间和空间"/>
-    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="255,391">
+    <component id="n4_m0vo" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="237,391">
       <Button title=" " icon="ui://27vd145bcvc87i5i"/>
     </component>
-    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="687,-26">
+    <component id="n11_lk2r" name="btn_close1" src="vg2c4" fileName="buttons/Btn_close.xml" xy="645,0">
       <Button icon="ui://27vd145bm0eibv"/>
     </component>
     <component id="n15_f6mj" name="btnCheck" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="-489,272" visible="false">

fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <controller name="style" exported="true" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_j046" name="icon" xy="2,3" size="77,79" url="ui://27vd145bm0eibv" autoSize="true"/>
+    <loader id="n3_j046" name="icon" xy="2,3" size="79,79" url="ui://27vd145bm0eibv" fill="scaleFree" autoSize="true"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,53" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="l2997icg" fileName="font/images/ann_s_1.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n4_j5s5" name="n4" src="a6k77ii2" fileName="font/images/cylb_txt_wdcy_01.png" xy="38,11">
+    <image id="n4_j5s5" name="n4" src="a6k77ii2" fileName="font/images/cylb_txt_wdcy_01.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_j5s5" name="n5" src="a6k77ii3" fileName="font/images/cylb_txt_wdcy_02.png" xy="38,11">
+    <image id="n5_j5s5" name="n5" src="a6k77ii3" fileName="font/images/cylb_txt_wdcy_02.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,53" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="l2997icg" fileName="font/images/ann_s_1.png" xy="0,0">
@@ -10,12 +10,12 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n4_iku3" name="n4" src="iku37ii8" fileName="font/images/tj_txt_jt_01.png" xy="68,11">
+    <image id="n4_iku3" name="n4" src="iku37ii8" fileName="font/images/tj_txt_jt_01.png" xy="43,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_iku3" name="n5" src="iku37ii9" fileName="font/images/tj_txt_jt_02.png" xy="68,11">
+    <image id="n5_iku3" name="n5" src="iku37ii9" fileName="font/images/tj_txt_jt_02.png" xy="43,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>
-  <Button mode="Radio"/>
+  <Button mode="Radio" downEffect="dark" downEffectValue=".9"/>
 </component>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,53" extention="Button">
+<component size="145,62" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="csp47i4s" fileName="font/images/ann_s_1.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n4_hp03" name="n4" src="iku37iic" fileName="font/images/tj_txt_zjjl_01.png" xy="38,11">
+    <image id="n4_hp03" name="n4" src="iku37iic" fileName="font/images/tj_txt_zjjl_01.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_hp03" name="n5" src="iku37iid" fileName="font/images/tj_txt_zjjl_02.png" xy="38,11">
+    <image id="n5_hp03" name="n5" src="iku37iid" fileName="font/images/tj_txt_zjjl_02.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="196,53" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="csp47i4s" fileName="font/images/ann_s_1.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n4_hp03" name="n4" src="hp037iii" fileName="font/images/zjph_txt_jfspm_01.png" xy="15,11">
+    <image id="n4_hp03" name="n4" src="hp037iii" fileName="font/images/zjph_txt_jfspm_01.png" xy="5,16" size="137,29">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_hp03" name="n5" src="hp037iij" fileName="font/images/zjph_txt_jfspm_02.png" xy="15,11">
+    <image id="n5_hp03" name="n5" src="hp037iij" fileName="font/images/zjph_txt_jfspm_02.png" xy="4,16" size="137,29">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,56" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="csp47i4t" fileName="font/images/ann_s_3.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n5_j5s5" name="n5" src="a6k77ii0" fileName="font/images/cylb_txt_tjcy_1.png" xy="29,11">
+    <image id="n5_j5s5" name="n5" src="a6k77ii0" fileName="font/images/cylb_txt_tjcy_1.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n6_j5s5" name="n6" src="a6k77ii1" fileName="font/images/cylb_txt_tjcy_2.png" xy="29,11">
+    <image id="n6_j5s5" name="n6" src="a6k77ii1" fileName="font/images/cylb_txt_tjcy_2.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r1.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="195,53" extention="Button">
+<component size="145,62" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="l2997icj" fileName="font/images/ann_s_6.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
@@ -10,12 +10,12 @@
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n3_iku3" name="n3" src="iku37iia" fileName="font/images/tj_txt_qt_01.png" xy="64,11">
+    <image id="n3_iku3" name="n3" src="iku37iia" fileName="font/images/tj_txt_qt_01.png" xy="43,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n4_iku3" name="n4" src="iku37iib" fileName="font/images/tj_txt_qt_02.png" xy="64,11">
+    <image id="n4_iku3" name="n4" src="iku37iib" fileName="font/images/tj_txt_qt_02.png" xy="43,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>
-  <Button mode="Radio"/>
+  <Button mode="Radio" downEffect="dark" downEffectValue=".9"/>
 </component>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,53" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="l2997icj" fileName="font/images/ann_s_6.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_hp03" name="n7" src="iku37ii4" fileName="font/images/tj_txt_glyzj_01.png" xy="15,11">
+    <image id="n7_hp03" name="n7" src="iku37ii4" fileName="font/images/tj_txt_glyzj_01.png" xy="3,13" size="139,35">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n8_hp03" name="n8" src="iku37ii5" fileName="font/images/tj_txt_glyzj_02.png" xy="15,11">
+    <image id="n8_hp03" name="n8" src="iku37ii5" fileName="font/images/tj_txt_glyzj_02.png" xy="3,13" size="139,35">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,56" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_csp4" name="n0" src="csp47i4t" fileName="font/images/ann_s_3.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_hp03" name="n7" src="hp037iik" fileName="font/images/zjph_txt_jstj_01.png" xy="36,11">
+    <image id="n7_hp03" name="n7" src="hp037iik" fileName="font/images/zjph_txt_jstj_01.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n8_hp03" name="n8" src="hp037iil" fileName="font/images/zjph_txt_jstj_02.png" xy="36,11">
+    <image id="n8_hp03" name="n8" src="hp037iil" fileName="font/images/zjph_txt_jstj_02.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,56" extention="Button">
+<component size="145,62" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n0_eeqm" name="n0" src="eeqmch1" fileName="font/images/adban.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n6_rtih" name="n6" src="rtih7iiw" fileName="font/images/tj_txt_qbcy_01.png" xy="37,11">
+    <image id="n6_rtih" name="n6" src="rtih7iiw" fileName="font/images/tj_txt_qbcy_01.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n7_rtih" name="n7" src="rtih7iix" fileName="font/images/tj_txt_qbcy_02.png" xy="37,11">
+    <image id="n7_rtih" name="n7" src="rtih7iix" fileName="font/images/tj_txt_qbcy_02.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v1.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,53" extention="Button">
+<component size="145,60" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n0_eeqm" name="n0" src="l2997ica" fileName="font/images/adban.png" xy="0,0" size="197,53">
+    <image id="n0_eeqm" name="n0" src="l2997ica" fileName="font/images/adban.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_eeqm" name="n1" src="l2997idi" fileName="font/images/ldban.png" xy="0,0" size="197,53">
+    <image id="n1_eeqm" name="n1" src="l2997idi" fileName="font/images/ldban.png" xy="0,0">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n3_iku3" name="n3" src="iku37iie" fileName="font/images/tj_txt_zt_01.png" xy="67,11">
+    <image id="n3_iku3" name="n3" src="iku37iie" fileName="font/images/tj_txt_zt_01.png" xy="44,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n4_iku3" name="n4" src="iku37iif" fileName="font/images/tj_txt_zt_02.png" xy="67,11">
+    <image id="n4_iku3" name="n4" src="iku37iif" fileName="font/images/tj_txt_zt_02.png" xy="44,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>
-  <Button mode="Radio"/>
+  <Button mode="Radio" downEffect="dark" downEffectValue=".9"/>
 </component>

fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="197,53" extention="Button">
+<component size="145,62" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n0_eeqm" name="n0" src="eeqmch1" fileName="font/images/adban.png" xy="0,0">
@@ -10,10 +10,10 @@
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_hp03" name="n7" src="iku37ii6" fileName="font/images/tj_txt_jsjl_01.png" xy="31,11">
+    <image id="n7_hp03" name="n7" src="iku37ii6" fileName="font/images/tj_txt_jsjl_01.png" xy="13,16">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n8_hp03" name="n8" src="iku37ii7" fileName="font/images/tj_txt_jsjl_02.png" xy="31,11">
+    <image id="n8_hp03" name="n8" src="iku37ii7" fileName="font/images/tj_txt_jsjl_02.png" xy="13,16">
       <gearDisplay controller="button" pages="1"/>
     </image>
   </displayList>

fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml

@@ -8,7 +8,7 @@
     <image id="n7" name="n7" src="o9jnhy0" fileName="component/create_room/image/single_btn_s.png" xy="10,5">
       <gearDisplay controller="button" pages="1,3"/>
     </image>
-    <text id="n8" name="title" xy="49,5" size="265,39" font="ui://27vd145bqz637ij2" fontSize="28" color="#367256" vAlign="middle" autoSize="none" text="2"/>
+    <text id="n8" name="title" xy="49,5" size="265,39" font="ui://27vd145bqz637ij2" fontSize="28" color="#765151" vAlign="middle" autoSize="none" text="2"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml

@@ -5,7 +5,7 @@
     <image id="n7_rpaz" name="n7" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <text id="n9_rpaz" name="title" xy="59,6" size="212,39" font="ui://27vd145bqz637ij2" fontSize="20" color="#367256" vAlign="middle" autoSize="shrink" text="123"/>
+    <text id="n9_rpaz" name="title" xy="59,6" size="212,39" font="ui://27vd145bqz637ij2" fontSize="20" color="#765151" vAlign="middle" autoSize="shrink" text="123"/>
     <image id="n10_vyn3" name="n10" src="o9jnhy2" fileName="component/create_room/image/multiple_btn_n.png" xy="13,8">
       <gearDisplay controller="button" pages="1"/>
     </image>

fk101/wb_new_ui/assets/Common/component/dismiss_room/btn_keyboard/btn_keyboard.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="140,60" extention="Button">
+<component size="200,100" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <loader id="n5" name="icon" xy="0,0" size="140,60" url="ui://27vd145boviihz2" align="center" vAlign="middle" autoSize="true">
+    <loader id="n5" name="icon" xy="0,0" size="200,100" url="ui://27vd145boviihz2" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <text id="n6_ovii" name="title" xy="0,0" size="140,60" font="FZDaBiaoSong-B06S" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="1"/>
+    <text id="n6_ovii" name="title" xy="0,0" size="200,100" font="FZDaBiaoSong-B06S" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="1"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Common/component/result/component/result_main.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" initName="big_result" adaptationTest="FitSize">
+<component size="1334,750" initName="big_result">
-  <controller name="result" pages="0,,1," selected="0"/>
+  <controller name="result" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="1"/>
   <controller name="share" pages="0,,1," selected="0"/>
   <displayList>
     <graph id="n30_m5rj" name="n30" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000"/>
     <image id="n12_tjnv" name="n12" src="tjnvcfw" fileName="component/result/images/jfd.png" xy="2,71" group="n14_tjnv"/>
     <text id="n13_tjnv" name="txt_time" xy="7,83" size="116,34" group="n14_tjnv" fontSize="24" color="#ffffff" vAlign="middle" autoSize="shrink" text="倍数：5"/>
-    <group id="n14_tjnv" name="group_times" xy="2,71" size="129,59" advanced="true" collapsed="true">
+    <group id="n14_tjnv" name="group_times" xy="2,71" size="129,59" advanced="true">
       <gearDisplay controller="time" pages="1"/>
       <relation target="" sidePair="left-left,top-top"/>
     </group>
-    <image id="n16_tjnv" name="n16" src="m0eibt" fileName="images/win/tkd.png" xy="160,190" size="1012,370" group="n17_tjnv"/>
+    <image id="n16_tjnv" name="n16" src="m0eibt" fileName="font/images/win/tkd.png" xy="160,190" size="1012,370" group="n17_tjnv"/>
     <component id="n18_tjnv" name="btn_close_share" src="vg2c4" fileName="buttons/Btn_close.xml" xy="1104,149" group="n17_tjnv"/>
     <component id="n22_tjnv" name="btn_share_copy" src="tjnvcg8" fileName="component/result/component/btn_share_method.xml" xy="588,277" group="n25_tjnv">
       <Button icon="ui://27vd145btjnvcfu"/>
@@ -23,44 +23,44 @@
       <Button icon="ui://27vd145btjnvcfx"/>
     </component>
     <group id="n25_tjnv" name="n25" xy="310,277" size="714,196" group="n17_tjnv"/>
-    <group id="n17_tjnv" name="group_share" xy="160,149" size="1044,411" advanced="true" collapsed="true">
+    <group id="n17_tjnv" name="group_share" xy="160,149" size="1044,411" advanced="true">
       <gearDisplay controller="share" pages="1"/>
     </group>
-    <image id="n2_tjnv" name="n2" src="tjnvcg0" fileName="component/result/images/sb.png" xy="298,10" group="n4_tjnv">
+    <image id="n2_tjnv" name="n2" src="tjnvcg0" fileName="component/result/images/sb.png" xy="362,-18" group="n4_tjnv" scale="1.1,1.1">
       <gearDisplay controller="result" pages="0"/>
     </image>
-    <image id="n3_tjnv" name="n3" src="tjnvcg1" fileName="component/result/images/sl.png" xy="298,10" group="n4_tjnv">
+    <image id="n3_tjnv" name="n3" src="tjnvcg1" fileName="component/result/images/sl.png" xy="348,-18" group="n4_tjnv" scale="1.1,1.1">
       <gearDisplay controller="result" pages="1"/>
     </image>
-    <text id="n28_tjnv" name="n28" xy="462,104" size="409,74" group="n4_tjnv" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
+    <text id="n28_tjnv" name="n28" xy="525,104" size="409,74" group="n4_tjnv" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
-    <group id="n4_tjnv" name="title" xy="298,10" size="738,168" group="n31_aen8" advanced="true">
+    <group id="n4_tjnv" name="title" xy="348,-18" size="608,196" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n6_tjnv" name="btn_result_share" src="tjnvcg6" fileName="component/result/component/btn_result_share.xml" xy="30,642" group="n7_tjnv">
+    <component id="n6_tjnv" name="btn_result_share" src="tjnvcg6" fileName="component/result/component/btn_result_share.xml" xy="29,642" group="n7_tjnv">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n5_tjnv" name="btn_result_confirm" src="tjnvcg5" fileName="component/result/component/btn_result_confirm.xml" xy="1041,642" group="n7_tjnv">
+    <component id="n5_tjnv" name="btn_result_confirm" src="tjnvcg5" fileName="component/result/component/btn_result_confirm.xml" xy="1040,642" group="n7_tjnv">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="30,642" size="1273,97" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="29,642" size="1273,97" group="n31_aen8"/>
-    <component id="n8_tjnv" name="btn_close" src="tjnvcg7" fileName="component/result/component/btn_result_close.xml" xy="1239,23" group="n31_aen8">
+    <component id="n8_tjnv" name="btn_close" src="tjnvcg7" fileName="component/result/component/btn_result_close.xml" xy="1238,23" group="n31_aen8">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <image id="n9_tjnv" name="n9" src="tjnvcfv" fileName="component/result/images/hd.png" xy="292,622" size="749,128" group="n11_tjnv"/>
+    <image id="n9_tjnv" name="n9" src="tjnvcfv" fileName="component/result/images/hd.png" xy="291,622" size="749,128" group="n11_tjnv"/>
-    <text id="n10_tjnv" name="txt_play" xy="291,621" size="749,128" group="n11_tjnv" fontSize="22" color="#999999" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明"/>
+    <text id="n10_tjnv" name="txt_play" xy="290,621" size="749,128" group="n11_tjnv" fontSize="22" color="#999999" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明玩法说明"/>
-    <group id="n11_tjnv" name="player" xy="291,621" size="750,129" group="n31_aen8" advanced="true">
+    <group id="n11_tjnv" name="player" xy="290,621" size="750,129" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
-    <text id="n27_tjnv" name="txt_game_name" xy="1009,20" size="211,42" group="n31_aen8" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="游戏名字"/>
+    <text id="n27_tjnv" name="txt_game_name" xy="1008,20" size="211,42" group="n31_aen8" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="游戏名字"/>
-    <text id="n29_tjnv" name="txt_game_data" xy="940,64" size="280,42" group="n31_aen8" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
+    <text id="n29_tjnv" name="txt_game_data" xy="939,64" size="280,42" group="n31_aen8" fontSize="24" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
-    <text id="n15_tjnv" name="txt_room_id" xy="7,19" size="211,42" group="n31_aen8" fontSize="24" color="#ffffff" vAlign="middle" autoSize="none" text="房号：888888"/>
+    <text id="n15_tjnv" name="txt_room_id" xy="6,19" size="211,42" group="n31_aen8" fontSize="24" color="#ffffff" vAlign="middle" autoSize="none" text="房号：888888"/>
-    <list id="n26_tjnv" name="player_list" xy="20,162" size="1292,450" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://27vd145btjnvcg9" align="center" vAlign="middle">
+    <list id="n26_tjnv" name="player_list" xy="19,162" size="1292,450" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://27vd145btjnvcg9" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n31_aen8" name="n31" xy="7,10" size="1305,740" advanced="true" collapsed="true"/>
+    <group id="n31_aen8" name="n31" xy="6,-18" size="1305,768" advanced="true"/>
   </displayList>
 </component>

fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml

@@ -2,68 +2,68 @@
 <component size="800,624">
   <displayList>
     <component id="n27_fk7k" name="bg" src="eeqmcgu" fileName="Win_Frame_full.xml" xy="0,0" size="800,624" controller="show_line,1,show_di,1,style,2"/>
-    <image id="n94_cvc8" name="n94" src="csp47i47" fileName="mgr/imgs/fagpack/bt.png" xy="235,3" pkg="m7iejg46"/>
+    <image id="n94_cvc8" name="n94" src="csp47i47" fileName="mgr/imgs/fagpack/bt.png" pkg="m7iejg46" xy="235,3" visible="false"/>
-    <image id="n95_cvc8" name="n95" src="cvc87i5j" fileName="images/btn_keyboard/bt_haomashuru.png" xy="342,16"/>
+    <image id="n95_cvc8" name="n95" src="cvc87i5j" fileName="font/images/btn_keyboard/bt_haomashuru.png" xy="342,16" visible="false"/>
-    <component id="n63_omkm" name="btn_close" src="cvc87i5o" fileName="btnclose.xml" xy="676,3">
+    <component id="n63_omkm" name="btn_close" src="cvc87i5o" fileName="font/images/btn_keyboard/btnclose.xml" xy="712,3">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <component id="n64_omkm" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="43,490" size="235,105" group="n88_omkm">
+    <component id="n64_omkm" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="42,480" size="235,105" group="n88_omkm">
       <Button title="删除" titleFontSize="1" icon="ui://27vd145bb8zx7i5a"/>
     </component>
-    <component id="n65_omkm" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="524,490" size="235,105" group="n88_omkm">
+    <component id="n65_omkm" name="btn_ok" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="523,480" size="235,105" group="n88_omkm">
       <Button title="确认" titleFontSize="1" icon="ui://27vd145bb8zx7i4y"/>
     </component>
-    <component id="n66_omkm" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="43,180" size="235,105" group="n88_omkm">
+    <component id="n66_omkm" name="btn_1" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="42,170" size="235,105" group="n88_omkm">
       <Button title="1" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n67_omkm" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="286,180" size="235,105" group="n88_omkm">
+    <component id="n67_omkm" name="btn_2" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="285,170" size="235,105" group="n88_omkm">
       <Button title="2" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n68_omkm" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="524,180" size="235,105" group="n88_omkm">
+    <component id="n68_omkm" name="btn_3" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="523,170" size="235,105" group="n88_omkm">
       <Button title="3" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n69_omkm" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="43,283" size="235,105" group="n88_omkm">
+    <component id="n69_omkm" name="btn_4" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="42,273" size="235,105" group="n88_omkm">
       <Button title="4" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n70_omkm" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="286,283" size="235,105" group="n88_omkm">
+    <component id="n70_omkm" name="btn_5" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="285,273" size="235,105" group="n88_omkm">
       <Button title="5" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n71_omkm" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="524,283" size="235,105" group="n88_omkm">
+    <component id="n71_omkm" name="btn_6" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="523,273" size="235,105" group="n88_omkm">
       <Button title="6" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n72_omkm" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="43,387" size="235,105" group="n88_omkm">
+    <component id="n72_omkm" name="btn_7" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="42,377" size="235,105" group="n88_omkm">
       <Button title="7" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n73_omkm" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="286,387" size="235,105" group="n88_omkm">
+    <component id="n73_omkm" name="btn_8" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="285,377" size="235,105" group="n88_omkm">
       <Button title="8" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n74_omkm" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="524,387" size="235,105" group="n88_omkm">
+    <component id="n74_omkm" name="btn_9" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="523,377" size="235,105" group="n88_omkm">
       <Button title="9" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n75_omkm" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="286,490" size="235,105" group="n88_omkm" scale="0.49,1">
+    <component id="n75_omkm" name="btn_0" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="285,480" size="235,105" group="n88_omkm" scale="0.49,1">
       <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <component id="n96_cvc8" name="btn_c" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="404,490" size="235,105" group="n88_omkm" scale="0.49,1">
+    <component id="n96_cvc8" name="btn_c" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="403,480" size="235,105" group="n88_omkm" scale="0.49,1">
       <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <image id="n76_omkm" name="n76" src="b8zx7i5b" fileName="images/btn_keyboard/queren.png" xy="604,525" group="n88_omkm"/>
+    <image id="n76_omkm" name="n76" src="b8zx7i5b" fileName="font/images/btn_keyboard/queren.png" xy="603,515" group="n88_omkm"/>
-    <image id="n77_omkm" name="n77" src="b8zx7i5c" fileName="images/btn_keyboard/shanchu.png" xy="113,525" group="n88_omkm"/>
+    <image id="n77_omkm" name="n77" src="b8zx7i5c" fileName="font/images/btn_keyboard/shanchu.png" xy="112,515" group="n88_omkm"/>
-    <image id="n78_omkm" name="n78" src="b8zx7i50" fileName="images/btn_keyboard/shuzi_01.png" xy="324,513" group="n88_omkm"/>
+    <image id="n78_omkm" name="n78" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" xy="334,509" group="n88_omkm"/>
-    <image id="n79_omkm" name="n79" src="b8zx7i51" fileName="images/btn_keyboard/shuzi_02.png" xy="138,200" group="n88_omkm"/>
+    <image id="n79_omkm" name="n79" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" xy="145,200" group="n88_omkm"/>
-    <image id="n80_omkm" name="n80" src="b8zx7i52" fileName="images/btn_keyboard/shuzi_03.png" xy="378,200" group="n88_omkm"/>
+    <image id="n80_omkm" name="n80" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" xy="387,200" group="n88_omkm"/>
-    <image id="n81_omkm" name="n81" src="b8zx7i53" fileName="images/btn_keyboard/shuzi_04.png" xy="621,200" group="n88_omkm"/>
+    <image id="n81_omkm" name="n81" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" xy="627,200" group="n88_omkm"/>
-    <image id="n82_omkm" name="n82" src="b8zx7i54" fileName="images/btn_keyboard/shuzi_05.png" xy="138,307" group="n88_omkm"/>
+    <image id="n82_omkm" name="n82" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" xy="145,304" group="n88_omkm"/>
-    <image id="n83_omkm" name="n83" src="b8zx7i55" fileName="images/btn_keyboard/shuzi_06.png" xy="378,307" group="n88_omkm"/>
+    <image id="n83_omkm" name="n83" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" xy="387,304" group="n88_omkm"/>
-    <image id="n84_omkm" name="n84" src="b8zx7i56" fileName="images/btn_keyboard/shuzi_07.png" xy="621,307" group="n88_omkm"/>
+    <image id="n84_omkm" name="n84" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" xy="627,304" group="n88_omkm"/>
-    <image id="n85_omkm" name="n85" src="b8zx7i57" fileName="images/btn_keyboard/shuzi_08.png" xy="138,412" group="n88_omkm"/>
+    <image id="n85_omkm" name="n85" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" xy="145,408" group="n88_omkm"/>
-    <image id="n86_omkm" name="n86" src="b8zx7i58" fileName="images/btn_keyboard/shuzi_09.png" xy="378,412" group="n88_omkm"/>
+    <image id="n86_omkm" name="n86" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" xy="387,408" group="n88_omkm"/>
-    <image id="n87_omkm" name="n87" src="b8zx7i59" fileName="images/btn_keyboard/shuzi_10.png" xy="621,412" group="n88_omkm"/>
+    <image id="n87_omkm" name="n87" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" xy="627,408" group="n88_omkm"/>
-    <image id="n97_cvc8" name="n97" src="cvc87i5k" fileName="images/btn_keyboard/qingling.png" xy="415,517" group="n88_omkm"/>
+    <image id="n97_cvc8" name="n97" src="cvc87i5k" fileName="font/images/btn_keyboard/qingling.png" xy="414,507" group="n88_omkm"/>
-    <group id="n88_omkm" name="input_panel" xy="43,180" size="716,415" group="n92_omkm"/>
+    <group id="n88_omkm" name="input_panel" xy="42,170" size="716,415" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="images/btn_keyboard/bg_05.png" xy="44,81" group="n91_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" xy="60,93" size="680,68" group="n91_omkm"/>
-    <text id="n90_omkm" name="tex_num" xy="45,83" size="704,94" group="n91_omkm" font="Arial" fontSize="36" color="#825c38" vAlign="middle" autoSize="none" text="123"/>
+    <text id="n90_omkm" name="tex_num" xy="60,92" size="679,65" group="n91_omkm" font="Arial" fontSize="36" color="#825c38" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="44,81" size="711,96" group="n92_omkm"/>
+    <group id="n91_omkm" name="show" xy="60,92" size="680,69" group="n92_omkm"/>
-    <group id="n92_omkm" name="n92" xy="43,81" size="716,514" advanced="true">
+    <group id="n92_omkm" name="n92" xy="42,92" size="716,493" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
   </displayList>

fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/btnclose.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="122,56" extention="Button">
+<component size="79,79" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_csp4" name="n0" src="cvc87i5p" fileName="component/nav/guanbi.png" xy="0,0">
+    <image id="n0_csp4" name="n0" src="cvc87i5p" fileName="font/images/btn_keyboard/component/nav/guanbi.png" xy="0,0">
       <gearDisplay controller="button" pages="0,2"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_csp4" name="n1" src="cvc87i5p" fileName="component/nav/guanbi.png" xy="0,0">
+    <image id="n1_csp4" name="n1" src="cvc87i5p" fileName="font/images/btn_keyboard/component/nav/guanbi.png" xy="0,0">
       <gearDisplay controller="button" pages="1,3"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

fk101/wb_new_ui/assets/Common/images/btn_keyboard/Win_FagInput2.xml

@@ -2,9 +2,9 @@
 <component size="800,624">
   <displayList>
     <component id="n27_fk7k" name="bg" src="eeqmcgu" fileName="Win_Frame_full.xml" xy="0,0" size="800,624" controller="show_line,1,show_di,1,style,2"/>
-    <image id="n94_cvc8" name="n94" src="csp47i47" fileName="mgr/imgs/fagpack/bt.png" xy="235,3" pkg="m7iejg46"/>
+    <image id="n94_cvc8" name="n94" src="csp47i47" fileName="mgr/imgs/fagpack/bt.png" pkg="m7iejg46" xy="235,3"/>
-    <image id="n95_cvc8" name="n95" src="cvc87i5j" fileName="images/btn_keyboard/bt_haomashuru.png" xy="342,16"/>
+    <image id="n95_cvc8" name="n95" src="cvc87i5j" fileName="font/images/btn_keyboard/bt_haomashuru.png" xy="342,16"/>
-    <component id="n63_omkm" name="btn_close" src="cvc87i5o" fileName="btnclose.xml" xy="676,3">
+    <component id="n63_omkm" name="btn_close" src="cvc87i5o" fileName="font/images/btn_keyboard/btnclose.xml" xy="676,3">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n64_omkm" name="btn_del" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="43,490" size="235,105" group="n88_omkm">
@@ -46,24 +46,24 @@
     <component id="n96_cvc8" name="btn_c" src="c6bub0" fileName="component/dismiss_room/btn_keyboard/btn_keyboard.xml" xy="404,490" size="235,105" group="n88_omkm" scale="0.49,1">
       <Button title="0" titleFontSize="1" icon="ui://27vd145bb8zx7i4z"/>
     </component>
-    <image id="n76_omkm" name="n76" src="b8zx7i5b" fileName="images/btn_keyboard/queren.png" xy="604,525" group="n88_omkm"/>
+    <image id="n76_omkm" name="n76" src="b8zx7i5b" fileName="font/images/btn_keyboard/queren.png" xy="604,525" group="n88_omkm"/>
-    <image id="n77_omkm" name="n77" src="b8zx7i5c" fileName="images/btn_keyboard/shanchu.png" xy="113,525" group="n88_omkm"/>
+    <image id="n77_omkm" name="n77" src="b8zx7i5c" fileName="font/images/btn_keyboard/shanchu.png" xy="113,525" group="n88_omkm"/>
-    <image id="n78_omkm" name="n78" src="b8zx7i50" fileName="images/btn_keyboard/shuzi_01.png" xy="324,513" group="n88_omkm"/>
+    <image id="n78_omkm" name="n78" src="b8zx7i50" fileName="font/images/btn_keyboard/shuzi_01.png" xy="324,513" group="n88_omkm"/>
-    <image id="n79_omkm" name="n79" src="b8zx7i51" fileName="images/btn_keyboard/shuzi_02.png" xy="138,200" group="n88_omkm"/>
+    <image id="n79_omkm" name="n79" src="b8zx7i51" fileName="font/images/btn_keyboard/shuzi_02.png" xy="138,200" group="n88_omkm"/>
-    <image id="n80_omkm" name="n80" src="b8zx7i52" fileName="images/btn_keyboard/shuzi_03.png" xy="378,200" group="n88_omkm"/>
+    <image id="n80_omkm" name="n80" src="b8zx7i52" fileName="font/images/btn_keyboard/shuzi_03.png" xy="378,200" group="n88_omkm"/>
-    <image id="n81_omkm" name="n81" src="b8zx7i53" fileName="images/btn_keyboard/shuzi_04.png" xy="621,200" group="n88_omkm"/>
+    <image id="n81_omkm" name="n81" src="b8zx7i53" fileName="font/images/btn_keyboard/shuzi_04.png" xy="621,200" group="n88_omkm"/>
-    <image id="n82_omkm" name="n82" src="b8zx7i54" fileName="images/btn_keyboard/shuzi_05.png" xy="138,307" group="n88_omkm"/>
+    <image id="n82_omkm" name="n82" src="b8zx7i54" fileName="font/images/btn_keyboard/shuzi_05.png" xy="138,307" group="n88_omkm"/>
-    <image id="n83_omkm" name="n83" src="b8zx7i55" fileName="images/btn_keyboard/shuzi_06.png" xy="378,307" group="n88_omkm"/>
+    <image id="n83_omkm" name="n83" src="b8zx7i55" fileName="font/images/btn_keyboard/shuzi_06.png" xy="378,307" group="n88_omkm"/>
-    <image id="n84_omkm" name="n84" src="b8zx7i56" fileName="images/btn_keyboard/shuzi_07.png" xy="621,307" group="n88_omkm"/>
+    <image id="n84_omkm" name="n84" src="b8zx7i56" fileName="font/images/btn_keyboard/shuzi_07.png" xy="621,307" group="n88_omkm"/>
-    <image id="n85_omkm" name="n85" src="b8zx7i57" fileName="images/btn_keyboard/shuzi_08.png" xy="138,412" group="n88_omkm"/>
+    <image id="n85_omkm" name="n85" src="b8zx7i57" fileName="font/images/btn_keyboard/shuzi_08.png" xy="138,412" group="n88_omkm"/>
-    <image id="n86_omkm" name="n86" src="b8zx7i58" fileName="images/btn_keyboard/shuzi_09.png" xy="378,412" group="n88_omkm"/>
+    <image id="n86_omkm" name="n86" src="b8zx7i58" fileName="font/images/btn_keyboard/shuzi_09.png" xy="378,412" group="n88_omkm"/>
-    <image id="n87_omkm" name="n87" src="b8zx7i59" fileName="images/btn_keyboard/shuzi_10.png" xy="621,412" group="n88_omkm"/>
+    <image id="n87_omkm" name="n87" src="b8zx7i59" fileName="font/images/btn_keyboard/shuzi_10.png" xy="621,412" group="n88_omkm"/>
-    <image id="n97_cvc8" name="n97" src="cvc87i5k" fileName="images/btn_keyboard/qingling.png" xy="415,517" group="n88_omkm"/>
+    <image id="n97_cvc8" name="n97" src="cvc87i5k" fileName="font/images/btn_keyboard/qingling.png" xy="415,517" group="n88_omkm"/>
     <group id="n88_omkm" name="input_panel" xy="43,180" size="716,415" group="n92_omkm"/>
-    <image id="n89_omkm" name="n89" src="oviihz1" fileName="images/btn_keyboard/bg_05.png" xy="44,81" group="n91_omkm"/>
+    <image id="n89_omkm" name="n89" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" xy="60,96" group="n91_omkm"/>
-    <text id="n90_omkm" name="tex_num" xy="45,83" size="704,94" group="n91_omkm" font="Arial" fontSize="36" color="#825c38" vAlign="middle" autoSize="none" text="123"/>
+    <text id="n90_omkm" name="tex_num" xy="61,98" size="678,74" group="n91_omkm" font="Arial" fontSize="36" color="#825c38" vAlign="middle" autoSize="none" text="123"/>
-    <group id="n91_omkm" name="show" xy="44,81" size="711,96" group="n92_omkm"/>
+    <group id="n91_omkm" name="show" xy="60,96" size="680,78" group="n92_omkm"/>
-    <group id="n92_omkm" name="n92" xy="43,81" size="716,514" advanced="true">
+    <group id="n92_omkm" name="n92" xy="43,96" size="716,499" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
   </displayList>