From 6bbc69dbb79a8e778d4511d04f3c93fda71d8d94 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 16 Nov 2021 16:21:25 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E8=88=97=E3=83=AC=E3=83=99=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E6=95=B0=E5=AD=97=E5=A4=A7=E3=81=8D=E3=81=95=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fonts/DFHannotateStdN-W7 SDF.asset | 4 +- popcorn/Assets/MyGame/Scenes/Main/Main.unity | 52 +++++++++++++++++-- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 24 ++++----- .../Scenes/Main/Prefabs/UI/Header.prefab | 4 +- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset index f2e9589e..f69c0e4b 100644 --- a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset +++ b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset @@ -5717,10 +5717,10 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.63 + - _OutlineWidth: 0.7 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - - _ScaleRatioA: 0.6217617 + - _ScaleRatioA: 0.59308076 - _ScaleRatioB: 0.16424999 - _ScaleRatioC: 0.16424999 - _ScaleX: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index aee41b35..9c36bfa2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -5193,11 +5193,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3664916833545329524, guid: caaa748dbeed576499e8cae74d33f689, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x @@ -5228,6 +5223,53 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 3664916833853451851, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -152 + objectReference: {fileID: 0} + - target: {fileID: 3664916833948146493, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -7.7 + objectReference: {fileID: 0} + - target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_fontSize + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, + type: 2} + - target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_fontSizeBase + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3664916833948146494, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5374284371091958195, guid: 1ecb91d9b4f7d1b4d9ac80b14e928555, + type: 2} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index c373d119..81ffca75 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1851,18 +1851,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} ---- !u!1 &3664916833752817996 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, - type: 3} - m_PrefabInstance: {fileID: 2246654624185019878} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916833752817997 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3310671341541575851, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} m_PrefabInstance: {fileID: 2246654624185019878} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916833752817996 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3310671341541575850, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + m_PrefabInstance: {fileID: 2246654624185019878} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3691625806369805098 PrefabInstance: m_ObjectHideFlags: 0 @@ -2104,18 +2104,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} ---- !u!1 &3664916834242367712 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, - type: 3} - m_PrefabInstance: {fileID: 3691625806369805098} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916834242367713 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916834242367712 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, + type: 3} + m_PrefabInstance: {fileID: 3691625806369805098} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7577981076568039546 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 3a086b82..c16fa6bd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -705,8 +705,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 40 + m_fontSizeBase: 40 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18