From 2e3f1f1f3cd04507ce761dc1b793790d9916db36 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 13 Oct 2021 13:01:49 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A9=B3=E7=B4=B0POP=E3=81=AE=E6=96=87?= =?UTF-8?q?=E5=AD=97=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 6 +++++ .../MyGame/Scenes/recipe/RecipeChoice.unity | 26 +++++++++---------- .../Assets/MyGame/Scenes/recipe/recipe.unity | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 6e7c45e8..f884986c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -4716,6 +4716,12 @@ PrefabInstance: propertyPath: InitialModule.startColor.maxColor.g value: 1 objectReference: {fileID: 0} + - target: {fileID: 5688609394484740830, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3fa283a0ae9974b44bc30f58cee0ce70, + type: 3} - target: {fileID: 6414470378191658949, guid: b6b05cbc51c744ac2ad95a8b229d4ddd, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 99329af3..3beef7b8 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -304,7 +304,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: -35, y: -28} + m_AnchoredPosition: {x: -45, y: -28} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &255490368 @@ -494,7 +494,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -16, y: 411} - m_SizeDelta: {x: 680, y: 6} + m_SizeDelta: {x: 700, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374985850 MonoBehaviour: @@ -1702,7 +1702,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 20, y: 50} - m_SizeDelta: {x: 836, y: 1250} + m_SizeDelta: {x: 920, y: 1250} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1037294270 GameObject: @@ -2088,7 +2088,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 900, y: 1250} + m_SizeDelta: {x: 920, y: 1250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: @@ -2220,7 +2220,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 780, y: 250} + m_SizeDelta: {x: 810, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170636685 MonoBehaviour: @@ -3392,8 +3392,8 @@ 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: 76, y: -210} - m_SizeDelta: {x: 440, y: 160} + m_AnchoredPosition: {x: 76, y: -207} + m_SizeDelta: {x: 460, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 MonoBehaviour: @@ -3416,18 +3416,18 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 30 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 28 - m_MaxSize: 30 + m_MinSize: 26 + m_MaxSize: 28 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6642\u9593\u304C\u5C11\u3057\u304B\u304B\u308B\u304C\n\u7126\u3052\u306B\u304F\u304F\u4F7F\u3044\u3084\u3059\u3044\n\r\u521D\u5FC3\u8005\u5411\u3051\u306E\u30D5\u30E9\u30A4\u30D1\u30F3" + m_Text: "\u4FDD\u6E29\u6027\u304C\u9AD8\u3044\u30B9\u30C6\u30F3\u30EC\u30B9\u88FD\u306E\u30D5\u30E9\u30A4\u30D1\u30F3\r\n\u51B7\u307E\u3059\u969B\u306B\u306F\u5927\u304D\u304F\u65E9\u304F\u632F\u308B\u306E\u304C\u30B3\u30C4\r\n\u5927\u6210\u529F\u3067\u58F2\u5024\u304C15%\u30A2\u30C3\u30D7" --- !u!222 &2045825935 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3557,7 +3557,7 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_AnchoredPosition.x - value: 273 + value: 288 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} @@ -3886,7 +3886,7 @@ PrefabInstance: - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} propertyPath: m_AnchoredPosition.x - value: -418 + value: -435 objectReference: {fileID: 0} - target: {fileID: 7425631354395935385, guid: a3d75f774aaefd046aebd07db1400975, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 24dd60c2..3a07cef4 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -948,7 +948,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -180} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 21} + m_AnchoredPosition: {x: 0, y: 29} m_SizeDelta: {x: 0, y: 48} m_Pivot: {x: 0.5, y: 0} --- !u!114 &277152054