From a76a4242fca077cd4d41b3f15e250aa1d54aa164 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 22 Nov 2021 16:04:12 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=99=E7=90=86=E7=B5=90=E6=9E=9C?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3HorizontalLayoutGroup=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Cooking/CookingResults.unity | 695 ++++++++++++++++++ 1 file changed, 695 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index e564821a..83339601 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -717,6 +717,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 322139898} m_CullTransparentMesh: 0 +--- !u!1 &349910512 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 349910513} + - component: {fileID: 349910515} + - component: {fileID: 349910514} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &349910513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349910512} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 641247138} + m_RootOrder: 0 + 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_SizeDelta: {x: 162, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &349910514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349910512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 171ed0d11d66f6a4d8c147aa7cd31fde, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &349910515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349910512} + m_CullTransparentMesh: 0 --- !u!1 &357117902 GameObject: m_ObjectHideFlags: 0 @@ -850,6 +924,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 389651771} m_CullTransparentMesh: 0 +--- !u!1 &419955109 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 419955110} + - component: {fileID: 419955114} + - component: {fileID: 419955113} + - component: {fileID: 419955112} + - component: {fileID: 419955111} + m_Layer: 5 + m_Name: Button_make_one + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &419955110 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419955109} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1330096120} + m_Father: {fileID: 1828335168} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 290, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &419955111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419955109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!114 &419955112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419955109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 419955113} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &419955113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419955109} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1e213d73b33ff794db73d36f9663a3c6, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &419955114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419955109} + m_CullTransparentMesh: 0 --- !u!1 &460945446 GameObject: m_ObjectHideFlags: 0 @@ -1150,6 +1360,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629729947} m_CullTransparentMesh: 0 +--- !u!1 &641247137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 641247138} + - component: {fileID: 641247142} + - component: {fileID: 641247141} + - component: {fileID: 641247140} + - component: {fileID: 641247139} + m_Layer: 5 + m_Name: Button_destruction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &641247138 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641247137} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 349910513} + m_Father: {fileID: 1828335168} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 290, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &641247139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641247137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!114 &641247140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641247137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 641247141} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &641247141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641247137} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5a6cca279e97f364d8f452938df94f16, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &641247142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641247137} + m_CullTransparentMesh: 0 --- !u!1 &642263093 GameObject: m_ObjectHideFlags: 0 @@ -2110,6 +2456,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 967604317} m_CullTransparentMesh: 0 +--- !u!1 &972837977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 972837978} + - component: {fileID: 972837980} + - component: {fileID: 972837979} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &972837978 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972837977} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1275284630} + m_RootOrder: 0 + 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_SizeDelta: {x: 126, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &972837979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972837977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: be43441773844e241b0f8b046b68e8f8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &972837980 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 972837977} + m_CullTransparentMesh: 0 --- !u!1 &977215192 GameObject: m_ObjectHideFlags: 0 @@ -2216,6 +2636,7 @@ RectTransform: - {fileID: 1022708888} - {fileID: 2137066050} - {fileID: 1887559734} + - {fileID: 1828335168} m_Father: {fileID: 2075176185} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2536,6 +2957,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1198956605} m_CullTransparentMesh: 0 +--- !u!1 &1275284629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275284630} + - component: {fileID: 1275284634} + - component: {fileID: 1275284633} + - component: {fileID: 1275284632} + - component: {fileID: 1275284631} + m_Layer: 5 + m_Name: Button_ok + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1275284630 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275284629} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 972837978} + m_Father: {fileID: 1828335168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -69} + m_SizeDelta: {x: 290, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1275284631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275284629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!114 &1275284632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275284629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1275284633} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1275284633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275284629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 9762a7e9197d4454eae77ff830bb26d9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1275284634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275284629} + m_CullTransparentMesh: 0 --- !u!1 &1275675524 GameObject: m_ObjectHideFlags: 0 @@ -2917,6 +3474,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1313878216} m_CullTransparentMesh: 0 +--- !u!1 &1330096119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1330096120} + - component: {fileID: 1330096122} + - component: {fileID: 1330096121} + m_Layer: 5 + m_Name: Image_text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1330096120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330096119} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 419955110} + m_RootOrder: 0 + 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_SizeDelta: {x: 232, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1330096121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330096119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a87a9337eaa8d394ab3e9f2a130777ee, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1330096122 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1330096119} + m_CullTransparentMesh: 0 --- !u!1 &1358716283 GameObject: m_ObjectHideFlags: 0 @@ -8195,6 +8826,70 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730663110} m_CullTransparentMesh: 0 +--- !u!1 &1828335167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828335168} + - component: {fileID: 1828335169} + m_Layer: 5 + m_Name: Bottom_Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1828335168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828335167} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 419955110} + - {fileID: 1275284630} + - {fileID: 641247138} + m_Father: {fileID: 995508294} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -318} + m_SizeDelta: {x: 1080, y: 138} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1828335169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828335167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 81.3 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &1887559733 GameObject: m_ObjectHideFlags: 0 From b9a147c9d727f7e13ad4cbb119b1816f71a15af7 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 22 Nov 2021 16:22:31 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=82=B7=E3=83=94=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/recipe/Prefabs/Frame.prefab | 4 +- .../Assets/MyGame/Scenes/recipe/recipe.unity | 100 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index 4daba86d..071bf103 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -146,7 +146,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ffd97dfa84001f64d880fad85939b679, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -618,7 +618,7 @@ RectTransform: m_GameObject: {fileID: 2929932627350163027} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: - {fileID: 2646634445844468798} - {fileID: 5518194748275484553} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity index 042fea46..87ce1a3f 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/recipe.unity @@ -157,8 +157,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: -510.8, y: 429} - m_SizeDelta: {x: 955.30005, y: 850} + m_AnchoredPosition: {x: -532, y: 505} + m_SizeDelta: {x: 1000, y: 1000} m_Pivot: {x: 0, y: 1} --- !u!114 &25421136 MonoBehaviour: @@ -258,7 +258,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 12, y: 0.000035539237} + m_AnchoredPosition: {x: -48, y: 8.405548} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &28991873 @@ -281,7 +281,7 @@ MonoBehaviour: m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 504.5, y: 290.7} + m_CellSize: {x: 586, y: 346.3} m_Spacing: {x: -81.8, y: -14.7} m_Constraint: 1 m_ConstraintCount: 2 @@ -429,7 +429,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -837,7 +837,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 930, y: 930} + m_SizeDelta: {x: 1050, y: 1100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &199954322 MonoBehaviour: @@ -916,7 +916,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 34, y: 48} - m_SizeDelta: {x: 998.8, y: 800} + m_SizeDelta: {x: 1116.9, y: 900} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &203585999 MonoBehaviour: @@ -1108,8 +1108,8 @@ 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: 29} - m_SizeDelta: {x: 0, y: 48} + m_AnchoredPosition: {x: -1, y: -1} + m_SizeDelta: {x: 50, y: 48} m_Pivot: {x: 0.5, y: 0} --- !u!114 &277152054 MonoBehaviour: @@ -1182,10 +1182,10 @@ RectTransform: m_Father: {fileID: 111842754} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 1186, y: 1310} + m_SizeDelta: {x: 58, y: -658} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &329292691 MonoBehaviour: @@ -1411,7 +1411,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1421,17 +1421,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 504.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 290.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1471,12 +1471,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 674.95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -421.35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1948,7 +1948,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -1958,17 +1958,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 504.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 290.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2008,12 +2008,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -421.35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -2170,8 +2170,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: 0, y: -507} - m_SizeDelta: {x: 300, y: 138} + m_AnchoredPosition: {x: 0, y: -610} + m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &968322477 MonoBehaviour: @@ -3424,7 +3424,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: -99} + m_AnchoredPosition: {x: 0, y: -111} m_SizeDelta: {x: 404, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554563050 @@ -3539,7 +3539,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3549,17 +3549,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 504.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 290.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3599,12 +3599,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 674.95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -145.35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -3793,10 +3793,10 @@ RectTransform: m_Father: {fileID: 329292690} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1300, y: 1550} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1594398331 MonoBehaviour: @@ -3869,8 +3869,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 31} - m_SizeDelta: {x: 0, y: 48} + m_AnchoredPosition: {x: -1, y: 62} + m_SizeDelta: {x: 50, y: 48} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1706201273 MonoBehaviour: @@ -4332,7 +4332,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -4342,17 +4342,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 504.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 290.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -4392,12 +4392,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -697.35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -5257,7 +5257,7 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -5267,17 +5267,17 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.x - value: 504.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_SizeDelta.y - value: 290.7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} @@ -5317,12 +5317,12 @@ PrefabInstance: - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.x - value: 252.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3} propertyPath: m_AnchoredPosition.y - value: -145.35 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2929932627350163026, guid: 2beb2d436ad55734186e797d315796b3, type: 3}