diff --git a/.erp b/.erp
index 2de6fa9..bd2c342 100644
--- a/.erp
+++ b/.erp
@@ -5,7 +5,7 @@
false
false
true
- 1677690484
+ 1677697643
23669525547325516
false
\ No newline at end of file
diff --git a/Assets/Prefabs/Counter/CuttingCounter.prefab b/Assets/Prefabs/Counter/CuttingCounter.prefab
index 5b7c1fa..9023b7a 100644
--- a/Assets/Prefabs/Counter/CuttingCounter.prefab
+++ b/Assets/Prefabs/Counter/CuttingCounter.prefab
@@ -1,305 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3041087011414046211
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9101376275206351932}
- - component: {fileID: 4615443926328011936}
- - component: {fileID: 1687609636383514776}
- - component: {fileID: 4921330086276933541}
- m_Layer: 5
- m_Name: Background
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &9101376275206351932
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3041087011414046211}
- 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: 3301415275215605711}
- 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}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1.1, y: 0.3}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4615443926328011936
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3041087011414046211}
- m_CullTransparentMesh: 1
---- !u!114 &1687609636383514776
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3041087011414046211}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 6820e50a72696664cb1a9b5484ecee33, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 0
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!114 &4921330086276933541
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3041087011414046211}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
- m_EffectDistance: {x: 0.1, y: -0.1}
- m_UseGraphicAlpha: 1
---- !u!1 &4204061215832342760
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3301415275215605711}
- - component: {fileID: 8903176258499217531}
- - component: {fileID: 9092482024607579143}
- - component: {fileID: 4296564549843348462}
- - component: {fileID: 3126366524138266562}
- - component: {fileID: 2997208778475636387}
- m_Layer: 5
- m_Name: ProgressBarUI
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &3301415275215605711
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_LocalRotation: {x: -0, y: 0.999996, z: -0, w: -0.0028347075}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 9101376275206351932}
- - {fileID: 272353210014501261}
- m_Father: {fileID: 3123278271184499230}
- m_RootOrder: -1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 2.5}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &8903176258499217531
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
- m_UpdateRectTransformForStandalone: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!114 &9092482024607579143
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UiScaleMode: 0
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
---- !u!114 &4296564549843348462
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
---- !u!114 &3126366524138266562
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 26eaed537ed747c47a98ae12d77258c9, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- cuttingCounter: {fileID: 398074246911718970}
- barImage: {fileID: 3297295305522035400}
---- !u!114 &2997208778475636387
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4204061215832342760}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5808323afc086764e9ce5b8db2df4456, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- mode: 2
---- !u!1 &5387297363858003324
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 272353210014501261}
- - component: {fileID: 7384840333244554478}
- - component: {fileID: 3297295305522035400}
- m_Layer: 5
- m_Name: Bar
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &272353210014501261
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5387297363858003324}
- 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: 3301415275215605711}
- 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}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 1, y: 0.2}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7384840333244554478
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5387297363858003324}
- m_CullTransparentMesh: 1
---- !u!114 &3297295305522035400
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5387297363858003324}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.6011356, g: 1, b: 0.25, a: 1}
- m_RaycastTarget: 1
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 6820e50a72696664cb1a9b5484ecee33, type: 3}
- m_Type: 3
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 0
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
--- !u!1001 &2128348809174275265
PrefabInstance:
m_ObjectHideFlags: 0
@@ -475,6 +175,145 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 2128348809174275265}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6104342252951926601
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 3123278271184499230}
+ m_Modifications:
+ - target: {fileID: 7989712882339444641, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Name
+ value: ProgressBarUI
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.0028347075
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.999996
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9211531558445672587, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: cuttingCounter
+ value:
+ objectReference: {fileID: 398074246911718970}
+ - target: {fileID: 9211531558445672587, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: hasProgressGameObject
+ value:
+ objectReference: {fileID: 3197933390074847600}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 40be420ea0f02144c97ad355735491a4, type: 3}
+--- !u!224 &3301415275215605711 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ m_PrefabInstance: {fileID: 6104342252951926601}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &7019417236844361350
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Counter/StoveCounter.prefab b/Assets/Prefabs/Counter/StoveCounter.prefab
index f2591ee..ad539a1 100644
--- a/Assets/Prefabs/Counter/StoveCounter.prefab
+++ b/Assets/Prefabs/Counter/StoveCounter.prefab
@@ -26,7 +26,7 @@ PrefabInstance:
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
type: 3}
propertyPath: m_RootOrder
- value: 0
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
type: 3}
@@ -88,12 +88,16 @@ PrefabInstance:
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
type: 3}
- insertIndex: 0
+ insertIndex: -1
+ addedObject: {fileID: 9076728630823268195}
+ - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
+ type: 3}
+ insertIndex: -1
addedObject: {fileID: 8298910125245091378}
- targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5,
type: 3}
insertIndex: -1
- addedObject: {fileID: 9076728630823268195}
+ addedObject: {fileID: 265883278189504360}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5,
type: 3}
@@ -132,8 +136,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
counterTopPoint: {fileID: 976370877519106100}
fryingRecipeSOArray:
- - {fileID: 11400000, guid: 3d422b39fbddcbd47bae458238f9c627, type: 2}
- {fileID: 11400000, guid: ab68452688ff0fc4eb1439a3f3f5eca4, type: 2}
+ burningRecipeSOArray:
+ - {fileID: 11400000, guid: cec292382d09d024dab632bd05914ac4, type: 2}
--- !u!1001 &4775776715932421064
PrefabInstance:
m_ObjectHideFlags: 0
@@ -142,6 +147,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6616006834372177299}
m_Modifications:
+ - target: {fileID: 17251720544094567, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4589716710238282922, guid: 93af8b85a17635f40a5b76ed82a86c18,
type: 3}
propertyPath: m_Name
@@ -202,11 +212,53 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5220305274835918574, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 4879280388637591019}
m_SourcePrefab: {fileID: 100100000, guid: 93af8b85a17635f40a5b76ed82a86c18, type: 3}
+--- !u!1 &735432968877282598 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5220305274835918574, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ m_PrefabInstance: {fileID: 4775776715932421064}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &4790631293273522863 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 17251720544094567, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ m_PrefabInstance: {fileID: 4775776715932421064}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &9076728630823268194 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ m_PrefabInstance: {fileID: 4775776715932421064}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &4879280388637591019
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9076728630823268194}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e49edd74ac4ee404585246500a99a307, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ stoveCounter: {fileID: 5065327384487018965}
+ stoveOnGameObject: {fileID: 4790631293273522863}
+ particlesGameObject: {fileID: 735432968877282598}
--- !u!4 &9076728630823268195 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: 93af8b85a17635f40a5b76ed82a86c18,
@@ -221,6 +273,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6616006834372177299}
m_Modifications:
+ - target: {fileID: 17251720544094567, guid: 93af8b85a17635f40a5b76ed82a86c18,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 496015676961670754, guid: 93af8b85a17635f40a5b76ed82a86c18,
type: 3}
propertyPath: m_Materials.Array.data[0]
@@ -387,3 +444,137 @@ MonoBehaviour:
- {fileID: 703760627113338248}
- {fileID: 8089917589884704374}
- {fileID: 3215134679951380567}
+--- !u!1001 &8851431658892468206
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 6616006834372177299}
+ m_Modifications:
+ - target: {fileID: 7989712882339444641, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Name
+ value: ProgressBarUI
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.0028347075
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.999996
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9211531558445672587, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ propertyPath: hasProgressGameObject
+ value:
+ objectReference: {fileID: 6695037738886840061}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 40be420ea0f02144c97ad355735491a4, type: 3}
+--- !u!224 &265883278189504360 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8747680823712233606, guid: 40be420ea0f02144c97ad355735491a4,
+ type: 3}
+ m_PrefabInstance: {fileID: 8851431658892468206}
+ m_PrefabAsset: {fileID: 0}
diff --git a/Assets/Prefabs/ProgressBarUI.prefab b/Assets/Prefabs/ProgressBarUI.prefab
new file mode 100644
index 0000000..1cd8e57
--- /dev/null
+++ b/Assets/Prefabs/ProgressBarUI.prefab
@@ -0,0 +1,302 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2194797313191109173
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6300937350335790788}
+ - component: {fileID: 3659952909956656039}
+ - component: {fileID: 8751798593304612225}
+ m_Layer: 5
+ m_Name: Bar
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6300937350335790788
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2194797313191109173}
+ 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: 8747680823712233606}
+ 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}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1, y: 0.2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3659952909956656039
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2194797313191109173}
+ m_CullTransparentMesh: 1
+--- !u!114 &8751798593304612225
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2194797313191109173}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.6011356, g: 1, b: 0.25, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 6820e50a72696664cb1a9b5484ecee33, type: 3}
+ m_Type: 3
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 0
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7989712882339444641
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8747680823712233606}
+ - component: {fileID: 3402633676458229554}
+ - component: {fileID: 3069210661805394766}
+ - component: {fileID: 8004739725022305447}
+ - component: {fileID: 9211531558445672587}
+ - component: {fileID: 9020361984509637098}
+ m_Layer: 5
+ m_Name: ProgressBarUI
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &8747680823712233606
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_LocalRotation: {x: -0, y: 0.999996, z: -0, w: -0.0028347075}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3096347268971551605}
+ - {fileID: 6300937350335790788}
+ m_Father: {fileID: 0}
+ m_RootOrder: -1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 2.5}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &3402633676458229554
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_UpdateRectTransformForStandalone: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_TargetDisplay: 0
+--- !u!114 &3069210661805394766
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 1
+--- !u!114 &8004739725022305447
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!114 &9211531558445672587
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 26eaed537ed747c47a98ae12d77258c9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ cuttingCounter: {fileID: 0}
+ barImage: {fileID: 8751798593304612225}
+--- !u!114 &9020361984509637098
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7989712882339444641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5808323afc086764e9ce5b8db2df4456, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ mode: 2
+--- !u!1 &9116101936829432138
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3096347268971551605}
+ - component: {fileID: 1493967075530021865}
+ - component: {fileID: 4890173528473671633}
+ - component: {fileID: 1223546762625667308}
+ m_Layer: 5
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3096347268971551605
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9116101936829432138}
+ 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: 8747680823712233606}
+ 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}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1.1, y: 0.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1493967075530021865
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9116101936829432138}
+ m_CullTransparentMesh: 1
+--- !u!114 &4890173528473671633
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9116101936829432138}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 6820e50a72696664cb1a9b5484ecee33, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 0
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1223546762625667308
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9116101936829432138}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+ m_EffectDistance: {x: 0.1, y: -0.1}
+ m_UseGraphicAlpha: 1
diff --git a/Assets/Prefabs/ProgressBarUI.prefab.meta b/Assets/Prefabs/ProgressBarUI.prefab.meta
new file mode 100644
index 0000000..44d32af
--- /dev/null
+++ b/Assets/Prefabs/ProgressBarUI.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40be420ea0f02144c97ad355735491a4
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity
index 94df2c1..7899a25 100644
--- a/Assets/Scenes/GaneScene.unity
+++ b/Assets/Scenes/GaneScene.unity
@@ -666,8 +666,10 @@ Transform:
- {fileID: 2078814028}
- {fileID: 78671169}
- {fileID: 1617745536}
+ - {fileID: 1641322150}
+ - {fileID: 824569459}
m_Father: {fileID: 0}
- m_RootOrder: 11
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &370799796
PrefabInstance:
@@ -675,12 +677,12 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 369744370}
m_Modifications:
- target: {fileID: 6616006834372177299, guid: ae14b9e7a32963047a859cc7ab07f505,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 6616006834372177299, guid: ae14b9e7a32963047a859cc7ab07f505,
type: 3}
@@ -808,7 +810,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &408182761
GameObject:
@@ -934,7 +936,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &410087042
MonoBehaviour:
@@ -1205,7 +1207,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &763156967
PrefabInstance:
@@ -1353,6 +1355,12 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3}
+--- !u!4 &824569459 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531,
+ type: 3}
+ m_PrefabInstance: {fileID: 1989753350}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &832575517
GameObject:
m_ObjectHideFlags: 0
@@ -1400,7 +1408,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &974939165
GameObject:
@@ -1434,7 +1442,7 @@ Transform:
- {fileID: 1139635725}
- {fileID: 408182762}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &974939167
MonoBehaviour:
@@ -1859,7 +1867,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1329055550
PrefabInstance:
@@ -2104,6 +2112,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1617745535}
m_PrefabAsset: {fileID: 0}
+--- !u!4 &1641322150 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6616006834372177299, guid: ae14b9e7a32963047a859cc7ab07f505,
+ type: 3}
+ m_PrefabInstance: {fileID: 370799796}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1705190436
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2344,7 +2358,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2442,7 +2456,7 @@ PrefabInstance:
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 0}
+ m_TransformParent: {fileID: 369744370}
m_Modifications:
- target: {fileID: 6350809166314804869, guid: dcc374f2f4a690540874e0afc4c73531,
type: 3}
@@ -2452,7 +2466,7 @@ PrefabInstance:
- target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531,
type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 6853301306222527979, guid: dcc374f2f4a690540874e0afc4c73531,
type: 3}
@@ -2731,5 +2745,5 @@ Transform:
m_Children:
- {fileID: 691696597}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 46, y: 0, z: 0}
diff --git a/Assets/ScriptableObjects/BurningRecipeSO.meta b/Assets/ScriptableObjects/BurningRecipeSO.meta
new file mode 100644
index 0000000..f30817f
--- /dev/null
+++ b/Assets/ScriptableObjects/BurningRecipeSO.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 88679d1276e14844196809a1d34a4101
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset b/Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset
similarity index 83%
rename from Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset
rename to Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset
index 9a112b6..4fbfc3a 100644
--- a/Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset
+++ b/Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset
@@ -9,9 +9,9 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d80159ab9685c4f4fadd0af33fe30e0f, type: 3}
+ m_Script: {fileID: 11500000, guid: f7c19db799100754091bcd4a956edc1a, type: 3}
m_Name: MeatPattyCooked-MeatPattyBurnt
m_EditorClassIdentifier:
input: {fileID: 11400000, guid: cf77ec56d13b4c7478384a548ab18277, type: 2}
output: {fileID: 11400000, guid: 42754f770e37e78488140348e6a9f9c3, type: 2}
- fryingTimerMax: 3
+ burningTimerMax: 5
diff --git a/Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta b/Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta
similarity index 79%
rename from Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta
rename to Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta
index ce72d05..1d21735 100644
--- a/Assets/ScriptableObjects/FryingRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta
+++ b/Assets/ScriptableObjects/BurningRecipeSO/MeatPattyCooked-MeatPattyBurnt.asset.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3d422b39fbddcbd47bae458238f9c627
+guid: cec292382d09d024dab632bd05914ac4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
diff --git a/Assets/Scripts/Counters/CuttingCounter.cs b/Assets/Scripts/Counters/CuttingCounter.cs
index cc71eee..b566130 100644
--- a/Assets/Scripts/Counters/CuttingCounter.cs
+++ b/Assets/Scripts/Counters/CuttingCounter.cs
@@ -3,14 +3,10 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-public class CuttingCounter : BaseCounter
+public class CuttingCounter : BaseCounter, IHasProgress
{
- public event EventHandler OnProgressChange;
- public class OnProgressChangeEventsArgs : EventArgs
- {
- public float progressNormalized;
- }
+ public event EventHandler OnProgressChange;
public event EventHandler OnCut;
[SerializeField] private CuttingRecipeSO[] cuttingRecipeSOArray;
@@ -33,7 +29,7 @@ public class CuttingCounter : BaseCounter
CuttingRecipeSO cuttingRecipeSO = GetCuttingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO());
- OnProgressChange?.Invoke(this, new OnProgressChangeEventsArgs
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
{
progressNormalized = (float)cuttingProgress / cuttingRecipeSO.cuttingProgressMax,
});
@@ -71,7 +67,7 @@ public class CuttingCounter : BaseCounter
CuttingRecipeSO cuttingRecipeSO = GetCuttingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO());
- OnProgressChange?.Invoke(this, new OnProgressChangeEventsArgs
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
{
progressNormalized = (float)cuttingProgress / cuttingRecipeSO.cuttingProgressMax,
});
diff --git a/Assets/Scripts/Counters/StoveCounter.cs b/Assets/Scripts/Counters/StoveCounter.cs
index a724c3f..ce92c67 100644
--- a/Assets/Scripts/Counters/StoveCounter.cs
+++ b/Assets/Scripts/Counters/StoveCounter.cs
@@ -1,33 +1,104 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting;
using UnityEngine;
using static CuttingCounter;
-public class StoveCounter : BaseCounter
+public class StoveCounter : BaseCounter, IHasProgress
{
- [SerializeField] private FryingRecipeSO[] fryingRecipeSOArray;
+ public event EventHandler OnProgressChange;
+ public event EventHandler OnStateChanged;
+ public class OnStateChangedEventArgs : EventArgs
+ {
+ public State state;
+ }
+ public enum State
+ {
+ Idle,
+ Frying,
+ Fried,
+ Burnt
+ }
+
+ [SerializeField] private FryingRecipeSO[] fryingRecipeSOArray;
+ [SerializeField] private BurningRecipeSO[] burningRecipeSOArray;
+
+ private State state;
private float fryingTimer;
+ private float burningTimer;
+ private FryingRecipeSO fryingRecipeSO;
+ private BurningRecipeSO burningRecipeSO;
+
+ private void Start()
+ {
+ state = State.Idle;
+ }
private void Update()
{
if (HasKitchenObject())
{
- fryingTimer += Time.deltaTime;
- FryingRecipeSO fryingRecipeSO = GetFryingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO());
- if (fryingTimer > fryingRecipeSO.fryingTimerMax)
+ switch (state)
{
- // Fried
- fryingTimer = 0f;
- Debug.Log("Fried!");
- GetKitchenObject().DestroySelf();
+ case State.Idle:
+ break;
+ case State.Frying:
+ fryingTimer += Time.deltaTime;
- KitchenObject.SpawnKitchenObject(fryingRecipeSO.output, this);
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
+ {
+ progressNormalized = (float)fryingTimer / fryingRecipeSO.fryingTimerMax,
+ });
+ if (fryingTimer > fryingRecipeSO.fryingTimerMax)
+ {
+ // Fried
+ GetKitchenObject().DestroySelf();
+
+ KitchenObject.SpawnKitchenObject(fryingRecipeSO.output, this);
+
+ burningTimer = 0f;
+ burningRecipeSO = GetBurningRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO());
+
+ state = State.Fried;
+ OnStateChanged?.Invoke(this, new OnStateChangedEventArgs {
+ state = state,
+ });
+ }
+ break;
+ case State.Fried:
+ burningTimer += Time.deltaTime;
+
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
+ {
+ progressNormalized = (float)burningTimer / burningRecipeSO.burningTimerMax,
+ });
+
+ if (burningTimer > burningRecipeSO.burningTimerMax)
+ {
+ // Fried
+ GetKitchenObject().DestroySelf();
+
+ KitchenObject.SpawnKitchenObject(burningRecipeSO.output, this);
+
+ state = State.Burnt;
+ OnStateChanged?.Invoke(this, new OnStateChangedEventArgs
+ {
+ state = state,
+ });
+
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
+ {
+ progressNormalized = 0f,
+ });
+ }
+ break;
+ case State.Burnt:
+ break;
}
- Debug.Log(fryingTimer);
}
}
@@ -43,6 +114,20 @@ public class StoveCounter : BaseCounter
{
// player is carrying an object that can be Fried
player.GetKitchenObject().SetKitchenObjectParent(this);
+
+ fryingRecipeSO = GetFryingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO());
+
+ fryingTimer = 0f;
+ state = State.Frying;
+ OnStateChanged?.Invoke(this, new OnStateChangedEventArgs
+ {
+ state = state,
+ });
+
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
+ {
+ progressNormalized = (float)fryingTimer / fryingRecipeSO.fryingTimerMax,
+ });
}
}
else
@@ -61,6 +146,16 @@ public class StoveCounter : BaseCounter
{
// player has nothing
GetKitchenObject().SetKitchenObjectParent(player);
+ state = State.Idle;
+ OnStateChanged?.Invoke(this, new OnStateChangedEventArgs
+ {
+ state = state,
+ });
+
+ OnProgressChange?.Invoke(this, new IHasProgress.OnProgressChangeEventsArgs
+ {
+ progressNormalized = 0f,
+ });
}
}
@@ -98,4 +193,17 @@ public class StoveCounter : BaseCounter
}
+ private BurningRecipeSO GetBurningRecipeSOWithInput(KitchenObjectSO inputKitchenObjectSO)
+ {
+ foreach (BurningRecipeSO burningRecipeSO in burningRecipeSOArray)
+ {
+ if (burningRecipeSO.input == inputKitchenObjectSO)
+ {
+ return burningRecipeSO;
+ }
+ }
+ return null;
+
+ }
+
}
diff --git a/Assets/Scripts/Counters/StoveCounterVisual.cs b/Assets/Scripts/Counters/StoveCounterVisual.cs
new file mode 100644
index 0000000..03d78c3
--- /dev/null
+++ b/Assets/Scripts/Counters/StoveCounterVisual.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class StoveCounterVisual : MonoBehaviour
+{
+ [SerializeField] private StoveCounter stoveCounter;
+
+ [SerializeField] private GameObject stoveOnGameObject;
+ [SerializeField] private GameObject particlesGameObject;
+
+ private void Start()
+ {
+ stoveCounter.OnStateChanged += StoveCounter_OnStateChanged;
+ }
+
+ private void StoveCounter_OnStateChanged(object sender, StoveCounter.OnStateChangedEventArgs e)
+ {
+ bool showVisual = e.state == StoveCounter.State.Frying || e.state == StoveCounter.State.Fried;
+ stoveOnGameObject.SetActive(showVisual);
+ particlesGameObject.SetActive(showVisual);
+ }
+}
diff --git a/Assets/Scripts/Counters/StoveCounterVisual.cs.meta b/Assets/Scripts/Counters/StoveCounterVisual.cs.meta
new file mode 100644
index 0000000..dcfeff8
--- /dev/null
+++ b/Assets/Scripts/Counters/StoveCounterVisual.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e49edd74ac4ee404585246500a99a307
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/IHasProgress.cs b/Assets/Scripts/IHasProgress.cs
new file mode 100644
index 0000000..ff6c7d7
--- /dev/null
+++ b/Assets/Scripts/IHasProgress.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public interface IHasProgress
+{
+
+ public event EventHandler OnProgressChange;
+ public class OnProgressChangeEventsArgs : EventArgs
+ {
+ public float progressNormalized;
+ }
+
+}
diff --git a/Assets/Scripts/IHasProgress.cs.meta b/Assets/Scripts/IHasProgress.cs.meta
new file mode 100644
index 0000000..4c8df4a
--- /dev/null
+++ b/Assets/Scripts/IHasProgress.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b17a4d6abcdd24141bc2cd588d5fb26a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/ProgressBarUI.cs b/Assets/Scripts/ProgressBarUI.cs
index 062ff6f..75a87f7 100644
--- a/Assets/Scripts/ProgressBarUI.cs
+++ b/Assets/Scripts/ProgressBarUI.cs
@@ -6,19 +6,26 @@ using UnityEngine.UI;
public class ProgressBarUI : MonoBehaviour
{
- [SerializeField] private CuttingCounter cuttingCounter;
+ [SerializeField] private GameObject hasProgressGameObject;
[SerializeField] private Image barImage;
+ private IHasProgress hasProgress;
+
private void Start()
{
- cuttingCounter.OnProgressChange += CuttingCounter_OnProgressChange;
+ hasProgress = hasProgressGameObject.GetComponent();
+ if (hasProgress == null) {
+ Debug.LogError("Game Object " + hasProgressGameObject + " does not have a componenet that implements IHasProgress!");
+ }
+
+ hasProgress.OnProgressChange += HasProgress_OnProgressChange;
barImage.fillAmount = 0f;
Hide();
}
- private void CuttingCounter_OnProgressChange(object sender, CuttingCounter.OnProgressChangeEventsArgs e)
+ private void HasProgress_OnProgressChange(object sender, IHasProgress.OnProgressChangeEventsArgs e)
{
barImage.fillAmount = e.progressNormalized;
diff --git a/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs b/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs
new file mode 100644
index 0000000..ff40646
--- /dev/null
+++ b/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs
@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu()]
+public class BurningRecipeSO : ScriptableObject
+{
+
+ public KitchenObjectSO input;
+ public KitchenObjectSO output;
+ public float burningTimerMax;
+
+}
diff --git a/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs.meta b/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs.meta
new file mode 100644
index 0000000..7c22f2b
--- /dev/null
+++ b/Assets/Scripts/ScriptableObjects/BurningRecipeSO.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7c19db799100754091bcd4a956edc1a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Assets/Materials/Floor.mat b/Assets/_Assets/Materials/Floor.mat
index 48a8f0f..c55fd69 100644
--- a/Assets/_Assets/Materials/Floor.mat
+++ b/Assets/_Assets/Materials/Floor.mat
@@ -99,12 +99,12 @@ Material:
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- - _Metallic: 0
+ - _Metallic: 0.234
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- - _Smoothness: 0.5
+ - _Smoothness: 0.621
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1