From 0fe11afd84408a052547fc5788da3fadccb53f5c Mon Sep 17 00:00:00 2001
From: "DESKTOP-7R8JEQQ\\k" <1076390229@qq.com>
Date: Tue, 8 Jul 2025 16:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E8=AE=B0=E5=BD=95=E9=80=82?=
=?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Game/View/Family/FamilyNumberRecord.lua | 6 ++++-
.../CreateAndJoin/com_createAndJoin.xml | 18 +++++++------
wb_new_ui/assets/Family/Main.xml | 3 ++-
.../Family/NumberRecord/comp_numberRecord.xml | 25 +++++++++++-------
.../ART/base/Family/ui/Family_fui.bytes | Bin 114713 -> 115001 bytes
5 files changed, 33 insertions(+), 19 deletions(-)
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 71c3917cec95fc333a1ac5181832fd4cf1151c85..9d1b7d9698298370ac4bf6cd142370cf814a47b7 100644
GIT binary patch
delta 4897
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