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 @@ - +