diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info b/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info index 82a50b32..0e4619a4 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/lumrgj.info @@ -12,6 +12,9 @@ "n137_csp4": { "hidden": true }, + "n135_csp4": { + "hidden": true + }, "n120_t3ax": { "hidden": true }, diff --git a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info index 8a1c5c15..824469bb 100644 --- a/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info +++ b/wb_new_ui/.objs/metas/2zlli80m/r6cyce9.info @@ -3,6 +3,9 @@ "n23_ab5p": { "hidden": true }, + "n46_rtih": { + "hidden": true + }, "n22_ab5p": { "hidden": true } diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index f3d5aa9f..85d23c98 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -4,9 +4,9 @@ "doc.openedDocs": [ "ui://m7iejg46ilon7ias", "ui://m7iejg46ilon7ia2", - "ui://m7iejg4610snh5j", "ui://m7iejg46cvc87i5y", "ui://m7iejg46r0qx7i6u", + "ui://27vd145bcvc87i5t", "ui://m7iejg46ruljhmp", "ui://m7iejg46r96th8e", "ui://m7iejg4610xl7i1w", @@ -15,18 +15,13 @@ "ui://m7iejg46kwi0hmb", "ui://m7iejg46kwi0hk0", "ui://m7iejg46qlxihsm", - "ui://m7iejg46kwi0hk1", "ui://m7iejg46ilon7i9k", - "ui://m7iejg46tt6k7ika", - "ui://m7iejg46lf2qhju", - "ui://m7iejg46l7wn7i81", "ui://m7iejg46kwdo7i97", "ui://m7iejg468h207i99", "ui://m7iejg46nwgkhx0", "ui://m7iejg46nwgkhx2", "ui://m7iejg46kk3uhro", "ui://m7iejg46l7wn7i83", - "ui://m7iejg46k5m97i76", "ui://m7iejg46tqi8hwa", "ui://m7iejg46f6brhwx", "ui://m7iejg46imp57ih3", @@ -38,30 +33,12 @@ "ui://m7iejg46hsbhhjn", "ui://2d9xdj6zlumrgj", "ui://2d9xdj6znlwcgk", - "ui://m7iejg46yvb27ik0", - "ui://m7iejg46mpllhuq", - "ui://2d9xdj6znaupko", - "ui://2d9xdj6zsvin7e2f", - "ui://2zlli80mr6cyce9", - "ui://egnzysm7ffp35o", - "ui://4skil1l6uwvl1qp", - "ui://4skil1l6piv91o7", - "ui://4skil1l6piv91o5", - "ui://4skil1l6piv91mg", - "ui://4skil1l6piv91nt", - "ui://4skil1l6piv91ny", - "ui://v0j9abjygq7mdl", - "ui://1utjt0r2ufu923", - "ui://1utjt0r2ufu945", - "ui://3qr8nmi4v38ku", - "ui://m7iejg46avqi7ijp", + "ui://2d9xdj6zl0lzb", + "ui://m7iejg4610snh5j", + "ui://2d9xdj6zfn7fao", + "ui://lx6k641gajzhoe", + "ui://lkq9ne9speuqbv", "ui://m7iejg46kk3uhrs", - "ui://m7iejg465ff3hud", - "ui://m7iejg46hsbhhj4", - "ui://m7iejg46irlqhyt", - "ui://m7iejg46jr1l7i3c", - "ui://m7iejg46lcv1hwt", - "ui://m7iejg46cioeho9", "ui://m7iejg46z3847i6r", "ui://m7iejg46z3847i6m", "ui://m7iejg46kwi0hkr" @@ -69,51 +46,23 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46ilon7ia2", + "doc.activeDoc": "ui://m7iejg4610snh5j", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", + "/buttons/", + "27vd145b", "/font/", "27vd145b", "/font/images/", "27vd145b", + "/font/images/btn_keyboard/", + "27vd145b", "/font/images/win/", - "2d9xdj6z", - "/", - "2d9xdj6z", - "/component/", - "2d9xdj6z", - "/component/group/", - "2d9xdj6z", - "/component/group/component/", - "2d9xdj6z", - "/component/group/images/", - "2d9xdj6z", - "/component/user_info/", - "2d9xdj6z", - "/images/", - "2d9xdj6z", - "/images/new/", "m7iejg46", - "/", - "m7iejg46", - "/component/", - "m7iejg46", - "/component/Btn/", - "m7iejg46", - "/component/Btn/date_set/", - "m7iejg46", - "/component/nav/", - "m7iejg46", - "/images/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/imgs/", - "m7iejg46", - "/mgr/imgs/numberHpAlone/" + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png index 2fd31da7..5040ce47 100644 Binary files a/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png and b/wb_new_ui/assets/Common/font/images/win/bxx_bg_01.png differ diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml index a678dc46..6f2d069e 100644 --- a/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml +++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/setting/SettingWindow1.xml @@ -17,7 +17,7 @@ - + diff --git a/wb_new_ui/assets/Lobby/SettingWindow1.xml b/wb_new_ui/assets/Lobby/SettingWindow1.xml index d1babb29..9c471519 100644 --- a/wb_new_ui/assets/Lobby/SettingWindow1.xml +++ b/wb_new_ui/assets/Lobby/SettingWindow1.xml @@ -4,7 +4,7 @@