From 7a3073ea8a51fb8b10f9084a32ba92493249512c Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Thu, 2 Mar 2023 05:18:58 +1100 Subject: [PATCH] Add plate spawning counter --- .erp | 2 +- Assets/Prefabs/Counter/PlatesCounter.prefab | 366 ++++++++++++++++++ .../Prefabs/Counter/PlatesCounter.prefab.meta | 7 + Assets/Prefabs/KitchenObjects/Plate.prefab | 127 ++++++ .../Prefabs/KitchenObjects/Plate.prefab.meta | 7 + Assets/Scenes/GaneScene.unity | 330 +++++++++++----- .../KitchenObjectSO/Plate.asset | 17 + .../KitchenObjectSO/Plate.asset.meta | 8 + Assets/Scripts/Counters/PlatesCounter.cs | 51 +++ Assets/Scripts/Counters/PlatesCounter.cs.meta | 11 + .../Scripts/Counters/PlatesCounterVisual.cs | 43 ++ .../Counters/PlatesCounterVisual.cs.meta | 11 + ProjectSettings/TagManager.asset | 3 +- 13 files changed, 891 insertions(+), 92 deletions(-) create mode 100644 Assets/Prefabs/Counter/PlatesCounter.prefab create mode 100644 Assets/Prefabs/Counter/PlatesCounter.prefab.meta create mode 100644 Assets/Prefabs/KitchenObjects/Plate.prefab create mode 100644 Assets/Prefabs/KitchenObjects/Plate.prefab.meta create mode 100644 Assets/ScriptableObjects/KitchenObjectSO/Plate.asset create mode 100644 Assets/ScriptableObjects/KitchenObjectSO/Plate.asset.meta create mode 100644 Assets/Scripts/Counters/PlatesCounter.cs create mode 100644 Assets/Scripts/Counters/PlatesCounter.cs.meta create mode 100644 Assets/Scripts/Counters/PlatesCounterVisual.cs create mode 100644 Assets/Scripts/Counters/PlatesCounterVisual.cs.meta diff --git a/.erp b/.erp index bd2c342..7feb4ea 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677697643 + 1677702967 23669525547325516 false \ No newline at end of file diff --git a/Assets/Prefabs/Counter/PlatesCounter.prefab b/Assets/Prefabs/Counter/PlatesCounter.prefab new file mode 100644 index 0000000..39dc896 --- /dev/null +++ b/Assets/Prefabs/Counter/PlatesCounter.prefab @@ -0,0 +1,366 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3972379435378034380 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3747205576130399769} + m_Modifications: + - target: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_Name + value: PlatesCounter_Visual + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + insertIndex: -1 + addedObject: {fileID: 9163792491346191279} + m_SourcePrefab: {fileID: 100100000, guid: e21b499d164095947b7559f0267f0e63, type: 3} +--- !u!1 &617354935849919078 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + m_PrefabInstance: {fileID: 3972379435378034380} + m_PrefabAsset: {fileID: 0} +--- !u!114 &9163792491346191279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617354935849919078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2f5bbd3a2c5ae941856ceb005e76371, type: 3} + m_Name: + m_EditorClassIdentifier: + platesCounter: {fileID: 6795722102016652045} + counterTopPoint: {fileID: 7087747258493629374} + plateVisualPrefab: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} +--- !u!4 &617354935849919079 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + m_PrefabInstance: {fileID: 3972379435378034380} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4596398789019767381 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3747205576130399769} + m_Modifications: + - target: {fileID: 433585800057296854, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 867046696110709345, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1a0afd856a35421469b28b916116fd9c, type: 2} + - target: {fileID: 4472461010448373620, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_Name + value: Selected + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalScale.x + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalScale.y + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalScale.z + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8596976978982852184} + m_SourcePrefab: {fileID: 100100000, guid: e21b499d164095947b7559f0267f0e63, type: 3} +--- !u!4 &33851074064578302 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + m_PrefabInstance: {fileID: 4596398789019767381} + m_PrefabAsset: {fileID: 0} +--- !u!1 &33851074064578303 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + m_PrefabInstance: {fileID: 4596398789019767381} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8596976978982852184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33851074064578303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b8e4c74ab1ad4b4a8c3676f33904e52, type: 3} + m_Name: + m_EditorClassIdentifier: + baseCounter: {fileID: 6795722102016652045} + visualGameObjectArray: + - {fileID: 133119862653338913} +--- !u!1 &133119862653338913 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4472461010448373620, guid: e21b499d164095947b7559f0267f0e63, + type: 3} + m_PrefabInstance: {fileID: 4596398789019767381} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7812085872591778346 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0028347075 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.999996 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180.325 + objectReference: {fileID: 0} + - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + propertyPath: m_Name + value: PlatesCounter + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 617354935849919079} + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 33851074064578302} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6795722102016652045} + m_SourcePrefab: {fileID: 100100000, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} +--- !u!1 &3691251770345774455 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 7812085872591778346} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6795722102016652045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3691251770345774455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec5fbe1ea872403428a4455a09ff09d0, type: 3} + m_Name: + m_EditorClassIdentifier: + counterTopPoint: {fileID: 0} + spawnPlateTimerMax: 4 + plateKitchenObjectSO: {fileID: 11400000, guid: 33409fb567685fc42bb48805717e6c1a, + type: 2} +--- !u!4 &3747205576130399769 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 7812085872591778346} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7087747258493629374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1024188629140685204, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + m_PrefabInstance: {fileID: 7812085872591778346} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Counter/PlatesCounter.prefab.meta b/Assets/Prefabs/Counter/PlatesCounter.prefab.meta new file mode 100644 index 0000000..53bbe75 --- /dev/null +++ b/Assets/Prefabs/Counter/PlatesCounter.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1c4db8c588dce8a4d849516e515c67c0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/KitchenObjects/Plate.prefab b/Assets/Prefabs/KitchenObjects/Plate.prefab new file mode 100644 index 0000000..85be4bf --- /dev/null +++ b/Assets/Prefabs/KitchenObjects/Plate.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8716210818090012050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2446150686974603219} + - component: {fileID: 5792615824413011753} + m_Layer: 0 + m_Name: Plate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2446150686974603219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8716210818090012050} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.54, y: 0, z: 1.47} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5407837335631961633} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5792615824413011753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8716210818090012050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f604455b7aeb5f4790263b920c04313, type: 3} + m_Name: + m_EditorClassIdentifier: + kitchenObjectSO: {fileID: 11400000, guid: 33409fb567685fc42bb48805717e6c1a, type: 2} +--- !u!1001 &9216177299345934497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2446150686974603219} + m_Modifications: + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3812876574508226177, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + propertyPath: m_Name + value: Plate_Visual + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0c9afd619b40914a8f625c0535e2284, type: 3} +--- !u!4 &5407837335631961633 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3812876574508226176, guid: c0c9afd619b40914a8f625c0535e2284, + type: 3} + m_PrefabInstance: {fileID: 9216177299345934497} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/KitchenObjects/Plate.prefab.meta b/Assets/Prefabs/KitchenObjects/Plate.prefab.meta new file mode 100644 index 0000000..5f05669 --- /dev/null +++ b/Assets/Prefabs/KitchenObjects/Plate.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 755553f9d6ad7de4091875d02e9ea07e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index 7899a25..20202bf 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -203,95 +203,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} ---- !u!1001 &78671168 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 369744370} - m_Modifications: - - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_Name - value: ClearCounter (9) - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalPosition.x - value: 7.75 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalPosition.z - value: -5 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalRotation.w - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.000008988169 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -359.999 - objectReference: {fileID: 0} - - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3695181730978947652, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.25 - objectReference: {fileID: 0} - - target: {fileID: 3695181730978947652, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.0000044940844 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} ---- !u!4 &78671169 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, - type: 3} - m_PrefabInstance: {fileID: 78671168} - m_PrefabAsset: {fileID: 0} --- !u!1001 &100998660 PrefabInstance: m_ObjectHideFlags: 0 @@ -664,10 +575,12 @@ Transform: - {fileID: 1194811187} - {fileID: 1329055551} - {fileID: 2078814028} - - {fileID: 78671169} - {fileID: 1617745536} - {fileID: 1641322150} - {fileID: 824569459} + - {fileID: 399068440} + - {fileID: 689489593} + - {fileID: 769951066} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -812,6 +725,85 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &399068439 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_Name + value: ClearCounter (9) + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.w + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.000008988169 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -359.999 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &399068440 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 399068439} + m_PrefabAsset: {fileID: 0} --- !u!1 &408182761 GameObject: m_ObjectHideFlags: 0 @@ -1052,6 +1044,85 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5cdd075dd1b1d5747bd2002cd95e43c2, type: 3} +--- !u!1001 &689489592 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_Name + value: ClearCounter (10) + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.50387 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.99613 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071136 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710003 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -449.999 + objectReference: {fileID: 0} + - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &689489593 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 689489592} + m_PrefabAsset: {fileID: 0} --- !u!1 &691696596 GameObject: m_ObjectHideFlags: 3 @@ -1355,6 +1426,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &769951066 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + m_PrefabInstance: {fileID: 1454735543} + m_PrefabAsset: {fileID: 0} --- !u!4 &824569459 stripped Transform: m_CorrespondingSourceObject: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531, @@ -2033,6 +2110,79 @@ Transform: type: 3} m_PrefabInstance: {fileID: 763156967} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1454735543 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 369744370} + m_Modifications: + - target: {fileID: 3691251770345774455, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_Name + value: PlatesCounter + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalPosition.x + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3747205576130399769, guid: 1c4db8c588dce8a4d849516e515c67c0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1c4db8c588dce8a4d849516e515c67c0, type: 3} --- !u!1001 &1617745535 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset b/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset new file mode 100644 index 0000000..e6ee924 --- /dev/null +++ b/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 28f8f75e2d4dcd44a882af312f45cc94, type: 3} + m_Name: Plate + m_EditorClassIdentifier: + prefab: {fileID: 2446150686974603219, guid: 755553f9d6ad7de4091875d02e9ea07e, type: 3} + sprite: {fileID: 21300000, guid: 3928afb5321bb3d489bbd4ac581b29a2, type: 3} + objectName: Plate diff --git a/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset.meta b/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset.meta new file mode 100644 index 0000000..cb5f73b --- /dev/null +++ b/Assets/ScriptableObjects/KitchenObjectSO/Plate.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33409fb567685fc42bb48805717e6c1a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Counters/PlatesCounter.cs b/Assets/Scripts/Counters/PlatesCounter.cs new file mode 100644 index 0000000..e13d934 --- /dev/null +++ b/Assets/Scripts/Counters/PlatesCounter.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlatesCounter : BaseCounter +{ + + public event EventHandler OnPlateSpawned; + public event EventHandler OnPlateRemoved; + + [SerializeField] private float spawnPlateTimerMax = 4f; + [SerializeField] private KitchenObjectSO plateKitchenObjectSO; + + private float spawnPlateTimer; + private int platesSpawnedAmount; + private int platesSpawnedMax = 4; + + private void Update() + { + spawnPlateTimer += Time.deltaTime; + if (spawnPlateTimer > spawnPlateTimerMax) + { + spawnPlateTimer = 0f; + + if (platesSpawnedAmount < platesSpawnedMax) + { + platesSpawnedAmount++; + + OnPlateSpawned?.Invoke(this, EventArgs.Empty); + } + } + } + + public override void Interact(Player player) + { + if (!player.HasKitchenObject()) + { + // player is empty handed + if (platesSpawnedAmount > 0) + { + // at least 1 plate on counter + platesSpawnedAmount--; + + KitchenObject.SpawnKitchenObject(plateKitchenObjectSO, player); + + OnPlateRemoved?.Invoke(this, EventArgs.Empty); + } + } + } +} diff --git a/Assets/Scripts/Counters/PlatesCounter.cs.meta b/Assets/Scripts/Counters/PlatesCounter.cs.meta new file mode 100644 index 0000000..6f72a64 --- /dev/null +++ b/Assets/Scripts/Counters/PlatesCounter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec5fbe1ea872403428a4455a09ff09d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Counters/PlatesCounterVisual.cs b/Assets/Scripts/Counters/PlatesCounterVisual.cs new file mode 100644 index 0000000..3c452be --- /dev/null +++ b/Assets/Scripts/Counters/PlatesCounterVisual.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlatesCounterVisual : MonoBehaviour +{ + [SerializeField] private PlatesCounter platesCounter; + [SerializeField] private Transform counterTopPoint; + [SerializeField] private Transform plateVisualPrefab; + + private List plateVisualGameObjectList; + + private void Awake() + { + plateVisualGameObjectList = new List(); + } + + private void Start() + { + platesCounter.OnPlateSpawned += PlatesCounter_OnPlateSpawned; + platesCounter.OnPlateRemoved += PlatesCounter_OnPlateRemoved; + } + + private void PlatesCounter_OnPlateRemoved(object sender, System.EventArgs e) + { + GameObject plateGameObject = plateVisualGameObjectList[plateVisualGameObjectList.Count - 1]; + + plateVisualGameObjectList.Remove(plateGameObject); + + Destroy(plateGameObject); + } + + private void PlatesCounter_OnPlateSpawned(object sender, System.EventArgs e) + { + Transform plateVisualTransform = Instantiate(plateVisualPrefab, counterTopPoint); + + float plateOffsetY = .1f; + plateVisualTransform.localPosition = new Vector3(0, plateOffsetY * plateVisualGameObjectList.Count, 0); + + plateVisualGameObjectList.Add(plateVisualTransform.gameObject); + + } +} diff --git a/Assets/Scripts/Counters/PlatesCounterVisual.cs.meta b/Assets/Scripts/Counters/PlatesCounterVisual.cs.meta new file mode 100644 index 0000000..8796178 --- /dev/null +++ b/Assets/Scripts/Counters/PlatesCounterVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c2f5bbd3a2c5ae941856ceb005e76371 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4e50354..b9a4b88 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - REC layers: - Default - TransparentFX