diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png
index 85f0310..e078dbb 100644
Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ
diff --git a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes
index 8d46756..f823977 100644
Binary files a/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ
diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png
index 78256ea..ab4b665 100644
Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_atlas0.png differ
diff --git a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes
index 51849c7..0e96c4a 100644
Binary files a/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/extend/zipai/weimaque/ui/Extend_Poker_WeiMaQue_fui.bytes differ
diff --git a/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info b/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info
new file mode 100644
index 0000000..2957505
--- /dev/null
+++ b/fk101/wb_new_ui/.objs/metas/27vd145b/cvc87i5n.info
@@ -0,0 +1,10 @@
+{
+ "objectStatus": {
+ "n94_cvc8": {
+ "hidden": true
+ },
+ "n95_cvc8": {
+ "hidden": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info
index 439b0e4..7b88c97 100644
--- a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/75efcz.info
+++ b/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,
diff --git a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
index 1bc7c77..189027f 100644
--- a/fk101/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info
+++ b/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
},
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
index 84403c5..d071c00 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/10snh5j.info
+++ b/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
},
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
index e078729..9e26dfe 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
+++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/10xl7i1w.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n120_l7wn": {
- "collapsed": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info
index 12ed5a9..9e26dfe 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info
+++ b/fk101/wb_new_ui/.objs/metas/m7iejg46/l7wn7i81.info
@@ -1,7 +1 @@
-{
- "objectStatus": {
- "n90_omkm": {
- "hidden": true
- }
- }
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
index 87c49a6..ad39b8d 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6m.info
+++ b/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,
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info
index 6667ee8..fd6aabd 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6q.info
+++ b/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
}
}
diff --git a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info b/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info
index f0ac32e..34cb8e5 100644
--- a/fk101/wb_new_ui/.objs/metas/m7iejg46/z3847i6r.info
+++ b/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
}
}
diff --git a/fk101/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info b/fk101/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/fk101/wb_new_ui/.objs/metas/v0j9abjy/gq7mdo.info
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json
index 42b8ea1..1d521b3 100644
--- a/fk101/wb_new_ui/.objs/workspace.json
+++ b/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://m7iejg46mtk57i94",
- "ui://awernf6xbazq7n",
- "ui://2d9xdj6zfn7fao",
- "ui://2d9xdj6zl7wn7cnf",
- "ui://2d9xdj6zvoxxit",
- "ui://2d9xdj6zker3jg",
- "ui://2d9xdj6zoviicm0",
- "ui://2d9xdj6zker3je",
- "ui://2zlli80mw9te0",
+ "ui://4skil1l6bw4ghm",
+ "ui://4skil1l6bw4ghl",
+ "ui://xul2z8cts9wx7",
+ "ui://bx1t0boos9wx7",
+ "ui://c7j2rnvqtpf02f",
+ "ui://b50sd5s6s9wx7",
+ "ui://y8prev1ms9wxa",
+ "ui://y8prev1ms9wx9",
+ "ui://y8prev1ms9wx8",
+ "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://visk5g30gq7mg",
- "ui://visk5g30gq7m22",
- "ui://visk5g30gq7m23",
- "ui://visk5g30gq7m24",
- "ui://visk5g30gq7m8",
- "ui://9n9stu2eprgzf0",
- "ui://9n9stu2eprgzep",
- "ui://m7iejg46kwi0hlo",
- "ui://27vd145bkio210",
- "ui://m7iejg46kwi0hkb",
- "ui://v0j9abjygq7ms2",
- "ui://v0j9abjygq7m8f",
- "ui://m7iejg46jr1l7i3c",
- "ui://4skil1l6r6qo1kc",
- "ui://v0j9abjygq7m6c",
- "ui://m7iejg46mpllhv2",
- "ui://m7iejg46kwi0hkl",
- "ui://2d9xdj6zlumrgj",
- "ui://1hl55dqmc4r115"
+ "ui://v0j9abjygq7ms9",
+ "ui://v6yvqp7wf55qwd",
+ "ui://v0j9abjygq7ms4",
+ "ui://v0j9abjygq7ms5",
+ "ui://4skil1l6bw4ggt",
+ "ui://m7iejg46cioeho9",
+ "ui://m7iejg46kwi0hk1",
+ "ui://2d9xdj6zfn7fao"
],
"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",
- "/commpoent/"
+ "xul2z8ct",
+ "/component/",
+ "xul2z8ct",
+ "/component/clearing/",
+ "4skil1l6",
+ "/",
+ "4skil1l6",
+ "/component/",
+ "4skil1l6",
+ "/component/clearing/"
],
"auxline1": true,
"snapToGrid": true,
diff --git a/fk101/wb_new_ui/assets/Common/MessageBox.xml b/fk101/wb_new_ui/assets/Common/MessageBox.xml
index ef8659a..06fa0ba 100644
--- a/fk101/wb_new_ui/assets/Common/MessageBox.xml
+++ b/fk101/wb_new_ui/assets/Common/MessageBox.xml
@@ -4,7 +4,7 @@
-
+
@@ -12,7 +12,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Common/MessageBox1.xml b/fk101/wb_new_ui/assets/Common/MessageBox1.xml
index 4c6dc7f..769530a 100644
--- a/fk101/wb_new_ui/assets/Common/MessageBox1.xml
+++ b/fk101/wb_new_ui/assets/Common/MessageBox1.xml
@@ -4,11 +4,11 @@
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml
index 3b5f635..559dc68 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_close.xml
@@ -3,7 +3,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml
index 9ff4854..50ae94a 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml
index 710205e..fba1ae2 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l1.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,12 +10,12 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml
index 7b6fcbf..0d9c3af 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l2.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml
index 562e197..f06306a 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_l3.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml
index 1c79966..a57930b 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r1.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r1.xml
index 1fac058..8f4fc61 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r1.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r1.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -10,12 +10,12 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml
index bb85841..43222e8 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r2.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml
index ba5fdde..c2f16f9 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_r3.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml
index f49f144..ceefba0 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v.xml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v1.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v1.xml
index 717d3bd..0b60e03 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v1.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v1.xml
@@ -1,21 +1,21 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml
index 3085e6d..3213f95 100644
--- a/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml
+++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_menu_v2.xml
@@ -1,5 +1,5 @@
-
+
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml b/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
index 05cd2f9..68764ad 100644
--- a/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
+++ b/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox.xml
@@ -8,7 +8,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml b/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
index 9dc45e5..2e780f3 100644
--- a/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
+++ b/fk101/wb_new_ui/assets/Common/component/create_room/Btn_cr_checkbox2.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Common/component/dismiss_room/btn_keyboard/btn_keyboard.xml b/fk101/wb_new_ui/assets/Common/component/dismiss_room/btn_keyboard/btn_keyboard.xml
index 2f3799b..4a342b1 100644
--- a/fk101/wb_new_ui/assets/Common/component/dismiss_room/btn_keyboard/btn_keyboard.xml
+++ b/fk101/wb_new_ui/assets/Common/component/dismiss_room/btn_keyboard/btn_keyboard.xml
@@ -1,11 +1,11 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/component/result/component/result_main.xml b/fk101/wb_new_ui/assets/Common/component/result/component/result_main.xml
index b9b85ad..7f36f2b 100644
--- a/fk101/wb_new_ui/assets/Common/component/result/component/result_main.xml
+++ b/fk101/wb_new_ui/assets/Common/component/result/component/result_main.xml
@@ -1,17 +1,17 @@
-
-
-
+
+
+
-
+
-
+
@@ -23,44 +23,44 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Common/component/result/images/sb.png b/fk101/wb_new_ui/assets/Common/component/result/images/sb.png
index 7293e34..e82e5da 100644
Binary files a/fk101/wb_new_ui/assets/Common/component/result/images/sb.png and b/fk101/wb_new_ui/assets/Common/component/result/images/sb.png differ
diff --git a/fk101/wb_new_ui/assets/Common/component/result/images/sl.png b/fk101/wb_new_ui/assets/Common/component/result/images/sl.png
index a416d3e..017bb4a 100644
Binary files a/fk101/wb_new_ui/assets/Common/component/result/images/sl.png and b/fk101/wb_new_ui/assets/Common/component/result/images/sl.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/adban.png b/fk101/wb_new_ui/assets/Common/font/images/adban.png
index 8fb1b44..52f6659 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/adban.png and b/fk101/wb_new_ui/assets/Common/font/images/adban.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png b/fk101/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png
index 5587f50..174ae89 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_qingchuhuancun.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_quanbushanchu.png b/fk101/wb_new_ui/assets/Common/font/images/ann_quanbushanchu.png
index 8130d0f..8cd6844 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_quanbushanchu.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_quanbushanchu.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_queding.png b/fk101/wb_new_ui/assets/Common/font/images/ann_queding.png
index 47d01b4..50714c8 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_queding.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_queding.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_quxiao.png b/fk101/wb_new_ui/assets/Common/font/images/ann_quxiao.png
index 7495a1c..002845d 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_quxiao.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_quxiao.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_s_1.png b/fk101/wb_new_ui/assets/Common/font/images/ann_s_1.png
index 574690e..529821c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_s_1.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_s_1.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_s_3.png b/fk101/wb_new_ui/assets/Common/font/images/ann_s_3.png
index 08d7953..df173dd 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_s_3.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_s_3.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_s_4.png b/fk101/wb_new_ui/assets/Common/font/images/ann_s_4.png
index f6d8166..529821c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_s_4.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_s_4.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ann_s_6.png b/fk101/wb_new_ui/assets/Common/font/images/ann_s_6.png
index 4116171..df173dd 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ann_s_6.png and b/fk101/wb_new_ui/assets/Common/font/images/ann_s_6.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml
index 57acbe7..c543c64 100644
--- a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml
+++ b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/Win_FagInput2.xml
@@ -2,68 +2,68 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png
index cd62274..4f53ae8 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png
index a5a70f0..f81ade6 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bg_05.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/btnclose.xml b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/btnclose.xml
index 4e53417..d382895 100644
--- a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/btnclose.xml
+++ b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/btnclose.xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bxx.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bxx.png
new file mode 100644
index 0000000..32a2ec8
Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/bxx.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/component/nav/guanbi.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/component/nav/guanbi.png
index acbcd04..06691ac 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/component/nav/guanbi.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/component/nav/guanbi.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png
index 8f9ddee..835b1b9 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png
index 0e1be94..c515277 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png
index e5f7be4..b684874 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/hall_input_bg.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/hall_input_bg.png
index f427203..b38d8b3 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/hall_input_bg.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/hall_input_bg.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png
index 08f5851..642a7c8 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png
index cf31c0f..341ea2c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png
index 1d7ef28..458a090 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png
index 58b4e40..2de02f0 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png
index bf8b98c..6ecf38c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png
index fb13a7f..8f0e7f9 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png
index 3cc4fbe..39a9801 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png
index bb0de68..0a4fd50 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png
index 57640de..f66e0de 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png
index 35cf234..545d96f 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png and b/fk101/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/button_tj_01.png b/fk101/wb_new_ui/assets/Common/font/images/button_tj_01.png
index 9f7255b..ca99b68 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/button_tj_01.png and b/fk101/wb_new_ui/assets/Common/font/images/button_tj_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/button_xg_01.png b/fk101/wb_new_ui/assets/Common/font/images/button_xg_01.png
index f44f4a4..ea9013d 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/button_xg_01.png and b/fk101/wb_new_ui/assets/Common/font/images/button_xg_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/bxx_button_cr_01.png b/fk101/wb_new_ui/assets/Common/font/images/bxx_button_cr_01.png
index 283cc72..aacfb65 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/bxx_button_cr_01.png and b/fk101/wb_new_ui/assets/Common/font/images/bxx_button_cr_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/bxx_button_qc_01.png b/fk101/wb_new_ui/assets/Common/font/images/bxx_button_qc_01.png
index 8eba2a1..d577262 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/bxx_button_qc_01.png and b/fk101/wb_new_ui/assets/Common/font/images/bxx_button_qc_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_1.png b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_1.png
index ab64982..289a784 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_1.png and b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_1.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_2.png b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_2.png
index 847512e..289a784 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_2.png and b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_tjcy_2.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_01.png b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_01.png
index b0938ba..6a21df1 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_01.png and b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_02.png b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_02.png
index 2bfea24..6a21df1 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_02.png and b/fk101/wb_new_ui/assets/Common/font/images/cylb_txt_wdcy_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/ldban.png b/fk101/wb_new_ui/assets/Common/font/images/ldban.png
index a13de76..52f6659 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/ldban.png and b/fk101/wb_new_ui/assets/Common/font/images/ldban.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/setting/off.png b/fk101/wb_new_ui/assets/Common/font/images/setting/off.png
index d31aed9..9d26507 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/setting/off.png and b/fk101/wb_new_ui/assets/Common/font/images/setting/off.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/setting/on.png b/fk101/wb_new_ui/assets/Common/font/images/setting/on.png
index 925f51a..fbf36c6 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/setting/on.png and b/fk101/wb_new_ui/assets/Common/font/images/setting/on.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_01.png
index ce6641b..09303d2 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_02.png
index 01fff0d..09303d2 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_glyzj_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_01.png
index 628ddfb..62a231a 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_02.png
index 4ba75c1..62a231a 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jsjl_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_01.png
index 167c834..ea56be9 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_02.png
index 0cd21f8..ea56be9 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_jt_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_01.png
index 95efc73..c93f32c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_02.png
index f45741a..c93f32c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qbcy_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_01.png
index 2c36aa9..caa5bfc 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_02.png
index 20b3f8f..caa5bfc 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_qt_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_01.png
index e9fbbf5..4939007 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_02.png
index f0f8fdb..4939007 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zjjl_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_01.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_01.png
index 2ad82b6..8ad849d 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_01.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_02.png b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_02.png
index 0f93a50..8ad849d 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_02.png and b/fk101/wb_new_ui/assets/Common/font/images/tj_txt_zt_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png b/fk101/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png
index 4a0ae6e..b8d381c 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png and b/fk101/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/win/cha.png b/fk101/wb_new_ui/assets/Common/font/images/win/cha.png
index 34a915a..06691ac 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/win/cha.png and b/fk101/wb_new_ui/assets/Common/font/images/win/cha.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/win/shurukuang5.png b/fk101/wb_new_ui/assets/Common/font/images/win/shurukuang5.png
index 964a98f..10d4578 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/win/shurukuang5.png and b/fk101/wb_new_ui/assets/Common/font/images/win/shurukuang5.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/win/tkd.png b/fk101/wb_new_ui/assets/Common/font/images/win/tkd.png
index 8b48974..e844612 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/win/tkd.png and b/fk101/wb_new_ui/assets/Common/font/images/win/tkd.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/win/wf_bg_01.png b/fk101/wb_new_ui/assets/Common/font/images/win/wf_bg_01.png
index 4a0ae6e..68acbe7 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/win/wf_bg_01.png and b/fk101/wb_new_ui/assets/Common/font/images/win/wf_bg_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/wwww.png b/fk101/wb_new_ui/assets/Common/font/images/wwww.png
index 9badefe..85ecd85 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/wwww.png and b/fk101/wb_new_ui/assets/Common/font/images/wwww.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_01.png b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_01.png
index 4c4df1a..cc3eef6 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_01.png and b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_02.png b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_02.png
index dcf1b49..cc3eef6 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_02.png and b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jfspm_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_01.png b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_01.png
index ff0fc27..c59b099 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_01.png and b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_01.png differ
diff --git a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_02.png b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_02.png
index d9a1efd..c59b099 100644
Binary files a/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_02.png and b/fk101/wb_new_ui/assets/Common/font/images/zjph_txt_jstj_02.png differ
diff --git a/fk101/wb_new_ui/assets/Common/images/btn_keyboard/Win_FagInput2.xml b/fk101/wb_new_ui/assets/Common/images/btn_keyboard/Win_FagInput2.xml
index 57acbe7..25471e3 100644
--- a/fk101/wb_new_ui/assets/Common/images/btn_keyboard/Win_FagInput2.xml
+++ b/fk101/wb_new_ui/assets/Common/images/btn_keyboard/Win_FagInput2.xml
@@ -2,9 +2,9 @@
-
-
-
+
+
+
@@ -46,24 +46,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/Common/package.xml b/fk101/wb_new_ui/assets/Common/package.xml
index 74dd847..30f093e 100644
--- a/fk101/wb_new_ui/assets/Common/package.xml
+++ b/fk101/wb_new_ui/assets/Common/package.xml
@@ -489,7 +489,7 @@
-
+
@@ -1087,6 +1087,7 @@
+
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/component/result_main.xml b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/component/result_main.xml
index e7ff769..e69d89b 100644
--- a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/component/result_main.xml
+++ b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/component/result_main.xml
@@ -1,17 +1,17 @@
-
-
+
+
-
+
-
+
@@ -23,17 +23,17 @@
-
+
-
+
-
+
-
-
+
+
@@ -61,6 +61,6 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sb.png b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sb.png
index 7293e34..e82e5da 100644
Binary files a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sb.png and b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sb.png differ
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sl.png b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sl.png
index a416d3e..017bb4a 100644
Binary files a/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sl.png and b/fk101/wb_new_ui/assets/Extend_MJ_ChangSha/component/result/images/sl.png differ
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/component/result_main.xml b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/component/result_main.xml
index ee692cd..2a082a0 100644
--- a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/component/result_main.xml
+++ b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/component/result_main.xml
@@ -1,17 +1,17 @@
-
-
+
+
-
+
-
+
@@ -23,17 +23,17 @@
-
+
-
+
-
+
-
-
+
+
@@ -61,6 +61,6 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sb.png b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sb.png
index 7293e34..e82e5da 100644
Binary files a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sb.png and b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sb.png differ
diff --git a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sl.png b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sl.png
index a416d3e..017bb4a 100644
Binary files a/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sl.png and b/fk101/wb_new_ui/assets/Extend_MJ_GeJiu/component/result/images/sl.png differ
diff --git a/fk101/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml b/fk101/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml
index dc8e4e5..38f3473 100644
--- a/fk101/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml
+++ b/fk101/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml
@@ -622,6 +622,9 @@
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Hotupdate/Version.xml b/fk101/wb_new_ui/assets/Hotupdate/Version.xml
index d3a50aa..1471bf2 100644
--- a/fk101/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/fk101/wb_new_ui/assets/Hotupdate/Version.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Hotupdate/denglu_bg_01.png b/fk101/wb_new_ui/assets/Hotupdate/denglu_bg_01.png
index bc426a9..1a49c98 100644
Binary files a/fk101/wb_new_ui/assets/Hotupdate/denglu_bg_01.png and b/fk101/wb_new_ui/assets/Hotupdate/denglu_bg_01.png differ
diff --git a/fk101/wb_new_ui/assets/Hotupdate/package.xml b/fk101/wb_new_ui/assets/Hotupdate/package.xml
index 68d696b..b5933e8 100644
--- a/fk101/wb_new_ui/assets/Hotupdate/package.xml
+++ b/fk101/wb_new_ui/assets/Hotupdate/package.xml
@@ -19,6 +19,8 @@
+
+
diff --git a/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png b/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png and b/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png b/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png and b/fk101/wb_new_ui/assets/Info_MJ_ChangSha/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1-1.png b/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1-1.png and b/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1.png b/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1.png and b/fk101/wb_new_ui/assets/Info_MJ_GeJiu/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png b/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png and b/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png b/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png and b/fk101/wb_new_ui/assets/Info_MJ_HongZhong/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png b/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png and b/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png b/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png and b/fk101/wb_new_ui/assets/Info_MJ_ZhuanZhuan/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png
index 36c07f1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png
index 81244a4..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_ChangdeWHZ/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_ChunTian/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_FuLuShou/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_HSRunBeard/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_RunBeard/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_RunFastNew/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png b/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png
index cb7e8a1..5d123cd 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png and b/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1-1.png differ
diff --git a/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png b/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png and b/fk101/wb_new_ui/assets/Info_Poker_YueYangWHZ/icon1.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/Main.xml b/fk101/wb_new_ui/assets/Lobby/Main.xml
index 0892c70..3a3ab4b 100644
--- a/fk101/wb_new_ui/assets/Lobby/Main.xml
+++ b/fk101/wb_new_ui/assets/Lobby/Main.xml
@@ -10,66 +10,69 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -94,7 +97,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/SettingWindow1.xml b/fk101/wb_new_ui/assets/Lobby/SettingWindow1.xml
index a7474f2..c3464f1 100644
--- a/fk101/wb_new_ui/assets/Lobby/SettingWindow1.xml
+++ b/fk101/wb_new_ui/assets/Lobby/SettingWindow1.xml
@@ -4,7 +4,7 @@
-
+
@@ -13,9 +13,9 @@
-
-
-
+
+
+
diff --git a/fk101/wb_new_ui/assets/Lobby/Win_JoinRoom.xml b/fk101/wb_new_ui/assets/Lobby/Win_JoinRoom.xml
index b9c9f6f..10a23ce 100644
--- a/fk101/wb_new_ui/assets/Lobby/Win_JoinRoom.xml
+++ b/fk101/wb_new_ui/assets/Lobby/Win_JoinRoom.xml
@@ -4,60 +4,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/Lobby/btnclose(1).xml b/fk101/wb_new_ui/assets/Lobby/btnclose(1).xml
index 5f68b7c..febd4e9 100644
--- a/fk101/wb_new_ui/assets/Lobby/btnclose(1).xml
+++ b/fk101/wb_new_ui/assets/Lobby/btnclose(1).xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/button/btn_back.xml b/fk101/wb_new_ui/assets/Lobby/component/button/btn_back.xml
index 1ba315e..8f24306 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/button/btn_back.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/button/btn_back.xml
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/button/images/fall_dialog_head_cancel.png b/fk101/wb_new_ui/assets/Lobby/component/button/images/fall_dialog_head_cancel.png
index f0f1d6e..243a2c5 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/button/images/fall_dialog_head_cancel.png and b/fk101/wb_new_ui/assets/Lobby/component/button/images/fall_dialog_head_cancel.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml b/fk101/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
index 7af35d7..5aa1bf7 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml
@@ -8,7 +8,7 @@
-
+
@@ -17,26 +17,26 @@
-
-
+
+
-
+
-
+
-
+
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/Button8.xml b/fk101/wb_new_ui/assets/Lobby/component/group/Button8.xml
index 60e79e0..71bbd8a 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/group/Button8.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/group/Button8.xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/Button9.xml b/fk101/wb_new_ui/assets/Lobby/component/group/Button9.xml
index f090877..067b5d4 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/group/Button9.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/group/Button9.xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml b/fk101/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml
index 2997b10..e2fa3c4 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/group/component/guoup_item.xml
@@ -1,19 +1,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/group.xml b/fk101/wb_new_ui/assets/Lobby/component/group/group.xml
index c34625a..03ce4e5 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/group/group.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/group/group.xml
@@ -6,13 +6,16 @@
+
+
+
-
+
@@ -24,7 +27,7 @@
-
+
@@ -39,7 +42,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/images/ann_chuangjianpaiyouquan.png b/fk101/wb_new_ui/assets/Lobby/component/group/images/ann_chuangjianpaiyouquan.png
index 35e676b..1fa1d7e 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/group/images/ann_chuangjianpaiyouquan.png and b/fk101/wb_new_ui/assets/Lobby/component/group/images/ann_chuangjianpaiyouquan.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/group/images/putongd.png b/fk101/wb_new_ui/assets/Lobby/component/group/images/putongd.png
index fea5944..7c7c2ea 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/group/images/putongd.png and b/fk101/wb_new_ui/assets/Lobby/component/group/images/putongd.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
index cb4f2b1..e65f85c 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_join_room.xml
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
index cdc5021..494bf5e 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_menu_top.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
index 2c0b2af..d57333b 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/index/Btn_more_group.xml
@@ -1,8 +1,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml b/fk101/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
index 57456cd..c76a707 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/index/Cgm_gold.xml
@@ -2,8 +2,7 @@
-
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/button_cjfj.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/button_cjfj.png
index 69d2c8c..f7ecca7 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/button_cjfj.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/button_cjfj.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/club_more.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/club_more.png
index 2f83864..5b7c3b2 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/club_more.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/club_more.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/exit_icon.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/exit_icon.png
index 79051b8..5c0b47b 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/exit_icon.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/exit_icon.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/icon_shuangcheng.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/icon_shuangcheng.png
index 7a89595..20577a5 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/icon_shuangcheng.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/icon_shuangcheng.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/index_icon_08.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/index_icon_08.png
index b4243a1..004a1f0 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/index_icon_08.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/index_icon_08.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/join_room_horizen.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/join_room_horizen.png
index b797d44..75f15c8 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/join_room_horizen.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/join_room_horizen.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/renwu.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/renwu.png
index 31fa995..15350d4 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/renwu.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/renwu.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/index/images/setting_icon.png b/fk101/wb_new_ui/assets/Lobby/component/index/images/setting_icon.png
index 69f29bb..482cd83 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/index/images/setting_icon.png and b/fk101/wb_new_ui/assets/Lobby/component/index/images/setting_icon.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/nav/guanbi(1).png b/fk101/wb_new_ui/assets/Lobby/component/nav/guanbi(1).png
index 34a915a..06691ac 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/nav/guanbi(1).png and b/fk101/wb_new_ui/assets/Lobby/component/nav/guanbi(1).png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/setting/Button5.xml b/fk101/wb_new_ui/assets/Lobby/component/setting/Button5.xml
index a7588ad..529aeaf 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/setting/Button5.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/setting/Button5.xml
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
index f0b590f..6b80c02 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml
@@ -6,31 +6,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
index 040597a..45cbdd4 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png
index bf2da76..e2f4ba1 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/image/mine_user_unlogin_btn.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png
index c3067f6..69d3628 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/real/button_submit.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_address1.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_address1.png
index a301c44..04b221f 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_address1.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_address1.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password1.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password1.png
index 86def6f..336698c 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password1.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password1.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password2.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password2.png
index aff9ff4..fe00364 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password2.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_password2.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_real_name1.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_real_name1.png
index 73b0184..e1129e4 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_real_name1.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_real_name1.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_wechat_icon_update.png b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_wechat_icon_update.png
index 96faa91..6664168 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_wechat_icon_update.png and b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/image/mine_wechat_icon_update.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
index 5112e10..372097a 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_address.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_invite.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_invite.xml
index 41de0f7..804f45b 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_invite.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_invite.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
index 6e7cb60..41d834b 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_password.xml
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_real.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_real.xml
index ff2449f..1758aca 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_real.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_real.xml
@@ -5,10 +5,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_wx.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_wx.xml
index 6923f36..78e871b 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_wx.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/user_opt/iuo_wx.xml
@@ -14,14 +14,14 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml b/fk101/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
index 9f7ca60..6bd5ff7 100644
--- a/fk101/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
+++ b/fk101/wb_new_ui/assets/Lobby/component/user_info/win_phone_password.xml
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/Lobby/images/Rectangle 479 (1).png b/fk101/wb_new_ui/assets/Lobby/images/Rectangle 479 (1).png
new file mode 100644
index 0000000..52ff971
Binary files /dev/null and b/fk101/wb_new_ui/assets/Lobby/images/Rectangle 479 (1).png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/bj.png b/fk101/wb_new_ui/assets/Lobby/images/bj.png
index ce18c00..21948eb 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/images/bj.png and b/fk101/wb_new_ui/assets/Lobby/images/bj.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/hall_bg@2x.png b/fk101/wb_new_ui/assets/Lobby/images/hall_bg@2x.png
index 1ca12aa..d13c70b 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/images/hall_bg@2x.png and b/fk101/wb_new_ui/assets/Lobby/images/hall_bg@2x.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/index/Group 1009.png b/fk101/wb_new_ui/assets/Lobby/images/index/Group 1009.png
new file mode 100644
index 0000000..555184c
Binary files /dev/null and b/fk101/wb_new_ui/assets/Lobby/images/index/Group 1009.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/index/bg_07.png b/fk101/wb_new_ui/assets/Lobby/images/index/bg_07.png
index 31e22b0..6abaeb7 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/images/index/bg_07.png and b/fk101/wb_new_ui/assets/Lobby/images/index/bg_07.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/index/hall_bottom.png b/fk101/wb_new_ui/assets/Lobby/images/index/hall_bottom.png
index 2219579..c11771b 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/images/index/hall_bottom.png and b/fk101/wb_new_ui/assets/Lobby/images/index/hall_bottom.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/images/index/head_bg@2x.png b/fk101/wb_new_ui/assets/Lobby/images/index/head_bg@2x.png
index 3f3840e..91cffbc 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/images/index/head_bg@2x.png and b/fk101/wb_new_ui/assets/Lobby/images/index/head_bg@2x.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/mainbg.png b/fk101/wb_new_ui/assets/Lobby/mainbg.png
index 4a07d36..c71bd70 100644
Binary files a/fk101/wb_new_ui/assets/Lobby/mainbg.png and b/fk101/wb_new_ui/assets/Lobby/mainbg.png differ
diff --git a/fk101/wb_new_ui/assets/Lobby/package.xml b/fk101/wb_new_ui/assets/Lobby/package.xml
index 739163b..dc8bbd7 100644
--- a/fk101/wb_new_ui/assets/Lobby/package.xml
+++ b/fk101/wb_new_ui/assets/Lobby/package.xml
@@ -325,6 +325,8 @@
+
+
diff --git a/fk101/wb_new_ui/assets/Login/Main.xml b/fk101/wb_new_ui/assets/Login/Main.xml
index ec64cd7..bb697f2 100644
--- a/fk101/wb_new_ui/assets/Login/Main.xml
+++ b/fk101/wb_new_ui/assets/Login/Main.xml
@@ -8,9 +8,9 @@
-
-
-
+
+
+
diff --git a/fk101/wb_new_ui/assets/Login/commpoent/Btn_phone.xml b/fk101/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
index cd5467f..b925f6a 100644
--- a/fk101/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
+++ b/fk101/wb_new_ui/assets/Login/commpoent/Btn_phone.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Login/commpoent/Btn_wx.xml b/fk101/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
index 3e98736..4036c65 100644
--- a/fk101/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
+++ b/fk101/wb_new_ui/assets/Login/commpoent/Btn_wx.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml b/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
index 7c944e3..52fc493 100644
--- a/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
+++ b/fk101/wb_new_ui/assets/Login/commpoent/win_phoneLogin.xml
@@ -6,11 +6,11 @@
-
+
-
-
+
+
@@ -20,9 +20,9 @@
-
+
-
+
@@ -37,11 +37,11 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/Login/component/setting/ann_denglu.png b/fk101/wb_new_ui/assets/Login/component/setting/ann_denglu.png
index 257e666..8147737 100644
Binary files a/fk101/wb_new_ui/assets/Login/component/setting/ann_denglu.png and b/fk101/wb_new_ui/assets/Login/component/setting/ann_denglu.png differ
diff --git a/fk101/wb_new_ui/assets/Login/images/btn_phone.png b/fk101/wb_new_ui/assets/Login/images/btn_phone.png
index 785bd21..623fb80 100644
Binary files a/fk101/wb_new_ui/assets/Login/images/btn_phone.png and b/fk101/wb_new_ui/assets/Login/images/btn_phone.png differ
diff --git a/fk101/wb_new_ui/assets/Login/images/button_wx.png b/fk101/wb_new_ui/assets/Login/images/button_wx.png
index f681180..5dbb955 100644
Binary files a/fk101/wb_new_ui/assets/Login/images/button_wx.png and b/fk101/wb_new_ui/assets/Login/images/button_wx.png differ
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_4.xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_4.xml
index f8512ea..036514c 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/Main_4.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_4.xml
@@ -2,7 +2,7 @@
-
+
@@ -76,26 +76,26 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -105,7 +105,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png
index 99b83ef..50714c8 100644
Binary files a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png and b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/queding1.png differ
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
index 1abf0a5..9159e73 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml
@@ -1,5 +1,5 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
index b45daa0..1f7b10e 100644
--- a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
+++ b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml
@@ -1,34 +1,28 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
-
-
@@ -38,13 +32,15 @@
-
+
+
+
diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/winnerBg.png b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/winnerBg.png
index a1ab4a0..062681c 100644
Binary files a/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/winnerBg.png and b/fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/winnerBg.png differ
diff --git a/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/big_result_item.xml b/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/big_result_item.xml
index 46e9a2c..ae6b614 100644
--- a/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/big_result_item.xml
+++ b/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/big_result_item.xml
@@ -20,7 +20,7 @@
-
+
@@ -38,7 +38,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/winnerBg.png b/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/winnerBg.png
index a1ab4a0..062681c 100644
Binary files a/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/winnerBg.png and b/fk101/wb_new_ui/assets/Main_PokeMaJiang/component/clearing/clearing2/winnerBg.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml b/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
index dc2c5b9..299f324 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Main_GroupInfo.xml
@@ -1,6 +1,6 @@
-
+
@@ -18,51 +18,51 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -75,30 +75,29 @@
-
+
-
+
-
-
-
+
+
-
+
-
+
-
-
-
+
+
+
@@ -114,7 +113,7 @@
-
+
@@ -124,7 +123,7 @@
-
+
@@ -137,10 +136,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_AddFriend.xml b/fk101/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
index aaf1d7d..1134825 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_AddFriend.xml
@@ -2,60 +2,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_AddPartner.xml b/fk101/wb_new_ui/assets/NewGroup/Win_AddPartner.xml
index 2829acf..3842781 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_AddPartner.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_AddPartner.xml
@@ -5,10 +5,10 @@
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_Banklog.xml b/fk101/wb_new_ui/assets/NewGroup/Win_Banklog.xml
index 88daaa6..a2c4dcf 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_Banklog.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_Banklog.xml
@@ -4,10 +4,10 @@
-
+
-
+
@@ -18,19 +18,19 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml b/fk101/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
index fe68a91..5ad506d 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_CreateGroup.xml
@@ -6,19 +6,19 @@
-
+
-
-
-
+
+
+
-
+
-
+
@@ -31,6 +31,6 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput0.xml b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
index 7bc1cc8..a5b0709 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput0.xml
@@ -4,60 +4,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput1.xml b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
index 7bc1cc8..004de9b 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput1.xml
@@ -4,60 +4,60 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput2.xml b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
index 03ed456..b39bb1e 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_FagInput2.xml
@@ -4,62 +4,62 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml b/fk101/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
index 13a385e..705c7c3 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_GroupSetting.xml
@@ -17,123 +17,123 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_Mail.xml b/fk101/wb_new_ui/assets/NewGroup/Win_Mail.xml
index 1d65c66..eae0e47 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_Mail.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_Mail.xml
@@ -4,7 +4,7 @@
-
+
@@ -12,15 +12,15 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml b/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
index a04ef18..183d712 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_ManagerView.xml
@@ -4,24 +4,23 @@
-
+
-
-
+
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerBanPlays.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerBanPlays.xml
index 1f6fa40..c87f1ed 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerBanPlays.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerBanPlays.xml
@@ -4,7 +4,7 @@
-
+
@@ -12,13 +12,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
index d719225..6bdbc1b 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerRewards.xml
@@ -1,11 +1,11 @@
-
+
-
+
@@ -14,18 +14,18 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatMember.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatMember.xml
index 76638c4..32e48ed 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatMember.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatMember.xml
@@ -6,30 +6,30 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
@@ -38,7 +38,7 @@
-
+
@@ -47,15 +47,15 @@
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatPlay.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatPlay.xml
index 6cdc839..e9ed241 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatPlay.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerStatPlay.xml
@@ -4,20 +4,20 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
index 4c57228..5093c14 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PartnerZuanShiMember.xml
@@ -6,27 +6,27 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -35,7 +35,7 @@
-
+
@@ -44,17 +44,17 @@
-
+
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
index 8077d9b..068b822 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfo.xml
@@ -6,33 +6,33 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml b/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
index 6ba1ef5..cf712b7 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_PlayerInfoForAdd.xml
@@ -6,23 +6,23 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_RewardsFaglog.xml b/fk101/wb_new_ui/assets/NewGroup/Win_RewardsFaglog.xml
index 3d1d163..47587af 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_RewardsFaglog.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_RewardsFaglog.xml
@@ -4,8 +4,8 @@
-
-
+
+
@@ -16,21 +16,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml b/fk101/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
index 8b08553..8dceb5c 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_SetAddPlayerHBView.xml
@@ -1,16 +1,16 @@
-
-
-
+
+
+
-
+
-
+
@@ -23,12 +23,12 @@
-
-
+
+
-
+
@@ -40,22 +40,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_SetDefaultGame.xml b/fk101/wb_new_ui/assets/NewGroup/Win_SetDefaultGame.xml
index ddba7ef..6edfe5c 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_SetDefaultGame.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_SetDefaultGame.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_SetTag.xml b/fk101/wb_new_ui/assets/NewGroup/Win_SetTag.xml
index 68190de..77b8aed 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_SetTag.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_SetTag.xml
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_StatMember.xml b/fk101/wb_new_ui/assets/NewGroup/Win_StatMember.xml
index 013fa6e..4e1f149 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_StatMember.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_StatMember.xml
@@ -4,27 +4,27 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -36,7 +36,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_TakeHp.xml b/fk101/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
index 5dd8cf3..d958152 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_TakeHp.xml
@@ -4,62 +4,62 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_Takelog.xml b/fk101/wb_new_ui/assets/NewGroup/Win_Takelog.xml
index 028d830..ebb8834 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_Takelog.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_Takelog.xml
@@ -4,8 +4,8 @@
-
-
+
+
@@ -16,19 +16,19 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/Win_bxx.xml b/fk101/wb_new_ui/assets/NewGroup/Win_bxx.xml
index aebb110..45613e0 100644
--- a/fk101/wb_new_ui/assets/NewGroup/Win_bxx.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/Win_bxx.xml
@@ -1,65 +1,65 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/btnclose.xml b/fk101/wb_new_ui/assets/NewGroup/btnclose.xml
index c27af9f..34367ed 100644
--- a/fk101/wb_new_ui/assets/NewGroup/btnclose.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/btnclose.xml
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/btn_req.xml b/fk101/wb_new_ui/assets/NewGroup/component/Btn/btn_req.xml
index 87fe84a..abd8ae0 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Btn/btn_req.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Btn/btn_req.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
index 3483a91..b744324 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/btn_date.xml
@@ -2,11 +2,11 @@
-
-
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/cb_di.png b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/cb_di.png
index d44bb87..a99a159 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/cb_di.png and b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/cb_di.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/com_set_time.xml b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/com_set_time.xml
index c0aa9a7..fbc049d 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/com_set_time.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Btn/date_set/com_set_time.xml
@@ -2,8 +2,8 @@
-
-
+
+
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml
index 5150407..ee020b6 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_fag/Item_fag_info.xml
@@ -11,21 +11,21 @@
-
+
-
-
+
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
index 4338f8d..f453e1e 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_friend/Item_friend_fag_record.xml
@@ -1,30 +1,30 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml
index 0f9f877..f945f86 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_Game_Type.xml
@@ -1,10 +1,10 @@
-
+
-
-
-
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_bxx_type.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_bxx_type.xml
index 22096f2..db86598 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_bxx_type.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_bxx_type.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_choose.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_choose.xml
index 2962116..e5aead8 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_choose.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_choose.xml
@@ -1,17 +1,17 @@
-
+
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
index de54cf6..46e86c0 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/Btn_start.xml
@@ -1,12 +1,12 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
index a23d67e..4a98e2a 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/Lst_info/btn_layer_item.xml
@@ -1,14 +1,14 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/mail/item_fg_mail.xml b/fk101/wb_new_ui/assets/NewGroup/component/mail/item_fg_mail.xml
index 81e85d3..8a867ef 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/mail/item_fg_mail.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/mail/item_fg_mail.xml
@@ -7,13 +7,13 @@
-
+
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/mail/yj1.png b/fk101/wb_new_ui/assets/NewGroup/component/mail/yj1.png
index aa2e244..1f5f5b6 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/mail/yj1.png and b/fk101/wb_new_ui/assets/NewGroup/component/mail/yj1.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_.xml b/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_.xml
index faf0644..9860d4a 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml b/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
index 166986a..b41a4ef 100644
--- a/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/component/nav/Btn_menu_h.xml
@@ -2,12 +2,14 @@
-
-
+
+
+
+
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/ann_chaxun.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/ann_chaxun.png
index 21411f4..1f1cb26 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/ann_chaxun.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/ann_chaxun.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/bg_02.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/bg_02.png
index 238a24b..10d4578 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/bg_02.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/bg_02.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_+_02.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_+_02.png
index dca3d4e..def0f27 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_+_02.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_+_02.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_-.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_-.png
index ede0ea0..4d6d2f3 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_-.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_-.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_08.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_08.png
index 3665974..a94c5af 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_08.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_08.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_chakan.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_chakan.png
index b4b836a..d68001f 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_chakan.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_chakan.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_cz.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_cz.png
index e509ad5..ce3baf4 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_cz.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_cz.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_jfjl.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_jfjl.png
index 1838d27..ebe44ea 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/button_jfjl.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/button_jfjl.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/bxxx.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/bxxx.png
index 2046da3..0f06297 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/bxxx.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/bxxx.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/guanbi.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/guanbi.png
index c02a83b..06691ac 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/guanbi.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/guanbi.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png
index 2766dc9..14f16d9 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/hengtiao3.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/match_back.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/match_back.png
index 79051b8..243a2c5 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/match_back.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/match_back.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png
index ba5642b..d553bf0 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/match_left_btn_selected.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/sd.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/sd.png
index 2e898fc..14f16d9 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/sd.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/sd.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png b/fk101/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png
index ad20a7c..14f16d9 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png and b/fk101/wb_new_ui/assets/NewGroup/component/nav/tj_bg_07.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/Button10.xml b/fk101/wb_new_ui/assets/NewGroup/images/Button10.xml
index cd94e4a..646fa48 100644
--- a/fk101/wb_new_ui/assets/NewGroup/images/Button10.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/images/Button10.xml
@@ -10,7 +10,7 @@
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/Button9.xml b/fk101/wb_new_ui/assets/NewGroup/images/Button9.xml
index 70f0d69..8449f13 100644
--- a/fk101/wb_new_ui/assets/NewGroup/images/Button9.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/images/Button9.xml
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/XRL.png b/fk101/wb_new_ui/assets/NewGroup/images/XRL.png
index 3a9e94c..a5398fc 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/XRL.png and b/fk101/wb_new_ui/assets/NewGroup/images/XRL.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/bg_tk_02.png b/fk101/wb_new_ui/assets/NewGroup/images/bg_tk_02.png
index 2a25d7c..19a3678 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/bg_tk_02.png and b/fk101/wb_new_ui/assets/NewGroup/images/bg_tk_02.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/button_cqg.png b/fk101/wb_new_ui/assets/NewGroup/images/button_cqg.png
index 70a4f5a..20e1092 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/button_cqg.png and b/fk101/wb_new_ui/assets/NewGroup/images/button_cqg.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png b/fk101/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png
index 70a4f5a..20e1092 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png and b/fk101/wb_new_ui/assets/NewGroup/images/button_cqg_xz.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl.png b/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl.png
index 9ae3517..da97ecf 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl.png and b/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png b/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png
index 9ae3517..da97ecf 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png and b/fk101/wb_new_ui/assets/NewGroup/images/button_sjjl_xz.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/button_xq.png b/fk101/wb_new_ui/assets/NewGroup/images/button_xq.png
index 060d2e0..d3827e6 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/button_xq.png and b/fk101/wb_new_ui/assets/NewGroup/images/button_xq.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/index/ann_kuaisukaishi.png b/fk101/wb_new_ui/assets/NewGroup/images/index/ann_kuaisukaishi.png
index 41dfe25..bcca34e 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/index/ann_kuaisukaishi.png and b/fk101/wb_new_ui/assets/NewGroup/images/index/ann_kuaisukaishi.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/button-02.png b/fk101/wb_new_ui/assets/NewGroup/images/info/button-02.png
index fd0dd4e..ba03172 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/button-02.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/button-02.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/button_01.png b/fk101/wb_new_ui/assets/NewGroup/images/info/button_01.png
index 7e8a17d..8ce06a0 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/button_01.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/button_01.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/button_11.png b/fk101/wb_new_ui/assets/NewGroup/images/info/button_11.png
index c3287f2..5fceeb4 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/button_11.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/button_11.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/gl.png b/fk101/wb_new_ui/assets/NewGroup/images/info/gl.png
index 4f274de..f396cf5 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/gl.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/gl.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/hhr.png b/fk101/wb_new_ui/assets/NewGroup/images/info/hhr.png
index e050657..8d239a1 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/hhr.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/hhr.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/right_panel/bxg.png b/fk101/wb_new_ui/assets/NewGroup/images/info/right_panel/bxg.png
index e1869bf..53b7f8c 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/right_panel/bxg.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/right_panel/bxg.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/tj.png b/fk101/wb_new_ui/assets/NewGroup/images/info/tj.png
index a91b875..9dbc8d5 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/tj.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/tj.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/tlzxqtb.png b/fk101/wb_new_ui/assets/NewGroup/images/info/tlzxqtb.png
index 21c7bd8..5ebc77a 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/tlzxqtb.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/tlzxqtb.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/info/wf.png b/fk101/wb_new_ui/assets/NewGroup/images/info/wf.png
index d9f8d95..c8d7bf3 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/info/wf.png and b/fk101/wb_new_ui/assets/NewGroup/images/info/wf.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/kuang2.png b/fk101/wb_new_ui/assets/NewGroup/images/kuang2.png
index 964a98f..0677a14 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/kuang2.png and b/fk101/wb_new_ui/assets/NewGroup/images/kuang2.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/kuang5.png b/fk101/wb_new_ui/assets/NewGroup/images/kuang5.png
index 964a98f..cd16d71 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/kuang5.png and b/fk101/wb_new_ui/assets/NewGroup/images/kuang5.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/main/ann_queding.png b/fk101/wb_new_ui/assets/NewGroup/images/main/ann_queding.png
index ad6398a..50714c8 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/main/ann_queding.png and b/fk101/wb_new_ui/assets/NewGroup/images/main/ann_queding.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/main/di3(1).png b/fk101/wb_new_ui/assets/NewGroup/images/main/di3(1).png
index 5e5a79b..a5e0537 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/main/di3(1).png and b/fk101/wb_new_ui/assets/NewGroup/images/main/di3(1).png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/swqb.png b/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/swqb.png
index d4c32ea..09c7124 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/swqb.png and b/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/swqb.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/xg.png b/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/xg.png
index eedf1f6..2ac8560 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/xg.png and b/fk101/wb_new_ui/assets/NewGroup/images/partner_rewards/xg.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/quyxtb.png b/fk101/wb_new_ui/assets/NewGroup/images/quyxtb.png
index 8089f0d..701feb6 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/quyxtb.png and b/fk101/wb_new_ui/assets/NewGroup/images/quyxtb.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/tj_button_ck_01.png b/fk101/wb_new_ui/assets/NewGroup/images/tj_button_ck_01.png
index 34054d6..9c16294 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/tj_button_ck_01.png and b/fk101/wb_new_ui/assets/NewGroup/images/tj_button_ck_01.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/images/wf_bg_02.png b/fk101/wb_new_ui/assets/NewGroup/images/wf_bg_02.png
index d12761b..6b9acd9 100644
Binary files a/fk101/wb_new_ui/assets/NewGroup/images/wf_bg_02.png and b/fk101/wb_new_ui/assets/NewGroup/images/wf_bg_02.png differ
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
index 19d905f..2931993 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagList.xml
@@ -1,16 +1,16 @@
-
+
-
+
-
+
-
-
+
+
@@ -26,26 +26,26 @@
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -58,10 +58,10 @@
-
+
-
+
@@ -74,60 +74,60 @@
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagPackStat.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagPackStat.xml
index e8e042d..c9375c4 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagPackStat.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupFagPackStat.xml
@@ -1,34 +1,34 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
index b1a1834..59abe97 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupGameList.xml
@@ -1,14 +1,14 @@
-
+
-
+
-
+
@@ -16,12 +16,12 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInfo.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInfo.xml
index 9c8d83d..576676a 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInfo.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberInfo.xml
@@ -3,11 +3,11 @@
-
-
+
+
-
-
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
index c72492b..665cd4e 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupMemberList1.xml
@@ -1,45 +1,45 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -49,7 +49,7 @@
-
+
@@ -59,39 +59,39 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
@@ -121,24 +121,24 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
index ba70fb1..a779ed5 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList.xml
@@ -1,9 +1,9 @@
-
+
-
+
@@ -12,38 +12,38 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -56,7 +56,7 @@
-
+
@@ -69,10 +69,10 @@
-
+
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
index 83d0040..50797ec 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerList1.xml
@@ -1,9 +1,9 @@
-
+
-
+
@@ -23,24 +23,24 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
@@ -53,7 +53,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
diff --git a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
index f447137..7da6f90 100644
--- a/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
+++ b/fk101/wb_new_ui/assets/NewGroup/mgr/View_GroupPartnerStat.xml
@@ -1,10 +1,10 @@
-
-
-
+
+
+
-