From 2d623e564e47ad0894a8be98e2f7d934765ab5dc Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 15 Apr 2022 16:54:48 +0900 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8B=95=E8=AA=BF=E7=90=86=E5=99=A8?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/AutomaticCookingCaution.unity | 6 ++-- .../Main/AutomaticCookingComplete.unity | 6 ++-- .../Main/AutomaticCookingConfirmation.unity | 6 ++-- .../Scenes/Main/AutomaticCookingMovie.unity | 28 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity index 5dc92045..29a5a097 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingCaution.unity @@ -1153,7 +1153,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 550, y: 180} + m_SizeDelta: {x: 570, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1707876980975310910 MonoBehaviour: @@ -1690,7 +1690,7 @@ PrefabInstance: - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} propertyPath: m_SizeDelta.x - value: 512 + value: 530 objectReference: {fileID: 0} - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} @@ -1815,7 +1815,7 @@ PrefabInstance: - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} propertyPath: m_SizeDelta.x - value: 512 + value: 530 objectReference: {fileID: 0} - target: {fileID: 6753247314740774567, guid: b1baf87241be3a442a9ff800362abbbb, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity index 64a9cd72..5c00693c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingComplete.unity @@ -1154,8 +1154,8 @@ RectTransform: - {fileID: 887513092} - {fileID: 1808585195} - {fileID: 1521648549} - - {fileID: 1509965594} - {fileID: 1039054138} + - {fileID: 1509965594} - {fileID: 909212519} - {fileID: 201190547} - {fileID: 1702555237} @@ -1483,7 +1483,7 @@ RectTransform: - {fileID: 233796117} - {fileID: 1590474076} m_Father: {fileID: 829742187} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1992,7 +1992,7 @@ RectTransform: m_Children: - {fileID: 1367384747} m_Father: {fileID: 829742187} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity index f5579daf..4b6f1f26 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingConfirmation.unity @@ -1459,7 +1459,7 @@ RectTransform: m_Children: - {fileID: 662005411} m_Father: {fileID: 658174938} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1761,8 +1761,8 @@ RectTransform: - {fileID: 156549605} - {fileID: 1373180067} - {fileID: 1149052632} - - {fileID: 582907705} - {fileID: 2000954087} + - {fileID: 582907705} - {fileID: 513147900} - {fileID: 2022574963} - {fileID: 932523288} @@ -3583,7 +3583,7 @@ RectTransform: - {fileID: 1425928588} - {fileID: 620868308} m_Father: {fileID: 658174938} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity index fa9c8907..9c259315 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/AutomaticCookingMovie.unity @@ -454,7 +454,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: 247.00003, y: 1} + m_AnchoredPosition: {x: 250.00003, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &369996024 @@ -528,7 +528,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: -42, y: -0.00007247925} + m_AnchoredPosition: {x: -45, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &445717700 @@ -608,7 +608,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: 247, y: 1} + m_AnchoredPosition: {x: 250, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &497376572 @@ -945,7 +945,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: -71, y: -30.000103} + m_AnchoredPosition: {x: -74, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &617186344 @@ -1309,7 +1309,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: -71, y: -30.000103} + m_AnchoredPosition: {x: -74, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1059000513 @@ -1383,7 +1383,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: -42, y: -0.00007247925} + m_AnchoredPosition: {x: -45, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1165270082 @@ -1843,7 +1843,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: -71, y: -30.000103} + m_AnchoredPosition: {x: -74, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1330781664 @@ -2225,7 +2225,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 3} - m_SizeDelta: {x: 590, y: 200} + m_SizeDelta: {x: 620, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1633334324 MonoBehaviour: @@ -2259,7 +2259,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.2 - m_Text: "\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3046\u3068\u4E00\u5B9A\u6642\u9593\u306B\n\u5927\u91CF\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u7372\u5F97\u3067\u304D\u307E\u3059\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3044\u307E\u3059\u304B\uFF1F" + m_Text: "\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3046\u3068\u4E00\u5B9A\u6642\u9593\u5F8C\u306B\n\u5927\u91CF\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u7372\u5F97\u3067\u304D\u307E\u3059\uFF01\n\u52D5\u753B\u3092\u898B\u3066\u81EA\u52D5\u8ABF\u7406\u3092\u4F7F\u3044\u307E\u3059\u304B\uFF1F" --- !u!222 &1633334325 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2304,7 +2304,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: 247.00003, y: 1} + m_AnchoredPosition: {x: 250.00003, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1643570443 @@ -2452,7 +2452,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: -42, y: -0.00007247925} + m_AnchoredPosition: {x: -45, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1667839400 @@ -2532,7 +2532,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: 247.00003, y: 1} + m_AnchoredPosition: {x: 250, y: 1} m_SizeDelta: {x: 200, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1676166303 @@ -2857,7 +2857,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: -42, y: -0.00007247925} + m_AnchoredPosition: {x: -45, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1771385233 @@ -3386,7 +3386,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: -71, y: -30.000103} + m_AnchoredPosition: {x: -74, y: -30.000103} m_SizeDelta: {x: 550, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2100577140