diff --git a/.erp b/.erp index 21b774f..f9ca2ce 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677622826 + 1677626790 8006271043655199372 false \ No newline at end of file diff --git a/Assets/Prefabs/Counter/CuttingCounter.prefab b/Assets/Prefabs/Counter/CuttingCounter.prefab index aa4abd2..90de035 100644 --- a/Assets/Prefabs/Counter/CuttingCounter.prefab +++ b/Assets/Prefabs/Counter/CuttingCounter.prefab @@ -1,5 +1,291 @@ %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} + 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!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 @@ -246,8 +532,31 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4589716710238282922, guid: d72bee846803d074784ffb8f64e993ca, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7742497109725730111} m_SourcePrefab: {fileID: 100100000, guid: d72bee846803d074784ffb8f64e993ca, type: 3} +--- !u!1 &6834223217070166572 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4589716710238282922, guid: d72bee846803d074784ffb8f64e993ca, + type: 3} + m_PrefabInstance: {fileID: 7019417236844361350} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7742497109725730111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6834223217070166572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6d78e6b76d8cc545bcc3eee6bd24c0d, type: 3} + m_Name: + m_EditorClassIdentifier: + cuttingCounter: {fileID: 398074246911718970} --- !u!4 &6834223217070166573 stripped Transform: m_CorrespondingSourceObject: {fileID: 4589716710238282923, guid: d72bee846803d074784ffb8f64e993ca, @@ -265,7 +574,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} @@ -333,6 +642,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2465891155822784618} + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3301415275215605711} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index 2661d56..1f55b2d 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -124,18 +124,24 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!4 &5803644 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, + type: 3} + m_PrefabInstance: {fileID: 27131413} + m_PrefabAsset: {fileID: 0} --- !u!1001 &27131413 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} propertyPath: m_RootOrder - value: 7 + value: -1 objectReference: {fileID: 0} - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} @@ -160,7 +166,7 @@ PrefabInstance: - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} @@ -170,7 +176,7 @@ PrefabInstance: - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 840844539867292559, guid: 3bfdb3694a8dc7c4bb11c56dc2ff30f8, type: 3} @@ -203,7 +209,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 7126917071864944554, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} @@ -213,7 +219,7 @@ PrefabInstance: - target: {fileID: 7340497006416954564, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} propertyPath: m_RootOrder - value: 5 + value: -1 objectReference: {fileID: 0} - target: {fileID: 7340497006416954564, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} @@ -248,7 +254,7 @@ PrefabInstance: - target: {fileID: 7340497006416954564, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7340497006416954564, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} @@ -270,13 +276,25 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce6a8430b230de848bbf23f7a7982ad1, type: 3} +--- !u!4 &176917312 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1101815491} + m_PrefabAsset: {fileID: 0} +--- !u!4 &178047605 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1969259912} + m_PrefabAsset: {fileID: 0} --- !u!1001 &253451472 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -286,7 +304,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 13 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -514,6 +532,118 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &369744369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 369744370} + m_Layer: 0 + m_Name: Counters + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &369744370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 369744369} + 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: + - {fileID: 1143471509} + - {fileID: 654131422} + - {fileID: 1986040960} + - {fileID: 1967643952} + - {fileID: 1419491502} + - {fileID: 5803644} + - {fileID: 178047605} + - {fileID: 515596519} + - {fileID: 451730376} + - {fileID: 1212226408} + - {fileID: 176917312} + - {fileID: 1434749041} + - {fileID: 1194811187} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &392963849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392963852} + - component: {fileID: 392963851} + - component: {fileID: 392963850} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &392963850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392963849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &392963851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392963849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &392963852 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392963849} + 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: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &408182761 GameObject: m_ObjectHideFlags: 0 @@ -638,7 +768,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &410087042 MonoBehaviour: @@ -663,13 +793,31 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 +--- !u!4 &451730376 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1396109600} + m_PrefabAsset: {fileID: 0} +--- !u!4 &515596519 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 253451472} + m_PrefabAsset: {fileID: 0} +--- !u!4 &654131422 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4603154811544690701, guid: 5a6d4a6a519334e4c80af11a89e73536, + type: 3} + m_PrefabInstance: {fileID: 2012115357} + m_PrefabAsset: {fileID: 0} --- !u!1001 &654883703 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 2912204041081368636, guid: 5cdd075dd1b1d5747bd2002cd95e43c2, type: 3} @@ -679,7 +827,7 @@ PrefabInstance: - target: {fileID: 3410192861620921170, guid: 5cdd075dd1b1d5747bd2002cd95e43c2, type: 3} propertyPath: m_RootOrder - value: 4 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3410192861620921170, guid: 5cdd075dd1b1d5747bd2002cd95e43c2, type: 3} @@ -891,7 +1039,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &763156967 PrefabInstance: @@ -899,7 +1047,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -909,7 +1057,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 18 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -944,7 +1092,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -972,7 +1120,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -982,7 +1130,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 19 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1017,7 +1165,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1086,7 +1234,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &974939165 GameObject: @@ -1120,7 +1268,7 @@ Transform: - {fileID: 1139635725} - {fileID: 408182762} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &974939167 MonoBehaviour: @@ -1238,7 +1386,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1248,7 +1396,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 16 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1311,7 +1459,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1321,7 +1469,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 17 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1423,6 +1571,24 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 974939167} +--- !u!4 &1143471509 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, + type: 3} + m_PrefabInstance: {fileID: 1705190436} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1194811187 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 767078439} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1212226408 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 1083284344} + m_PrefabAsset: {fileID: 0} --- !u!1 &1228607671 GameObject: m_ObjectHideFlags: 0 @@ -1527,7 +1693,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1396109600 PrefabInstance: @@ -1535,7 +1701,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1545,7 +1711,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 15 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1602,18 +1768,30 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &1419491502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7484982262069488212, guid: cb848b442168216438e53081cd58bbaf, + type: 3} + m_PrefabInstance: {fileID: 1745578203} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1434749041 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, + type: 3} + m_PrefabInstance: {fileID: 763156967} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1705190436 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, type: 3} propertyPath: m_RootOrder - value: 1 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3123278271184499230, guid: ca9c1594c8f67cb4daee56bdfadbbdc9, type: 3} @@ -1681,7 +1859,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 6982468136215787834, guid: cb848b442168216438e53081cd58bbaf, type: 3} @@ -1691,7 +1869,7 @@ PrefabInstance: - target: {fileID: 7484982262069488212, guid: cb848b442168216438e53081cd58bbaf, type: 3} propertyPath: m_RootOrder - value: 6 + value: -1 objectReference: {fileID: 0} - target: {fileID: 7484982262069488212, guid: cb848b442168216438e53081cd58bbaf, type: 3} @@ -1748,13 +1926,120 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb848b442168216438e53081cd58bbaf, type: 3} +--- !u!1 &1955192633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1955192637} + - component: {fileID: 1955192636} + - component: {fileID: 1955192635} + - component: {fileID: 1955192634} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1955192634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955192633} + 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 &1955192635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955192633} + 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: 0 +--- !u!223 &1955192636 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955192633} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + 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!224 &1955192637 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955192633} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!4 &1967643952 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7340497006416954564, guid: ce6a8430b230de848bbf23f7a7982ad1, + type: 3} + m_PrefabInstance: {fileID: 100998660} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1969259912 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 777946716258335333, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1764,7 +2049,7 @@ PrefabInstance: - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} propertyPath: m_RootOrder - value: 8 + value: -1 objectReference: {fileID: 0} - target: {fileID: 1005032900244154635, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} @@ -1821,13 +2106,19 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1648f5f41e27c1f4c911be81b11bbbe5, type: 3} +--- !u!4 &1986040960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3410192861620921170, guid: 5cdd075dd1b1d5747bd2002cd95e43c2, + type: 3} + m_PrefabInstance: {fileID: 654883703} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2012115357 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 369744370} m_Modifications: - target: {fileID: 4096299401467671395, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} @@ -1837,7 +2128,7 @@ PrefabInstance: - target: {fileID: 4603154811544690701, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} propertyPath: m_RootOrder - value: 2 + value: -1 objectReference: {fileID: 0} - target: {fileID: 4603154811544690701, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} @@ -1847,7 +2138,7 @@ PrefabInstance: - target: {fileID: 4603154811544690701, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} propertyPath: m_LocalPosition.y - value: -0.00000047683716 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4603154811544690701, guid: 5a6d4a6a519334e4c80af11a89e73536, type: 3} @@ -1964,5 +2255,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/Scripts/CuttingCounter.cs b/Assets/Scripts/CuttingCounter.cs index baef90b..cc71eee 100644 --- a/Assets/Scripts/CuttingCounter.cs +++ b/Assets/Scripts/CuttingCounter.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -5,6 +6,13 @@ using UnityEngine; public class CuttingCounter : BaseCounter { + public event EventHandler OnProgressChange; + public class OnProgressChangeEventsArgs : EventArgs + { + public float progressNormalized; + } + public event EventHandler OnCut; + [SerializeField] private CuttingRecipeSO[] cuttingRecipeSOArray; private int cuttingProgress; @@ -22,6 +30,13 @@ public class CuttingCounter : BaseCounter // player is carrying an object that can be chopped player.GetKitchenObject().SetKitchenObjectParent(this); cuttingProgress = 0; + + CuttingRecipeSO cuttingRecipeSO = GetCuttingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO()); + + OnProgressChange?.Invoke(this, new OnProgressChangeEventsArgs + { + progressNormalized = (float)cuttingProgress / cuttingRecipeSO.cuttingProgressMax, + }); } } else @@ -51,9 +66,16 @@ public class CuttingCounter : BaseCounter // there is a KitchenObject AND it is able to be cut cuttingProgress++; - + + OnCut?.Invoke(this, EventArgs.Empty); + CuttingRecipeSO cuttingRecipeSO = GetCuttingRecipeSOWithInput(GetKitchenObject().GetKitchenObjectSO()); + OnProgressChange?.Invoke(this, new OnProgressChangeEventsArgs + { + progressNormalized = (float)cuttingProgress / cuttingRecipeSO.cuttingProgressMax, + }); + if (cuttingProgress >= cuttingRecipeSO.cuttingProgressMax) { KitchenObjectSO outputKitchenSO = GetOutputForInput(GetKitchenObject().GetKitchenObjectSO()); diff --git a/Assets/Scripts/CuttingCounterVisual.cs b/Assets/Scripts/CuttingCounterVisual.cs new file mode 100644 index 0000000..c1a2065 --- /dev/null +++ b/Assets/Scripts/CuttingCounterVisual.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CuttingCounterVisual : MonoBehaviour +{ + + private const string CUT = "Cut"; + + [SerializeField] private CuttingCounter cuttingCounter; + + private Animator animator; + + private void Awake() + { + animator = GetComponent(); + } + + private void Start() + { + cuttingCounter.OnCut += ContainerCounter_OnCut; + } + + private void ContainerCounter_OnCut(object sender, System.EventArgs e) + { + animator.SetTrigger(CUT); + } +} diff --git a/Assets/Scripts/CuttingCounterVisual.cs.meta b/Assets/Scripts/CuttingCounterVisual.cs.meta new file mode 100644 index 0000000..2ce6a10 --- /dev/null +++ b/Assets/Scripts/CuttingCounterVisual.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d6d78e6b76d8cc545bcc3eee6bd24c0d +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 new file mode 100644 index 0000000..062ff6f --- /dev/null +++ b/Assets/Scripts/ProgressBarUI.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class ProgressBarUI : MonoBehaviour +{ + + [SerializeField] private CuttingCounter cuttingCounter; + [SerializeField] private Image barImage; + + private void Start() + { + cuttingCounter.OnProgressChange += CuttingCounter_OnProgressChange; + + barImage.fillAmount = 0f; + + Hide(); + } + + private void CuttingCounter_OnProgressChange(object sender, CuttingCounter.OnProgressChangeEventsArgs e) + { + barImage.fillAmount = e.progressNormalized; + + if (e.progressNormalized == 0f || e.progressNormalized == 1f) { + Hide(); + } else + { + Show(); + } + } + + private void Show() + { + gameObject.SetActive(true); + } + + private void Hide() + { + gameObject.SetActive(false); + } + +} diff --git a/Assets/Scripts/ProgressBarUI.cs.meta b/Assets/Scripts/ProgressBarUI.cs.meta new file mode 100644 index 0000000..54ce626 --- /dev/null +++ b/Assets/Scripts/ProgressBarUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 26eaed537ed747c47a98ae12d77258c9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: