diff --git a/.erp b/.erp index 6c740b2..61d0a3b 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677886908 + 1677887559 4881733312513047015 false \ No newline at end of file diff --git a/Assets/Scripts/Counters/PlatesCounter.cs b/Assets/Scripts/Counters/PlatesCounter.cs index 16b978e..9291481 100644 --- a/Assets/Scripts/Counters/PlatesCounter.cs +++ b/Assets/Scripts/Counters/PlatesCounter.cs @@ -18,7 +18,10 @@ public class PlatesCounter : BaseCounter private void Update() { - spawnPlateTimer += Time.deltaTime; + if (GameStateManager.Instace.IsGamePlaying()) + { + spawnPlateTimer += Time.deltaTime; + } if (spawnPlateTimer > spawnPlateTimerMax) { spawnPlateTimer = 0f; diff --git a/Assets/Scripts/DeliveryManager.cs b/Assets/Scripts/DeliveryManager.cs index 07948e7..a60e064 100644 --- a/Assets/Scripts/DeliveryManager.cs +++ b/Assets/Scripts/DeliveryManager.cs @@ -29,7 +29,11 @@ public class DeliveryManager : MonoBehaviour private void Update() { + if (GameStateManager.Instace.IsGamePlaying()) + { spawnRecipeTimer -= Time.deltaTime; + } + if (spawnRecipeTimer <= 0f) { spawnRecipeTimer = spawnRecipeTimerMax; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 310bb8e..f34dec3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 5355030455530b0f0b5d5d7143730c44404e4a737f2c2560787d4862e7b16d6a flags: 0 RecentlyUsedSceneGuid-1: - value: 0605505051025f0c54590e71437a0744414f4e732f712235757c4b6ab7b1323d + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 RecentlyUsedSceneGuid-2: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 0605505051025f0c54590e71437a0744414f4e732f712235757c4b6ab7b1323d flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 48d9523..6f1ce5c 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -23,7 +23,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 19 + controlID: 9797 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -147,7 +147,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 20 + controlID: 9798 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -172,7 +172,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 21 + controlID: 9799 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -545,9 +545,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.7102861, y: -8.605359, z: 19.212528} + m_Target: {x: 5.5455303, y: -8.735527, z: 19.276913} speed: 2 - m_Value: {x: 1.7102861, y: -8.605359, z: 19.212528} + m_Value: {x: 5.5455303, y: -8.735527, z: 19.276913} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -593,9 +593,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.26363647, y: -0.060439397, z: 0.016494267, w: 0.9626463} + m_Target: {x: 0.266954, y: 0.024859447, z: -0.006946285, w: 0.96342427} speed: 2 - m_Value: {x: 0.26217687, y: -0.060460538, z: 0.01640261, w: 0.9629843} + m_Value: {x: 0.26694852, y: 0.023412913, z: -0.0065454626, w: 0.9634041} m_Size: m_Target: 12.62771 speed: 2 @@ -806,7 +806,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 197 + controlID: 9673 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -870,10 +870,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 497} - m_SelectedIDs: 0ac8fdff - m_LastClickedID: -145398 - m_ExpandedIDs: e4b1f9ff0ac8fdff88f6fffffefaffffdc710000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: ca820000 + m_LastClickedID: 0 + m_ExpandedIDs: e4a6f7ffe4b1f9ff0ac8fdff88f6fffffefaffffdc710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -924,7 +924,7 @@ MonoBehaviour: - {fileID: 13} - {fileID: 14} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -973,7 +973,7 @@ MonoBehaviour: m_SkipHidden: 1 m_SearchArea: 1 m_Folders: - - Assets/Animations + - Assets/Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -989,7 +989,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 118} m_SelectedIDs: 3c6f0000 m_LastClickedID: 28476 - m_ExpandedIDs: 0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000 + m_ExpandedIDs: ffffffff0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1014,10 +1014,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0ac8fdff - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000 + scrollPos: {x: 0, y: 180} + m_SelectedIDs: ca820000 + m_LastClickedID: 33482 + m_ExpandedIDs: ffffffff0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e810000208100007a810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1042,8 +1042,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0ac8fdff - m_LastClickedInstanceID: -145398 + m_SelectedInstanceIDs: ca820000 + m_LastClickedInstanceID: 33482 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000ea050000 m_RenameOverlay: @@ -1096,7 +1096,7 @@ MonoBehaviour: serializedVersion: 2 x: 422 y: 1031 - width: 1451 + width: 1454 height: 320 m_SerializedDataModeController: m_DataMode: 0 @@ -1165,8 +1165,8 @@ MonoBehaviour: y: 0 width: 682 height: 1299 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16}