diff --git a/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index e552e0f9..7b7ae944 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -2,14 +2,13 @@ "libview.firstColumnWidth": 367, "libview.iconScale": 0, "doc.openedDocs": [ - "ui://m7iejg46ruljhmp", - "ui://2d9xdj6zngxlckb", - "ui://27vd145bko559b" + "ui://m7iejg46l7wn7i83", + "ui://m7iejg4610xl7i1w" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://27vd145bko559b", + "doc.activeDoc": "ui://m7iejg46l7wn7i83", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -23,12 +22,12 @@ "27vd145b", "/font/", "27vd145b", + "/font/fontTitle/", + "27vd145b", "/font/images/", "27vd145b", "/font/images/btn_keyboard/", "27vd145b", - "/font/images/win/", - "27vd145b", "/images/", "27vd145b", "/images/btn_keyboard/", @@ -50,6 +49,10 @@ "/component/user_info/", "2d9xdj6z", "/component/user_info/edit/", + "2d9xdj6z", + "/images/", + "2d9xdj6z", + "/images/new/", "v0j9abjy", "/", "v0j9abjy", @@ -63,17 +66,7 @@ "lx6k641g", "/image/", "m7iejg46", - "/", - "m7iejg46", - "/component/", - "m7iejg46", - "/component/Lst_info/", - "m7iejg46", - "/component/nav/", - "m7iejg46", - "/images/", - "m7iejg46", - "/mgr/" + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png index da07a77f..ef58122f 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/ann_huang.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png index 2c6e631b..151c8781 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_qr_01.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png index c954482a..f6a707e2 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_sc_01.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png index f08504ad..6ef022d5 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/qb.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png index 08f58517..202b8dab 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_01.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png index cf31c0fe..33e0e45e 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_02.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png index 1d7ef28d..75c3b29b 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_03.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png index 58b4e405..a82e9212 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_04.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png index bf8b98ce..91179a0c 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_05.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png index fb13a7f6..774cf5e9 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_06.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png index 3cc4fbed..26f4e62c 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_07.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png index bb0de685..abd2fea5 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_08.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png index 57640deb..bcaa6619 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_09.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png index 35cf2343..09bf8100 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/shuzi_10.png differ diff --git a/wb_new_ui/assets/Common/font/images/setting/off.png b/wb_new_ui/assets/Common/font/images/setting/off.png index d31aed9b..c1b776ef 100644 Binary files a/wb_new_ui/assets/Common/font/images/setting/off.png and b/wb_new_ui/assets/Common/font/images/setting/off.png differ diff --git a/wb_new_ui/assets/Common/font/images/setting/on.png b/wb_new_ui/assets/Common/font/images/setting/on.png index 925f51a7..8462ab49 100644 Binary files a/wb_new_ui/assets/Common/font/images/setting/on.png and b/wb_new_ui/assets/Common/font/images/setting/on.png differ diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml index a757bae2..269a20d3 100644 --- a/wb_new_ui/assets/Lobby/SettingWindow1.xml +++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml @@ -2,7 +2,7 @@ - + @@ -24,10 +24,10 @@