diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index d544a211..e6f9aa5b 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -5,6 +5,9 @@ "ui://m7iejg46jgh8hwv", "ui://1hl55dqmc4r115", "ui://yzaioi79f55qwa", + "ui://5cdldr01qaqf9c", + "ui://5cdldr01qaqf6x", + "ui://5cdldr01qaqf7q", "ui://yzaioi79f55qw4", "ui://yzaioi79f55qw7", "ui://yzaioi79fgao1dk", @@ -18,7 +21,7 @@ "test.device": "Xiaomi 9", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://yzaioi79f55qwa", + "doc.activeDoc": "ui://5cdldr01qaqf9c", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", @@ -44,6 +47,8 @@ "5cdldr01", "/component/Main/images/", "5cdldr01", + "/component/Main/new_ui/", + "5cdldr01", "/component/game/", "yzaioi79", "/", diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml index 64ef6450..87a78bc2 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_1.xml @@ -1,20 +1,20 @@ - - - - - - + + + + + + - - - - - + + + + + - + @@ -56,7 +56,6 @@ - @@ -77,10 +76,16 @@ - - - - + + + + + + + + + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml index 28cbcd3c..0b0c7b6d 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/PlayerHead_2.xml @@ -1,19 +1,19 @@ - - - - - - + + + + + + - - - - - + + + + + - + @@ -60,10 +60,10 @@ - - - - + + + + @@ -77,10 +77,10 @@ - - - - + + + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml index cd459cce..17789a27 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_1.xml @@ -63,10 +63,10 @@ - - - - + + + + @@ -94,10 +94,10 @@ - - - - + + + + diff --git a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml index 62893703..b746ec36 100644 --- a/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml +++ b/fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/PlayerHead_2.xml @@ -1,17 +1,17 @@ - - + + - - - + + + - - - - + + + + @@ -68,10 +68,10 @@ - - - - + + + + @@ -92,10 +92,10 @@ - - - - + + + + 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 369dc9e7..2172ab4a 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 69a0825f..0415de9a 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