From 1b3c0bc18b483d56da67d4375c67ffaa1b8497d3 Mon Sep 17 00:00:00 2001 From: Fang Date: Thu, 28 Sep 2023 15:26:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E7=95=8C=E9=9D=A2=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/lua/app/ui/tips/help_tips.lua.bytes | Bin 7939 -> 8308 bytes Assets/prefabs/ui/tips/help_tips.prefab | 14 +++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Assets/lua/app/ui/tips/help_tips.lua.bytes b/Assets/lua/app/ui/tips/help_tips.lua.bytes index 677f0ecdbe513e68974a0c2b76c7d363d0f90b15..5642dd78ce7288a894c7c24f44847386512331ab 100644 GIT binary patch literal 8308 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 F{WpuJp+x`y literal 7939 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 diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index 30bda1ac9..808866528 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -639,11 +639,11 @@ RectTransform: m_Father: {fileID: 7684827902120262743} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 360} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &3299212247292666330 CanvasRenderer: m_ObjectHideFlags: 0 @@ -700,9 +700,9 @@ MonoBehaviour: serializedVersion: 2 rgba: 4294967295 m_fontSize: 24 - m_fontSizeBase: 26 + m_fontSizeBase: 24 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 24 m_fontStyle: 0 @@ -1905,6 +1905,10 @@ MonoBehaviour: hashName: 2658848385 objectType: 0 gameObject: {fileID: 6416852653222592148} + - name: help_tips.style_arena.ScrollView.Viewport.Content + hashName: 1740473472 + objectType: 0 + gameObject: {fileID: 263741915045799606} --- !u!222 &7486192560637971567 CanvasRenderer: m_ObjectHideFlags: 0