diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 722a296d..c2a1072f 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -22,6 +22,11 @@ "ui://niy3ldiwl9mn19", "ui://niy3ldiwl9mn10", "ui://5cdldr01qaqf2c", + "ui://5cdldr01qaqf2i", + "ui://5cdldr01qaqf2h", + "ui://5cdldr01qaqf2l", + "ui://5cdldr01qaqf2n", + "ui://5cdldr01qaqf2q", "ui://442j0uepygxga", "ui://3n2top74kpmgkd", "ui://awernf6xbazq7n", @@ -104,7 +109,7 @@ "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://niy3ldiwl9mn14", + "doc.activeDoc": "ui://5cdldr01qaqf2q", "libview.twoColumn": false, "libview.expandedNodes": [ "442j0uep", @@ -113,6 +118,14 @@ "/component/", "442j0uep", "/component/EPRHZMui/", + "niy3ldiw", + "/", + "niy3ldiw", + "/component/", + "niy3ldiw", + "/component/EPYYWHZMui/", + "niy3ldiw", + "/component/clearing/", "3z9lj55v", "/", "3z9lj55v", @@ -122,11 +135,15 @@ "5cdldr01", "/", "5cdldr01", + "/buttons/", + "5cdldr01", "/component/", "5cdldr01", "/component/Main/", "5cdldr01", "/component/clearing/", + "5cdldr01", + "/component/clearing/image/", "yzaioi79", "/", "yzaioi79", diff --git a/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/component/EPYYWHZMui/image.png b/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/component/EPYYWHZMui/image.png new file mode 100644 index 00000000..4aac0d44 Binary files /dev/null and b/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/component/EPYYWHZMui/image.png differ diff --git a/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/package.xml b/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/package.xml index 73fd19f7..ecae7bb7 100644 --- a/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/package.xml +++ b/fk101/wb_new_ui/assets/Extend_Poker_YueYangWHZ/package.xml @@ -139,21 +139,22 @@ - + - - - + + + - - - - - + + + + + - - + + + \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/big_zipai_result_item.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/big_zipai_result_item.xml index 7965254c..23adcf1a 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/big_zipai_result_item.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/big_zipai_result_item.xml @@ -1,15 +1,15 @@ - + - - - + + + - - + + @@ -18,7 +18,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/btn_result_close.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/btn_result_close.xml index 3e710f4f..c0bcc254 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/btn_result_close.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/btn_result_close.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_head.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_head.xml index b478449f..9232ffc2 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_head.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_head.xml @@ -1,7 +1,7 @@ - + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_main.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_main.xml index 4e6e67d0..0ef3109c 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_main.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_main.xml @@ -1,24 +1,24 @@ - - - + + + - + - + - + - + @@ -36,9 +36,9 @@ - + - + @@ -64,8 +64,8 @@ - - + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_queren_confirm.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_queren_confirm.xml index 7cc12d12..29c7c91f 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_queren_confirm.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_queren_confirm.xml @@ -1,7 +1,7 @@ - + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_result_share.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_result_share.xml index 9837b974..34c82005 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_result_share.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/clearing/zipai_btn_result_share.xml @@ -1,7 +1,7 @@ - + diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes index 5e4edc78..a1fa3759 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes differ diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_atlas0.png b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_atlas0.png index 9620309d..17b3952a 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_atlas0.png and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_atlas0.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes index b786211d..f0cfb241 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/extend/zipai/yueyangwaihuzi/ui/Extend_Poker_YueYangWHZ_fui.bytes differ