diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 7b21dd3e..027d90d6 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -63,6 +63,14 @@ "doc.activeDoc": "ui://yzaioi79f55qw5", "libview.twoColumn": false, "libview.expandedNodes": [ + "yzaioi79", + "/", + "yzaioi79", + "/component/", + "yzaioi79", + "/component/Main/", + "yzaioi79", + "/component/Main/component/", "m7iejg46", "/", "m7iejg46", diff --git a/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml b/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml index fb766469..e460b142 100644 --- a/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml +++ b/fk101/wb_new_ui/assets/Main_Majiang/Main_2.xml @@ -40,7 +40,7 @@ - + diff --git a/fk101/wb_new_ui/assets/Main_Majiang/component/Player_card_info_1(1).xml b/fk101/wb_new_ui/assets/Main_Majiang/component/Player_card_info_1(1).xml index d1af9402..ef402f86 100644 --- a/fk101/wb_new_ui/assets/Main_Majiang/component/Player_card_info_1(1).xml +++ b/fk101/wb_new_ui/assets/Main_Majiang/component/Player_card_info_1(1).xml @@ -10,8 +10,8 @@ - - + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml index 5d3c1dac..11a74724 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml @@ -4,8 +4,8 @@ - - + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml index 8c9afd3d..704380b4 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_1.xml @@ -17,7 +17,7 @@ - + diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml index b7899040..45154e0a 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Player_card_info_2.xml @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ - + 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 365fe611..8b790d32 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/main_zipai/ui/Main_RunBeard_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes index a9ca3879..b1d57cb6 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/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes index 27bacc59..3d8b12a9 100644 Binary files a/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes and b/fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/ui/Main_RunBeardMaJiang_fui.bytes differ