From 4019755058954f648b0d8673f74c63386db5c646 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Tue, 12 Oct 2021 14:21:35 +0900 Subject: [PATCH] =?UTF-8?q?=E8=A9=A6=E9=A3=9F=E3=83=9C=E3=82=BF=E3=83=B3OF?= =?UTF-8?q?F=E3=81=AESE=E3=81=A8=E3=83=9C=E3=82=BF=E3=83=B3=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 14 ++--- .../Scenes/marketing/ProductManagement.unity | 61 ------------------- 2 files changed, 7 insertions(+), 68 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 4eccccb8..3b56f22f 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -386,7 +386,7 @@ RectTransform: - {fileID: 156418750} - {fileID: 1705896410} m_Father: {fileID: 7182226549102099027} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2509,7 +2509,7 @@ GameObject: - component: {fileID: 964130197} - component: {fileID: 964130196} m_Layer: 5 - m_Name: Image + m_Name: point_a m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2977,12 +2977,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] - m_Father: {fileID: 7182226549102099027} - m_RootOrder: 1 + m_Father: {fileID: 1601191536} + m_RootOrder: 3 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: -32, y: -400.99997} + m_AnchoredPosition: {x: -32, y: -89.99997} m_SizeDelta: {x: 192, y: 206} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1207852120 @@ -3704,6 +3704,7 @@ RectTransform: - {fileID: 1707428398} - {fileID: 54567202} - {fileID: 964130195} + - {fileID: 1207852119} m_Father: {fileID: 7182226549102099027} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3934,7 +3935,7 @@ GameObject: - component: {fileID: 1707428400} - component: {fileID: 1707428399} m_Layer: 5 - m_Name: Image (1) + m_Name: point_b m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4858,7 +4859,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1601191536} - - {fileID: 1207852119} - {fileID: 250366630} m_Father: {fileID: 676036207} m_RootOrder: 4 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 1f423817..387942ca 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -2225,8 +2225,6 @@ GameObject: - component: {fileID: 1001931508} - component: {fileID: 1001931512} - component: {fileID: 1001931511} - - component: {fileID: 1001931510} - - component: {fileID: 1001931509} m_Layer: 5 m_Name: Button_Tasting _off m_TagString: Untagged @@ -2254,65 +2252,6 @@ RectTransform: m_AnchoredPosition: {x: -3, y: -2} m_SizeDelta: {x: 300, y: 138} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1001931509 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001931507} - 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 &1001931510 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001931507} - 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: 1001931511} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &1001931511 MonoBehaviour: m_ObjectHideFlags: 0