From 90781ef559a3f42c5de6461def609c90c6b3579c Mon Sep 17 00:00:00 2001 From: Ciakon Date: Wed, 6 Mar 2024 09:31:48 +0100 Subject: [PATCH] Made ingredients part of dishes --- Assets/Scenes/Noahs kælder.unity | 178 +++++++++++++++++++++++++++++-- Assets/Scripts/Cooking.cs | 4 +- Assets/Scripts/Dish.cs | 21 ++++ Assets/Scripts/Dish.cs.meta | 11 ++ Assets/Scripts/Ingredient.cs | 3 +- 5 files changed, 208 insertions(+), 9 deletions(-) create mode 100644 Assets/Scripts/Dish.cs create mode 100644 Assets/Scripts/Dish.cs.meta diff --git a/Assets/Scenes/Noahs kælder.unity b/Assets/Scenes/Noahs kælder.unity index 97b9db4..1059989 100644 --- a/Assets/Scenes/Noahs kælder.unity +++ b/Assets/Scenes/Noahs kælder.unity @@ -123,6 +123,38 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &24980075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 24980076} + m_Layer: 0 + m_Name: Ingredients + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &24980076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 24980075} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.28, y: 6.29, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 537514709} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &537514707 GameObject: m_ObjectHideFlags: 0 @@ -202,12 +234,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537514707} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.76, y: 3.82, z: -1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 24980076} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &537514710 MonoBehaviour: @@ -222,6 +254,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: transform: {fileID: 537514709} + IngredientIn: + - {fileID: 867381650} --- !u!61 &537514711 BoxCollider2D: m_ObjectHideFlags: 0 @@ -251,7 +285,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -359,6 +393,105 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &867381650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 867381651} + - component: {fileID: 867381652} + - component: {fileID: 867381653} + m_Layer: 0 + m_Name: ChimkenLeg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &867381651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867381650} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1325490341} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &867381652 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867381650} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &867381653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867381650} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af04675200abb744bb6ce073aae8899d, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredIngredients: + - {fileID: 537514707} --- !u!1 &1147379266 GameObject: m_ObjectHideFlags: 0 @@ -443,6 +576,38 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1325490340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1325490341} + m_Layer: 0 + m_Name: Dishes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1325490341 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1325490340} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.36, y: 8.16, z: 0.038593948} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 867381651} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1517788312 GameObject: m_ObjectHideFlags: 0 @@ -492,7 +657,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -619,6 +784,7 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 759826130} - - {fileID: 537514709} + - {fileID: 24980076} - {fileID: 1147379268} - {fileID: 1517788315} + - {fileID: 1325490341} diff --git a/Assets/Scripts/Cooking.cs b/Assets/Scripts/Cooking.cs index bd76e77..e06fa68 100644 --- a/Assets/Scripts/Cooking.cs +++ b/Assets/Scripts/Cooking.cs @@ -9,14 +9,14 @@ public class Cooking : MonoBehaviour - void GetIngredients() + List GetIngredients() { // foreach (GameObject ingredient in currentCollisions) { // Debug.Log(ingredient.name); // } - return currentCollisions + return currentCollisions; } void CheckDishes() diff --git a/Assets/Scripts/Dish.cs b/Assets/Scripts/Dish.cs new file mode 100644 index 0000000..b2f4675 --- /dev/null +++ b/Assets/Scripts/Dish.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Dish : MonoBehaviour +{ + public List RequiredIngredients; + + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Dish.cs.meta b/Assets/Scripts/Dish.cs.meta new file mode 100644 index 0000000..c534833 --- /dev/null +++ b/Assets/Scripts/Dish.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: af04675200abb744bb6ce073aae8899d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Ingredient.cs b/Assets/Scripts/Ingredient.cs index eef1f83..9907f88 100644 --- a/Assets/Scripts/Ingredient.cs +++ b/Assets/Scripts/Ingredient.cs @@ -7,7 +7,8 @@ public class Ingredient : MonoBehaviour // Start is called before the first frame update // L Vector3 mousePosition; - public Transform transform; + new public Transform transform; + public List IngredientIn; bool isMoving = false; //public GameObject table; void Start()