From 9e5917c83b6e4586d10292f4165392e118a6a3f8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 2 Aug 2021 11:10:34 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94POP=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 6 +++--- .../MyGame/Scenes/recipe/RecipeChoice.unity | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index 68dd1fa0..adfb0b92 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -1038,7 +1038,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -32 + value: -98.80005 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1214,7 +1214,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -32 + value: -98.8 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} @@ -1385,7 +1385,7 @@ PrefabInstance: - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} propertyPath: m_AnchoredPosition.y - value: -98 + value: -34.2 objectReference: {fileID: 0} - target: {fileID: 2814970099097301153, guid: e2818e79d8fc1f34388aff1b8969d340, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 96c70d52..d460576d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -207,7 +207,7 @@ GameObject: m_Component: - component: {fileID: 230185243} m_Layer: 5 - m_Name: GameObject + m_Name: FryingPanl_icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -979,12 +979,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1} m_RaycastTarget: 0 - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 34 m_FontStyle: 0 m_BestFit: 1 @@ -1366,7 +1366,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 1 @@ -1926,7 +1926,7 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.y - value: 41.9 + value: -46.1 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} @@ -2572,7 +2572,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 1 @@ -3354,7 +3354,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 8.800003, y: -110} + m_AnchoredPosition: {x: 8.800003, y: -24.8} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0, y: 1} --- !u!1001 &5352886969301700757 @@ -3457,7 +3457,7 @@ PrefabInstance: - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3} propertyPath: m_AnchoredPosition.y - value: 41.899998 + value: -46.09995 objectReference: {fileID: 0} - target: {fileID: 5352886967997046957, guid: c84cc6844fe59ef4d8e52438b7bffa42, type: 3}