diff --git a/.erp b/.erp index 06adfef..83bd8ac 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677706525 + 1677709929 23669525547325516 false \ No newline at end of file diff --git a/Assets/Prefabs/KitchenObjects/Plate.prefab b/Assets/Prefabs/KitchenObjects/Plate.prefab index b850330..a569f00 100644 --- a/Assets/Prefabs/KitchenObjects/Plate.prefab +++ b/Assets/Prefabs/KitchenObjects/Plate.prefab @@ -30,6 +30,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5407837335631961633} + - {fileID: 5541688067102621297} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -53,6 +54,227 @@ MonoBehaviour: - {fileID: 11400000, guid: cf77ec56d13b4c7478384a548ab18277, type: 2} - {fileID: 11400000, guid: f00d7c6ba063ee6448dd26fac2bf4ce4, type: 2} - {fileID: 11400000, guid: 42754f770e37e78488140348e6a9f9c3, type: 2} +--- !u!1001 &5279535223479143253 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2446150686974603219} + m_Modifications: + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.02 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 408889407006782757, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_Name + value: PlateCompleteVisual + objectReference: {fileID: 0} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: plateKitchenObject + value: + objectReference: {fileID: 8156927621140740658} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.size + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[0].gameObject + value: + objectReference: {fileID: 8647484012793472070} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[1].gameObject + value: + objectReference: {fileID: 8647484012501560456} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[2].gameObject + value: + objectReference: {fileID: 8647484013212161886} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[3].gameObject + value: + objectReference: {fileID: 8647484013185306762} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[4].gameObject + value: + objectReference: {fileID: 8647484012523027140} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[5].gameObject + value: + objectReference: {fileID: 8888273079603385044} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[0].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: 6a1e97e49ac17314c872f2ef05c80dcf, + type: 2} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[1].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: cf77ec56d13b4c7478384a548ab18277, + type: 2} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[2].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: f00d7c6ba063ee6448dd26fac2bf4ce4, + type: 2} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[3].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: adbde85b933684c4992834e8bb9d893b, + type: 2} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[4].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: 109b320dd13683c4abc574781815cbbd, + type: 2} + - target: {fileID: 508161765286487449, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: kitchenObjectSOGameObjectList.Array.data[5].kitchenObjectSO + value: + objectReference: {fileID: 11400000, guid: 42754f770e37e78488140348e6a9f9c3, + type: 2} + - target: {fileID: 3550707550894988255, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3550707551136013323, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3550707552375629789, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3550707552397226385, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3550707552663613203, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3611271270719445377, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 10e39c981f2de6441b54efde32ced8f0, type: 3} +--- !u!4 &5541688067102621297 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 408889407006782756, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8647484012501560456 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3550707552375629789, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8647484012523027140 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3550707552397226385, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8647484012793472070 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3550707552663613203, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8647484013185306762 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3550707550894988255, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8647484013212161886 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3550707551136013323, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8888273079603385044 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3611271270719445377, guid: 10e39c981f2de6441b54efde32ced8f0, + type: 3} + m_PrefabInstance: {fileID: 5279535223479143253} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9216177299345934497 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index 20202bf..099b2a5 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -479,7 +479,7 @@ MonoBehaviour: m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 1 - m_Antialiasing: 0 + m_Antialiasing: 2 m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 @@ -492,7 +492,7 @@ MonoBehaviour: m_RequiresColorTexture: 0 m_Version: 2 m_TaaSettings: - quality: 3 + quality: 4 frameInfluence: 0.1 jitterScale: 1 mipBias: 0 @@ -592,6 +592,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 369744370} m_Modifications: + - target: {fileID: 4790631293273522863, guid: ae14b9e7a32963047a859cc7ab07f505, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6616006834372177299, guid: ae14b9e7a32963047a859cc7ab07f505, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scenes/GaneScene/Global Volume Profile.asset b/Assets/Scenes/GaneScene/Global Volume Profile.asset index 9cedfcc..1de8915 100644 --- a/Assets/Scenes/GaneScene/Global Volume Profile.asset +++ b/Assets/Scenes/GaneScene/Global Volume Profile.asset @@ -21,13 +21,54 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0.25 + m_Value: 0.293 smoothness: m_OverrideState: 1 m_Value: 0.402 rounded: m_OverrideState: 0 m_Value: 0 +--- !u!114 &-4234268494228568638 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3} + m_Name: ChromaticAberration + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0.022 +--- !u!114 &-4057399823907002918 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 0 + m_Value: 0 + quality: + m_OverrideState: 1 + m_Value: 2 + intensity: + m_OverrideState: 1 + m_Value: 0.2 + clamp: + m_OverrideState: 0 + m_Value: 0.05 --- !u!114 &-3689071290278283221 MonoBehaviour: m_ObjectHideFlags: 3 @@ -61,6 +102,9 @@ MonoBehaviour: - {fileID: 6983169800274464166} - {fileID: 3884788365965942004} - {fileID: -7771201182684996448} + - {fileID: -4234268494228568638} + - {fileID: -4057399823907002918} + - {fileID: 8583475287148718692} --- !u!114 &3884788365965942004 MonoBehaviour: m_ObjectHideFlags: 3 @@ -79,13 +123,13 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 1.14 + m_Value: 1.13 intensity: m_OverrideState: 1 - m_Value: 0.42 + m_Value: 0.94 scatter: - m_OverrideState: 0 - m_Value: 0.7 + m_OverrideState: 1 + m_Value: 0.705 clamp: m_OverrideState: 0 m_Value: 65472 @@ -93,8 +137,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: {r: 1, g: 1, b: 1, a: 1} highQualityFiltering: - m_OverrideState: 0 - m_Value: 0 + m_OverrideState: 1 + m_Value: 1 downscale: m_OverrideState: 0 m_Value: 0 @@ -135,4 +179,29 @@ MonoBehaviour: m_Value: 0 saturation: m_OverrideState: 1 - m_Value: 17.9 + m_Value: 11.6 +--- !u!114 &8583475287148718692 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + type: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0.252 + response: + m_OverrideState: 0 + m_Value: 0.8 + texture: + m_OverrideState: 0 + m_Value: {fileID: 0} diff --git a/Assets/Scripts/PlateCompleteVisual.cs b/Assets/Scripts/PlateCompleteVisual.cs new file mode 100644 index 0000000..b8d79ef --- /dev/null +++ b/Assets/Scripts/PlateCompleteVisual.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlateCompleteVisual : MonoBehaviour +{ + + [Serializable] + public struct KitchenObjectSO_GameObject + { + public KitchenObjectSO kitchenObjectSO; + public GameObject gameObject; + } + + [SerializeField] private PlateKitchenObject plateKitchenObject; + [SerializeField] private List kitchenObjectSOGameObjectList; + + private void Start() + { + plateKitchenObject.OnIngreedientAdded += PlateKitchenObject_OnIngreedientAdded; + + foreach (KitchenObjectSO_GameObject kitchenObjectSOGameObject in kitchenObjectSOGameObjectList) + { + kitchenObjectSOGameObject.gameObject.SetActive(false); + } + } + + private void PlateKitchenObject_OnIngreedientAdded(object sender, PlateKitchenObject.OnIngreedientAddedEventArgs e) + { + foreach (KitchenObjectSO_GameObject kitchenObjectSOGameObject in kitchenObjectSOGameObjectList) + { + if (kitchenObjectSOGameObject.kitchenObjectSO == e.KitchenObjectSO) + { + kitchenObjectSOGameObject.gameObject.SetActive(true); + } + } + } +} diff --git a/Assets/Scripts/PlateCompleteVisual.cs.meta b/Assets/Scripts/PlateCompleteVisual.cs.meta new file mode 100644 index 0000000..a979e8b --- /dev/null +++ b/Assets/Scripts/PlateCompleteVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27253c78be049da418db6f769fc2142e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlateKitchenObject.cs b/Assets/Scripts/PlateKitchenObject.cs index 698b9d7..7cf7ca5 100644 --- a/Assets/Scripts/PlateKitchenObject.cs +++ b/Assets/Scripts/PlateKitchenObject.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -5,6 +6,12 @@ using UnityEngine; public class PlateKitchenObject : KitchenObject { + public event EventHandler OnIngreedientAdded; + public class OnIngreedientAddedEventArgs : EventArgs + { + public KitchenObjectSO KitchenObjectSO; + } + [SerializeField] private List validKitchenObjectSOList; private List kitchenObjectSOList; @@ -27,6 +34,12 @@ public class PlateKitchenObject : KitchenObject } else { kitchenObjectSOList.Add(kitchenObjectSO); + + OnIngreedientAdded?.Invoke(this, new OnIngreedientAddedEventArgs + { + KitchenObjectSO = kitchenObjectSO, + }); + return true; } } diff --git a/Assets/_Assets/PrefabsVisuals/PlateCompleteVisual.prefab b/Assets/_Assets/PrefabsVisuals/PlateCompleteVisual.prefab index 3af7a0c..d5497ac 100644 --- a/Assets/_Assets/PrefabsVisuals/PlateCompleteVisual.prefab +++ b/Assets/_Assets/PrefabsVisuals/PlateCompleteVisual.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 408889407006782756} + - component: {fileID: 508161765286487449} m_Layer: 0 m_Name: PlateCompleteVisual m_TagString: Untagged @@ -37,6 +38,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &508161765286487449 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 408889407006782757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 27253c78be049da418db6f769fc2142e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &408889405707390302 PrefabInstance: m_ObjectHideFlags: 0 @@ -381,6 +394,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 408889407006782756} m_Modifications: + - target: {fileID: 1501558528557060038, guid: bc49891f572f1164e9938f845ec37ab0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.327 + objectReference: {fileID: 0} - target: {fileID: 1547429398500879462, guid: bc49891f572f1164e9938f845ec37ab0, type: 3} propertyPath: m_LocalPosition.y