From 21e3fb713e86453cbc25a7ce5e4b1b80f1f1db8a Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 19 Nov 2021 10:19:01 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B6=E3=83=AB=E3=83=88=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/CookingResults.unity | 28 ++++++------- .../MyGame/Scenes/Main/Prefabs/Canvas.prefab | 40 ++++++++++++------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index 54c44435..4d08cb9c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -268,7 +268,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 64, y: 42} + m_SizeDelta: {x: 126, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &168647013 MonoBehaviour: @@ -289,7 +289,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} + m_Sprite: {fileID: 21300000, guid: be43441773844e241b0f8b046b68e8f8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -632,7 +632,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -164, y: 7.000023} + m_AnchoredPosition: {x: -129, y: 7} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &322038873 @@ -1261,7 +1261,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 133, y: 8} + m_AnchoredPosition: {x: 151, y: 8} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &656769403 @@ -1483,7 +1483,7 @@ RectTransform: m_GameObject: {fileID: 731070671} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_LocalScale: {x: 0.65, y: 0.65, z: 0.65} m_Children: - {fileID: 743984452} - {fileID: 925350888} @@ -2258,8 +2258,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -7} - m_SizeDelta: {x: 140, y: 50} + m_AnchoredPosition: {x: 11, y: -7} + m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1015662795 MonoBehaviour: @@ -2293,7 +2293,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1000 + m_Text: 10 --- !u!222 &1015662796 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2422,7 +2422,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} + m_AnchoredPosition: {x: 19, y: 4} m_SizeDelta: {x: 66, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1178857659 @@ -8020,8 +8020,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 53, y: -7} - m_SizeDelta: {x: 160, y: 66} + m_AnchoredPosition: {x: 22, y: -7} + m_SizeDelta: {x: 130, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667225192 MonoBehaviour: @@ -8055,7 +8055,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 1000 + m_Text: 10 --- !u!222 &1667225193 CanvasRenderer: m_ObjectHideFlags: 0 @@ -8481,7 +8481,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -53} + m_AnchoredPosition: {x: 0, y: -56} m_SizeDelta: {x: 584, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2043133481 @@ -19132,7 +19132,7 @@ PrefabInstance: - target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c, type: 3} propertyPath: m_AnchoredPosition.y - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8869708493630406831, guid: 4d49c71079a444963857b600f7b6384c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 81ffca75..d8b706f8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -1925,11 +1925,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_fontSize - value: 34.06 - objectReference: {fileID: 0} - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_fontStyle @@ -1940,21 +1935,11 @@ PrefabInstance: propertyPath: m_isRichText value: 1 objectReference: {fileID: 0} - - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_fontSizeBase - value: 34.06 - objectReference: {fileID: 0} - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_enableKerning value: 1 objectReference: {fileID: 0} - - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, - type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2100000, guid: 6b0ec8d08c1e64575b9889e8f2732bd0, type: 2} - target: {fileID: 137127163584464916, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_horizontalMapping @@ -1965,6 +1950,11 @@ PrefabInstance: propertyPath: m_useMaxVisibleDescender value: 1 objectReference: {fileID: 0} + - target: {fileID: 137127163584464919, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -7.7 + objectReference: {fileID: 0} - target: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_Name @@ -2085,6 +2075,26 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 137127164573744481, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_LocalScale.x + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 137127164573744481, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_LocalScale.y + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 137127164573744481, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_LocalScale.z + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 137127164573744481, guid: ac3be7383b736d941b251a588e626963, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -152 + objectReference: {fileID: 0} - target: {fileID: 4558166201082566443, guid: ac3be7383b736d941b251a588e626963, type: 3} propertyPath: m_IsActive