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..f0421b7c 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/fonts.json b/fk101/wb_new_ui/.objs/fonts.json index 9f6d8931..b05845ea 100644 --- a/fk101/wb_new_ui/.objs/fonts.json +++ b/fk101/wb_new_ui/.objs/fonts.json @@ -41,8 +41,6 @@ ui://3n2top74kpmgp6 ui://3n2top74kpmgi ui://3n2top74kpmg8h ui://3n2top74kpmg8u -ui://9n9stu2enaueci9 -ui://9n9stu2enauecht ui://awernf6xbazq7b ui://awernf6xbazq7a ui://qpsoxvainaueci9 @@ -67,20 +65,10 @@ ui://3z9lj55vjokml9 ui://3z9lj55vjokmm9 ui://3z9lj55vjokmfx ui://3z9lj55vjokm7m -ui://v0j9abjygq7m7 -ui://v0j9abjygq7mw -ui://v0j9abjygq7mk -ui://v0j9abjygq7m19 -ui://v0j9abjygq7m3l -ui://v0j9abjygq7m53 -ui://v0j9abjygq7m34 -ui://v0j9abjygq7m6k -ui://v0j9abjygq7mhi ui://4skil1l6vmtu1kv ui://4skil1l6vmtu1l8 ui://4skil1l6piv91ln ui://4skil1l6jsw9117 ui://5cdldr01qaqf72 ui://5cdldr01qaqf9d -ui://35sf1c1fr05e8v ui://m7iejg46gjxx7iab diff --git a/fk101/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info b/fk101/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info index fe5cc2d7..8e3c2f95 100644 --- a/fk101/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info +++ b/fk101/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info @@ -1,5 +1,8 @@ { "objectStatus": { + "n85_fgao": { + "hidden": true + }, "n86_fgao": { "hidden": true }, @@ -7,6 +10,9 @@ "hidden": true, "collapsed": true }, + "n80_fgao": { + "hidden": true + }, "n54_mk2u": { "hidden": true, "collapsed": true diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 4353208d..255a95e1 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,6 +1,5 @@ { "libview.firstColumnWidth": 356, - "test.device": "Xiaomi 9", "libview.iconScale": 0, "doc.openedDocs": [ "ui://27vd145bhxjc7i4q", @@ -16,7 +15,6 @@ "ui://oubpz2r2ofil7k", "ui://442j0uepygxga", "ui://3n2top74kpmgkd", - "ui://9n9stu2eprgzee", "ui://awernf6xbazq7n", "ui://qpsoxvaiprgzee", "ui://b8jloj2qg8ktcmb", @@ -32,6 +30,38 @@ "ui://425x67nrs9wx7", "ui://kplym8mus9wx7", "ui://3z9lj55vjokmft", + "ui://ypulwxjhl9mn37", + "ui://c7j2rnvqtpf08x", + "ui://fnuxqeflkllg1x", + "ui://egnzysm7ffp3b2", + "ui://v2hilfzbgq7me6", + "ui://k15boclkl9mn37", + "ui://oubpz2r2ofil8x", + "ui://442j0uepdafga8", + "ui://3n2top74kpmgmh", + "ui://awernf6xbazq90", + "ui://qpsoxvaiprgzf0", + "ui://b8jloj2qprgzf0", + "ui://3op8sm5eu86s3p", + "ui://niy3ldiwl9mn37", + "ui://3z9lj55vjokmwr", + "ui://3z9lj55vjokm7l", + "ui://4skil1l6ms5spy", + "ui://4skil1l6r6qo1kc", + "ui://5cdldr01qaqf9c", + "ui://5cdldr01qaqfa4", + "ui://5cdldr01qaqfaw", + "ui://yzaioi79f55qwa", + "ui://yzaioi79f55qva", + "ui://yzaioi79f55qvp", + "ui://yzaioi79f55qvt", + "ui://yzaioi79f55qvn", + "ui://5cdldr01qaqfe0", + "ui://yzaioi79fgao1dn", + "ui://yzaioi79voqg1dy", + "ui://yzaioi79mk2u138", + "ui://27vd145bycze3m", + "ui://27vd145bkzpehy5", "ui://27vd145blwcl28", "ui://m7iejg46mpllhuq", "ui://3z9lj55vjokmet", @@ -41,16 +71,20 @@ "ui://4skil1l6piv91ny", "ui://niy3ldiwl9mny", "ui://niy3ldiwl9mn19", - "ui://9n9stu2eprgzei", - "ui://9n9stu2eprgzef", "ui://27vd145bpgy941" ], - "auxline1": true, + "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://27vd145blwcl28", + "doc.activeDoc": "ui://yzaioi79f55qwa", "libview.twoColumn": false, - "libview.expandedNodes": [], + "libview.expandedNodes": [ + "yzaioi79", + "/", + "yzaioi79", + "/component/" + ], + "auxline1": true, "snapToGrid": true, "test.orientation": "landscape", "backgroundColor": 6710886, diff --git a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml index 593b4478..012d34d9 100644 --- a/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml +++ b/fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml @@ -1,7 +1,7 @@ - + - + diff --git a/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml b/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml index 9610a0a6..11228b2c 100644 --- a/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml +++ b/fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml @@ -1,7 +1,7 @@ - + - +