diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index 5822b874..b4195037 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -14,9 +14,13 @@ function FamilyNumberRecord.New(root, page) root.familyType.selectedIndex = 0 local comp_numberRecord = UIPackage.CreateObjectFromURL("ui://Family/comp_numberRecord") root._view:AddChild(comp_numberRecord) + --[[ comp_numberRecord.width = root._view.width comp_numberRecord.height = root._view.height - comp_numberRecord:Center() + comp_numberRecord:Center()]] + local scaleY = GRoot.inst.height / comp_numberRecord.height + local scaleX = GRoot.inst.width / comp_numberRecord.width + comp_numberRecord:SetScale(scaleX, scaleY) self._view = comp_numberRecord self._data_minPage = page - 1 diff --git a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml index 08d51729..0cfa51e5 100644 --- a/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml +++ b/wb_new_ui/assets/Family/CreateAndJoin/com_createAndJoin.xml @@ -5,11 +5,11 @@ - - - - - + + + + + @@ -17,7 +17,6 @@ - @@ -51,7 +50,7 @@ - + @@ -63,8 +62,11 @@ - + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Main.xml b/wb_new_ui/assets/Family/Main.xml index 9260eef4..3767b5b1 100644 --- a/wb_new_ui/assets/Family/Main.xml +++ b/wb_new_ui/assets/Family/Main.xml @@ -1,6 +1,6 @@ - + @@ -171,6 +171,7 @@ + diff --git a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml index 1cd8064e..6aebcf54 100644 --- a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml +++ b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml @@ -1,12 +1,19 @@ - + + + + + + + + @@ -42,7 +49,7 @@ - + @@ -68,29 +75,29 @@ - + - + - + - + - + - + @@ -181,6 +188,6 @@ - + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 71c3917c..9d1b7d96 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ