From a6a8f0ee2dcdea24f9e4c6ddb927b6651a8553e9 Mon Sep 17 00:00:00 2001 From: cyndrdev Date: Mon, 15 Mar 2021 16:21:40 +0000 Subject: [PATCH] fixed dialogue font --- game/Assets/Prefabs/UI/Canvas.prefab | 8 ++++++++ game/Assets/Scenes/Main.unity | 20 ++++++++++++++------ game/Assets/UI/Buttons/buttons.asset | 16 ++++++++-------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/game/Assets/Prefabs/UI/Canvas.prefab b/game/Assets/Prefabs/UI/Canvas.prefab index ec40a7d..2283f72 100644 --- a/game/Assets/Prefabs/UI/Canvas.prefab +++ b/game/Assets/Prefabs/UI/Canvas.prefab @@ -367,6 +367,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6808448287154422776} m_Modifications: + - target: {fileID: 5119468870461405386, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3} + propertyPath: m_fontSize + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 5119468870461405386, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 859b47edaf12fe14782789af604151d5, type: 2} - target: {fileID: 5119468870989674483, guid: fde30a46065b3b144ac612ec0b3e484a, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 7166600..fb26fb1 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -2310,15 +2310,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000014901161 + value: -0.000000029802322 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.040505253 + value: -0.040505223 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.0220641 + value: 0.022064082 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2434,15 +2434,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000029802322 + value: -0.000000014901161 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.040505223 + value: -0.040505253 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.022064082 + value: 0.0220641 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.m_InvertInput @@ -58143,6 +58143,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1833095293156707977, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3} + propertyPath: m_fontSizeBase + value: 36 + objectReference: {fileID: 0} + - target: {fileID: 1833095293156707977, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: -2556328756776758742, guid: 859b47edaf12fe14782789af604151d5, type: 2} - target: {fileID: 6808448287154422772, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3} propertyPath: _preview value: diff --git a/game/Assets/UI/Buttons/buttons.asset b/game/Assets/UI/Buttons/buttons.asset index be5611d..b23441d 100644 --- a/game/Assets/UI/Buttons/buttons.asset +++ b/game/Assets/UI/Buttons/buttons.asset @@ -77,25 +77,25 @@ MonoBehaviour: - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 0 - m_Scale: 1 + m_Scale: 2 m_Name: buttons_0 m_HashCode: -1735648118 - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 1 - m_Scale: 1 + m_Scale: 2 m_Name: buttons_1 m_HashCode: -1735648117 - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 2 - m_Scale: 1 + m_Scale: 2 m_Name: buttons_2 m_HashCode: -1735648120 - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 3 - m_Scale: 1 + m_Scale: 2 m_Name: buttons_3 m_HashCode: -1735648119 - m_ElementType: 2 @@ -128,7 +128,7 @@ MonoBehaviour: m_Width: 100 m_Height: 100 m_HorizontalBearingX: -0 - m_HorizontalBearingY: 82.85 + m_HorizontalBearingY: 64 m_HorizontalAdvance: 100 m_GlyphRect: m_X: 0 @@ -143,7 +143,7 @@ MonoBehaviour: m_Width: 100 m_Height: 100 m_HorizontalBearingX: -0 - m_HorizontalBearingY: 82.85 + m_HorizontalBearingY: 64 m_HorizontalAdvance: 100 m_GlyphRect: m_X: 100 @@ -158,7 +158,7 @@ MonoBehaviour: m_Width: 100 m_Height: 100 m_HorizontalBearingX: -0 - m_HorizontalBearingY: 82.85 + m_HorizontalBearingY: 64 m_HorizontalAdvance: 100 m_GlyphRect: m_X: 0 @@ -173,7 +173,7 @@ MonoBehaviour: m_Width: 100 m_Height: 100 m_HorizontalBearingX: -0 - m_HorizontalBearingY: 82.85 + m_HorizontalBearingY: 64 m_HorizontalAdvance: 100 m_GlyphRect: m_X: 100