diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png index 85f03107..e078dbbb 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes index 8d46756e..f8239774 100644 Binary files a/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes and b/qyq_new_unity/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png index 4410d0db..8122a627 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png index e921c960..15f2dbf8 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png index 4416f295..bc07b6f1 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9t.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png index cef6e1ef..0fd687a2 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas_rbpg9u.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes index bd66e581..2721be6a 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_fui.bytes differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png index 743eac91..264250a7 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png index c1042649..97e3cd5a 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_1.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png index 96794687..998d2e45 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_2.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png index 17776330..24dfac85 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_3.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png index 4077b487..c1441f57 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_4.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png index 21dde2c5..64132595 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_5.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png index 8df0760c..cab171e9 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_6.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png index 70b3e020..7e76fd6b 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_atlas0_7.png differ diff --git a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes index 4e9249b3..0b6704df 100644 Binary files a/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes and b/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_bak_fui.bytes differ diff --git a/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info index d6938b5d..9e26dfee 100644 --- a/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info +++ b/wb_new_ui/.objs/metas/27vd145b/st2l7ijp.info @@ -1,7 +1 @@ -{ - "objectStatus": { - "n4_hz87": { - "hidden": true - } - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info index be6f6bd1..de50202c 100644 --- a/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info +++ b/wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info @@ -1,7 +1,7 @@ { "objectStatus": { - "n28": { - "collapsed": true + "n54_lwcl": { + "hidden": true }, "n125_g8kk": { "hidden": true, @@ -16,9 +16,6 @@ "n89_goju": { "hidden": true }, - "n54_lwcl": { - "hidden": true - }, "n130_naup": { "collapsed": true, "locked": true, diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 5e9cb71a..f3d5aa9f 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -3,10 +3,9 @@ "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg46ilon7ias", - "ui://m7iejg46i5987i75", + "ui://m7iejg46ilon7ia2", "ui://m7iejg4610snh5j", "ui://m7iejg46cvc87i5y", - "ui://m7iejg46nk4vhwh", "ui://m7iejg46r0qx7i6u", "ui://m7iejg46ruljhmp", "ui://m7iejg46r96th8e", @@ -17,51 +16,30 @@ "ui://m7iejg46kwi0hk0", "ui://m7iejg46qlxihsm", "ui://m7iejg46kwi0hk1", - "ui://m7iejg46kwi0hkb", "ui://m7iejg46ilon7i9k", - "ui://m7iejg46ilon7ia2", "ui://m7iejg46tt6k7ika", "ui://m7iejg46lf2qhju", "ui://m7iejg46l7wn7i81", "ui://m7iejg46kwdo7i97", "ui://m7iejg468h207i99", - "ui://m7iejg46r0qx7i6v", "ui://m7iejg46nwgkhx0", "ui://m7iejg46nwgkhx2", "ui://m7iejg46kk3uhro", "ui://m7iejg46l7wn7i83", - "ui://m7iejg46kwi0hm5", - "ui://m7iejg46l679hwn", - "ui://9n9stu2eprgzee", - "ui://9n9stu2em9jahb", "ui://m7iejg46k5m97i76", "ui://m7iejg46tqi8hwa", "ui://m7iejg46f6brhwx", - "ui://m7iejg46hsbhhjn", "ui://m7iejg46imp57ih3", - "ui://m7iejg46kwi0hma", - "ui://2zlli80mw9te0", - "ui://0khx14are0py2", - "ui://2d9xdj6zfn7fao", + "ui://m7iejg46imp57igy", + "ui://m7iejg46ilon7ibl", + "ui://2d9xdj6zab5pciv", + "ui://2d9xdj6zab5pcji", + "ui://2d9xdj6znld2cjm", + "ui://m7iejg46hsbhhjn", "ui://2d9xdj6zlumrgj", - "ui://m7iejg46jqcwc", - "ui://x3mp2cn6r5wqh", - "ui://27vd145bl0lz9", - "ui://m7iejg46jgh8hwv", - "ui://3qr8nmi4v38kq", - "ui://3qr8nmi4xtwh1n", - "ui://3qr8nmi4v38kr", - "ui://s63l0suw6cpqv", - "ui://s63l0suw6cpqr", - "ui://s63l0suw6cpqt", - "ui://s63l0suw6cpqs", - "ui://fnuxqeflnrnod", - "ui://fnuxqefl8kzvy", - "ui://fnuxqeflxtwhv", - "ui://fnuxqefl8kzv10", - "ui://egnzysm7ffp36a", - "ui://27vd145bpgy941", - "ui://2d9xdj6zxbqujn", + "ui://2d9xdj6znlwcgk", + "ui://m7iejg46yvb27ik0", + "ui://m7iejg46mpllhuq", "ui://2d9xdj6znaupko", "ui://2d9xdj6zsvin7e2f", "ui://2zlli80mr6cyce9", @@ -73,7 +51,6 @@ "ui://4skil1l6piv91nt", "ui://4skil1l6piv91ny", "ui://v0j9abjygq7mdl", - "ui://m7iejg46e5q7hu2", "ui://1utjt0r2ufu923", "ui://1utjt0r2ufu945", "ui://3qr8nmi4v38ku", @@ -82,35 +59,61 @@ "ui://m7iejg465ff3hud", "ui://m7iejg46hsbhhj4", "ui://m7iejg46irlqhyt", - "ui://m7iejg46ilon7ibl", "ui://m7iejg46jr1l7i3c", "ui://m7iejg46lcv1hwt", "ui://m7iejg46cioeho9", "ui://m7iejg46z3847i6r", - "ui://m7iejg46imp57ihp", "ui://m7iejg46z3847i6m", "ui://m7iejg46kwi0hkr" ], "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://m7iejg46r0qx7i6v", + "doc.activeDoc": "ui://m7iejg46ilon7ia2", "libview.twoColumn": false, "libview.expandedNodes": [ + "27vd145b", + "/", + "27vd145b", + "/font/", + "27vd145b", + "/font/images/", + "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", - "/images/bxx/", + "/mgr/", "m7iejg46", - "/mgr/" + "/mgr/imgs/", + "m7iejg46", + "/mgr/imgs/numberHpAlone/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml b/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml index 90eb266a..02f292cf 100644 --- a/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml +++ b/wb_new_ui/assets/Common/component/Win_BaseWindow_H698.xml @@ -8,7 +8,7 @@ - + diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png index 8f9ddee8..ab8051e6 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/cylb_buton_0.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 41f7922d..c954482a 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/dian.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/dian.png index dc795c72..83484f31 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/dian.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/dian.png differ diff --git a/wb_new_ui/assets/Common/font/images/btn_keyboard/ql.png b/wb_new_ui/assets/Common/font/images/btn_keyboard/ql.png index 5de4127c..9c80ec72 100644 Binary files a/wb_new_ui/assets/Common/font/images/btn_keyboard/ql.png and b/wb_new_ui/assets/Common/font/images/btn_keyboard/ql.png differ diff --git a/wb_new_ui/assets/Common/font/images/win/cha.png b/wb_new_ui/assets/Common/font/images/win/cha.png index a55abf78..75bf70c1 100644 Binary files a/wb_new_ui/assets/Common/font/images/win/cha.png and b/wb_new_ui/assets/Common/font/images/win/cha.png differ diff --git a/wb_new_ui/assets/Common/font/images/xiaoxi.png b/wb_new_ui/assets/Common/font/images/xiaoxi.png index bda65f47..48385230 100644 Binary files a/wb_new_ui/assets/Common/font/images/xiaoxi.png and b/wb_new_ui/assets/Common/font/images/xiaoxi.png differ diff --git a/wb_new_ui/assets/Common/images/Group 749.png b/wb_new_ui/assets/Common/images/Group 749.png index 74d48aca..4f0c719f 100644 Binary files a/wb_new_ui/assets/Common/images/Group 749.png and b/wb_new_ui/assets/Common/images/Group 749.png differ diff --git a/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml b/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml index 7af35d70..fc846b15 100644 --- a/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml +++ b/wb_new_ui/assets/Lobby/component/games/Win_CreateRoom.xml @@ -36,7 +36,7 @@