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 e078dbbb..85f03107 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 f8239774..8d46756e 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/base/ui/Extend_Poker_RunFastNew_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png index c635875d..ca718339 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png index 7fb99d2b..728352a5 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_atlas_prgzf7.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes index e815dc19..9b289d6c 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Extend_Poker_RunFastNew_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png index 0432708c..e9e3f5bc 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png index b35e1357..b1e41936 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_1.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png index f71057ab..130c8d22 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_2.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png index c0bdb23f..f2379c3f 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_atlas0_3.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes index 713544c4..b45fca6c 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_Majiang_fui.bytes differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png index 00d20ccd..d92b11a5 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png index c756b4d9..dcc14fc4 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_1.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png index 90b24e6b..4a10ab00 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_atlas0_2.png differ diff --git a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes index b722b8fe..c920b14f 100644 Binary files a/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_fui.bytes and b/fk101/qyq_new_unity/Assets/ART/base/ui/Main_RunBeard_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 ab4b6654..78256ea4 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 3bd21833..8d790170 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/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 6dd7c720..8baf6a4f 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,213 +1,13 @@ { - "libview.firstColumnWidth": 283, - "expanded_nodes": [ + "doc.openedDocs": [], + "libview.iconScale": 0, + "libview.currentGroup": "", + "libview.expandedNodes": [ "27vd145b", "/", - "m7iejg46", - "/" + "27vd145b", + "/conMui/" ], - "libview.iconScale": 0, - "doc.openedDocs": [ -<<<<<<< HEAD - "ui://l0ds4ys6h1uu26" -======= - "ui://3n2top74kpmgp5", - "ui://3n2top74kpmgp4", - "ui://3n2top74kpmgq4", - "ui://27vd145bl8gg53", - "ui://27vd145bhugj7i61", - "ui://bx1t0boos9wx7", - "ui://4skil1l6piv91ny", - "ui://v0j9abjygq7med", - "ui://3z9lj55vjokmft", - "ui://3z9lj55vjokmet", - "ui://3z9lj55vjokmei", - "ui://27vd145bofsx1e", - "ui://27vd145bep9w7ik3", - "ui://27vd145bcvc87i5t", - "ui://3z9lj55vjokmev", - "ui://3z9lj55vjokm9z", - "ui://3z9lj55vjokm8z", - "ui://3z9lj55vjokmfu", - "ui://4skil1l6piv91mg", - "ui://4skil1l6piv91o5", - "ui://v0j9abjygq7md1", - "ui://v0j9abjygq7mct", - "ui://v0j9abjygq7md3", - "ui://bx1t0boos9wx8", - "ui://bx1t0boos9wxa", - "ui://bx1t0boos9wx9", - "ui://c7j2rnvqtpf02f", - "ui://27vd145bimywcd5", - "ui://c7j2rnvqtpf01r", - "ui://c7j2rnvqtpf02g", - "ui://c7j2rnvqtpf02b", - "ui://y8prev1ms9wx7", - "ui://y8prev1ms9wx8", - "ui://y8prev1ms9wx9", - "ui://y8prev1ms9wxa", - "ui://b50sd5s6s9wx7", - "ui://b50sd5s6s9wx8", - "ui://b50sd5s6s9wx9", - "ui://b50sd5s6s9wxa", - "ui://xul2z8cts9wx7", - "ui://xul2z8cts9wx8", - "ui://xul2z8cts9wx9", - "ui://xul2z8cts9wxa", - "ui://visk5g30gq7mo", - "ui://visk5g30gq7m18", - "ui://visk5g30gq7m1b", - "ui://visk5g30gq7m2c", - "ui://visk5g30gq7m45", - "ui://visk5g30gq7m48", - "ui://visk5g30gq7m2a", - "ui://kplym8mus9wxa", - "ui://egnzysm7ffp386", - "ui://s63l0suw6cpqv", - "ui://s63l0suw6cpqr", - "ui://s63l0suw6cpqt", - "ui://kplym8mus9wx8", - "ui://425x67nrs9wx8", - "ui://425x67nrs9wx9", - "ui://3z9lj55vjokm6h", - "ui://3z9lj55vjokmlo", - "ui://3z9lj55vjokmlr", - "ui://4skil1l6piv91nt", - "ui://v0j9abjygq7mcu", - "ui://3z9lj55vjokmdt", - "ui://3z9lj55vjokmdr", - "ui://442j0uepona1bm", - "ui://3z9lj55vjokme6", - "ui://3z9lj55vjokme4", - "ui://3z9lj55vjokmdq", - "ui://3z9lj55vjokme2", - "ui://niy3ldiwl9mny", - "ui://m7iejg4610snh5j", - "ui://27vd145b7jqkcdl", - "ui://s63l0suw6cpqs", - "ui://425x67nrs9wx7", - "ui://kplym8mus9wx7", - "ui://fnuxqeflnrnod", - "ui://egnzysm7ffp36a", - "ui://v2hilfzbgq7mde", - "ui://v2hilfzbgq7mc9", - "ui://ypulwxjhl9mn14", - "ui://k15boclkl9mn14", - "ui://oubpz2r2ofil7k", - "ui://27vd145bj0h759", - "ui://27vd145bvg2c4", - "ui://v6yvqp7wf55qwa", - "ui://35sf1c1fr05e8u", - "ui://35sf1c1fr05e5z", - "ui://m7iejg46l679hwn", - "ui://m7iejg46kwi0hm9", - "ui://m7iejg46kwi0hk0", - "ui://m7iejg46kwi0hm3", - "ui://m7iejg46qlxihsm", - "ui://m7iejg46kwi0hm5", - "ui://m7iejg46l679hws", - "ui://m7iejg46kwi0hls", - "ui://m7iejg46kwi0hmc", - "ui://m7iejg46n5sxha2", - "ui://35sf1c1fr05e4l", - "ui://35sf1c1fr05e4u", - "ui://35sf1c1fr05e9k", - "ui://35sf1c1fr05e57", - "ui://35sf1c1fr05e4r", - "ui://35sf1c1fr05e3w", - "ui://35sf1c1fr05e4c", - "ui://27vd145bl8gg54", - "ui://27vd145bcjli6", - "ui://27vd145bhznkce2", - "ui://27vd145blwcl28", - "ui://27vd145btjnvcg9", - "ui://27vd145btjnvcgc", - "ui://c7j2rnvqtpf03e", - "ui://visk5g30gq7m30", - "ui://v2hilfzbgq7mcl", - "ui://oubpz2r2ofil87", - "ui://3n2top74kpmgkn", - "ui://9n9stu2em9jahn", - "ui://awernf6xbazq8a", - "ui://qpsoxvaim9jahn", - "ui://3z9lj55vjokmey", - "ui://3z9lj55vjokmf5", - "ui://3z9lj55vjokmf7", - "ui://v0j9abjygq7mdo", - "ui://4skil1l6piv91mn", - "ui://b8jloj2qm9jahn", - "ui://3n2top74kpmge", - "ui://3n2top74kpmgh", - "ui://3n2top74kpmg2", - "ui://lx6k641gajzhoe", - "ui://3n2top74kpmgoh", - "ui://3n2top74kpmgoa", - "ui://3n2top74kpmgog", - "ui://3n2top74kpmgbc", - "ui://3n2top74kpmgdq", - "ui://3n2top74kpmge8", - "ui://3n2top74kpmg9f", - "ui://3n2top74kpmga4", - "ui://3n2top74kpmga1", - "ui://3z9lj55vjokm7l", - "ui://v0j9abjygq7m8f", - "ui://3z9lj55vjokm8c", - "ui://4skil1l6r6qo1kc", - "ui://3n2top74kpmgm2", - "ui://3n2top74kpmglv", - "ui://3n2top74kpmgm1", - "ui://96mvx2ml10kys6", - "ui://96mvx2mlocbrsh" ->>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99 - ], - "packageGroup.mine": [ - "2d9xdj6z" - ], - "test.device": "iPhone XR", - "canvasColor": 10066329, - "auxline2": true, -<<<<<<< HEAD - "doc.activeDoc": "ui://l0ds4ys6h1uu26", - "libview.twoColumn": false, - "libview.expandedNodes": [ - "l0ds4ys6", - "/" -======= - "doc.activeDoc": "ui://m7iejg46kwi0hls", - "libview.twoColumn": false, - "libview.expandedNodes": [ - "3z9lj55v", - "/", - "3z9lj55v", - "/Main_style_2/", - "3z9lj55v", - "/component/", - "3z9lj55v", - "/component/clearing/", - "3z9lj55v", - "/component/clearing/clearing1/", - "3z9lj55v", - "/component/clearing/clearing2/", - "3z9lj55v", - "/component/clearing/room/", - "3z9lj55v", - "/images/", - "m7iejg46", - "/", - "m7iejg46", - "/images/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/Mui/" ->>>>>>> cba10b0ffff21510cffe8fda2a55188ccbbfbe99 - ], - "auxline1": true, - "snapToGrid": true, - "test.orientation": "landscape", - "backgroundColor": 6710886, - "libview.currentGroup": "", - "hidden_packages": [], - "gridSize": 30, - "gridColor": 80 + "libview.firstColumnWidth": 413, + "libview.twoColumn": false } \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Common/package.xml b/fk101/wb_new_ui/assets/Common/package.xml index 51471dbc..c1c23272 100644 --- a/fk101/wb_new_ui/assets/Common/package.xml +++ b/fk101/wb_new_ui/assets/Common/package.xml @@ -1129,6 +1129,8 @@ + + diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png index 3061170d..0bb30d71 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png index 36374e42..5d2822f0 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png index fd5a67ba..fc91d6b1 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png index 32f45590..d3d64efc 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png index 4627c935..4c5cda72 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png index 62c0a7ae..881981cf 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png index d6971cd8..503d1c78 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png index 4deebdb9..6aa6cc5f 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png index 421cb107..c14ac7ac 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png index d51ea551..2c18a43c 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png index 7d35d7a7..92259489 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png index 6ab96435..a365b650 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png index 52d3e9b2..5c556ba5 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png index a4480c39..21901e44 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png index 2bd53e57..b1e23a47 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas1.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas1.png index 200edcce..8e570ef4 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas1.png and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes index f0b58ce2..7b9bb2b2 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png index 75d46b55..c1ecceab 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index 1e5ed686..2867deab 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png index 7a25e3f6..f46486f6 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png index 6b918d19..66cb5535 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png index ad63ba64..48ce2a1d 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png index b621183c..623db0af 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png index 3a6ebf6a..cfcb1c14 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png index ef973e52..36f84a0d 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png index 9b697b01..581ec245 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png index 9b697b01..581ec245 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png index a1f443dc..8a910384 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png index 32bf17b2..081d3028 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index 1e177ca9..6727c4d9 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png index 666078d1..fb133ba2 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png index ad181011..0df681db 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png index 2d760f3e..6a483f44 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png index 460be2bc..39354ea6 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas1.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png index 56448aeb..2bbe06cd 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas2.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_a6k77i7r.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_a6k77i7r.png index 5de487a1..aefe150b 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_a6k77i7r.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_a6k77i7r.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_csp47i44.png b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_csp47i44.png index dd071427..ae28c7db 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_csp47i44.png and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas_csp47i44.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes index 3e892ff3..8f0a41bc 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes differ