diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index f884986c..c7d6202c 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -1602,7 +1602,7 @@ PrefabInstance: - target: {fileID: 5284969908565993463, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5284969908565993463, guid: b0a57f0d9e5524e579cad0309e9d44d1, type: 3} @@ -2035,8 +2035,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1928679190} - - {fileID: 1871878299} - - {fileID: 8786490829224139746} - {fileID: 657773246} - {fileID: 7182226549102099027} m_Father: {fileID: 420543917} @@ -4246,19 +4244,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c915cbef0a9f4907b14755a62848eb3c, type: 3} m_Name: m_EditorClassIdentifier: - startingGuide: {fileID: 8786490829224139677} + startingGuide: {fileID: 8677286139723025160} fire: {fileID: 1295632042} oilEffect: {fileID: 2137549894} streamEffect: {fileID: 2137549893} characterSweat: {fileID: 580170368} characterFlower: {fileID: 785034261} panImageTarget: {fileID: 2137549895} ---- !u!224 &1871878299 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - m_PrefabInstance: {fileID: 8509883328564265099} - m_PrefabAsset: {fileID: 0} --- !u!1 &1928679189 GameObject: m_ObjectHideFlags: 0 @@ -4907,142 +4899,13 @@ RectTransform: - {fileID: 1601191536} - {fileID: 250366630} m_Father: {fileID: 676036207} - m_RootOrder: 4 + 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_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &8509883328564265099 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 676036207} - m_Modifications: - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -346.4 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -464.5 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918160, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918161, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_Name - value: FailurecMeter - objectReference: {fileID: 0} - - target: {fileID: 8509883327782918161, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8509883327795984539, guid: 1a47fa9bdeb434bffa410f731816203f, - type: 3} - propertyPath: m_FillAmount - value: 0.08 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1a47fa9bdeb434bffa410f731816203f, type: 3} --- !u!1 &8677286139723025160 GameObject: m_ObjectHideFlags: 0 @@ -5059,117 +4922,3 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &8786490829224139677 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8786490829224139746} - m_Layer: 5 - m_Name: Guide - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8786490829224139746 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8786490829224139677} - 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: 8786490829298280290} - m_Father: {fileID: 676036207} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &8786490829298280221 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8786490829298280290} - - component: {fileID: 8786490829298280288} - - component: {fileID: 8786490829298280291} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!222 &8786490829298280288 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8786490829298280221} - m_CullTransparentMesh: 0 ---- !u!224 &8786490829298280290 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8786490829298280221} - 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: 8786490829224139746} - 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: 0} - m_SizeDelta: {x: 926.19916, y: 443.6684} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8786490829298280291 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8786490829298280221} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 113 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u30BF\u30C3\u30D7\u3067\u958B\u59CB"