diff --git a/Assets/LevelChanger.cs b/Assets/LevelChanger.cs deleted file mode 100644 index f003c98d..00000000 --- a/Assets/LevelChanger.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.SceneManagement; - -public class LevelChanger : MonoBehaviour -{ - [SerializeField] - public Animator _animator; - private const string FADE_OUT = "FadeOut"; - private const string FADE_IN = "FadeIn"; - - private string _sceneToLoad; - private Action _onSceneLoaded; - - private void Start() - { - UnityEngine.SceneManagement.SceneManager.sceneLoaded += SceneLoaded; - } - - private void SceneLoaded(Scene arg0, LoadSceneMode arg1) - { - _animator.SetTrigger(FADE_IN); - } - - public void FadeIn(Action onSceneLoaded) - { - _onSceneLoaded = onSceneLoaded; - _animator.SetTrigger(FADE_IN); - } - - public void FadeToLevel(string name, Action onSceneLoaded) - { - _sceneToLoad = name; - _onSceneLoaded = onSceneLoaded; - _animator.SetTrigger(FADE_OUT); - } - - public void OnFadeInComplete() - { - _onSceneLoaded.Invoke(); - } - public void OnFadeOutComplete() - { - UnityEngine.SceneManagement.SceneManager.LoadScene(_sceneToLoad); - } -} diff --git a/Assets/LevelChanger.cs.meta b/Assets/LevelChanger.cs.meta deleted file mode 100644 index e60cd62a..00000000 --- a/Assets/LevelChanger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7b74b5768b1694e438b8afe6d1159a6b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/City_new.unity b/Assets/Scenes/City_new.unity index 3318db4e..03f93ffa 100644 --- a/Assets/Scenes/City_new.unity +++ b/Assets/Scenes/City_new.unity @@ -1118,7 +1118,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 832569588} + addedObject: {fileID: 832569591} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &129979466 stripped Transform: @@ -1367,183 +1367,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179697418} m_Mesh: {fileID: 3839255777170379307, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3} ---- !u!1 &182161479 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 182161480} - - component: {fileID: 182161482} - - component: {fileID: 182161481} - m_Layer: 5 - m_Name: BlackFade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &182161480 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182161479} - 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: 204845595} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &182161481 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182161479} - 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, g: 0, b: 0, 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &182161482 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182161479} - m_CullTransparentMesh: 1 ---- !u!1 &204845594 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 204845595} - - component: {fileID: 204845598} - - component: {fileID: 204845597} - - component: {fileID: 204845596} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &204845595 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 204845594} - 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: - - {fileID: 182161480} - m_Father: {fileID: 1579048244} - 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!114 &204845596 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 204845594} - 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 &204845597 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 204845594} - 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 &204845598 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 204845594} - 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_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 999 - m_TargetDisplay: 0 --- !u!1001 &234772310 PrefabInstance: m_ObjectHideFlags: 0 @@ -1619,7 +1442,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 861905859} + addedObject: {fileID: 861905862} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &234772311 stripped Transform: @@ -1659,9 +1482,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 349281313} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 250, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 250, y: -90} m_SizeDelta: {x: 480, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &249161732 @@ -2820,9 +2643,9 @@ MonoBehaviour: m_IgnoreNavMeshAgent: 1 m_IgnoreNavMeshObstacle: 1 m_OverrideTileSize: 1 - m_TileSize: 256 + m_TileSize: 250 m_OverrideVoxelSize: 1 - m_VoxelSize: 0.1 + m_VoxelSize: 0.3 m_MinRegionArea: 1 m_NavMeshData: {fileID: 23800000, guid: a3367485721c6ad4899c5171c91c6a91, type: 2} m_BuildHeightMesh: 1 @@ -2939,7 +2762,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 495189437} - - component: {fileID: 495189436} + - component: {fileID: 495189438} m_Layer: 0 m_Name: SceneManager m_TagString: Untagged @@ -2947,19 +2770,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &495189436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 495189435} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fbda389b6a6aec14997efc4be22664e7, type: 3} - m_Name: - m_EditorClassIdentifier: - _levelChanger: {fileID: 1579048242} --- !u!4 &495189437 Transform: m_ObjectHideFlags: 0 @@ -2976,63 +2786,28 @@ Transform: - {fileID: 933971541} - {fileID: 685159828} - {fileID: 694654470} - - {fileID: 1492792594} - - {fileID: 1579048244} + - {fileID: 1832218964} - {fileID: 311736548} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &495189438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495189435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3bb5f426eac8ce54f9134f80c025083d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &499491886 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} m_PrefabInstance: {fileID: 811744638} m_PrefabAsset: {fileID: 0} ---- !u!1 &503537771 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 503537772} - - component: {fileID: 503537773} - m_Layer: 0 - m_Name: DateTimeController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &503537772 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503537771} - serializedVersion: 2 - 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: 1492792594} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &503537773 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 503537771} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00bbfcf5f7cdbb543bd6e09cd773f199, type: 3} - m_Name: - m_EditorClassIdentifier: - _sunriseHour: 0 - _sunsetHour: 0 --- !u!1 &518643050 GameObject: m_ObjectHideFlags: 0 @@ -3360,7 +3135,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 948756851} + addedObject: {fileID: 948756854} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &547123731 stripped Transform: @@ -3817,7 +3592,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 1192573515} + addedObject: {fileID: 1192573518} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &583524187 stripped Transform: @@ -4998,7 +4773,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 811744642} + addedObject: {fileID: 811744645} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &811744639 stripped Transform: @@ -5006,8 +4781,8 @@ Transform: type: 3} m_PrefabInstance: {fileID: 811744638} m_PrefabAsset: {fileID: 0} ---- !u!64 &811744642 -MeshCollider: +--- !u!65 &811744645 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5024,10 +4799,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &815606705 GameObject: m_ObjectHideFlags: 0 @@ -5120,8 +4894,8 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 129979465} m_PrefabAsset: {fileID: 0} ---- !u!64 &832569588 -MeshCollider: +--- !u!65 &832569591 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5138,10 +4912,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0.00000023841858, y: 0, z: 0.0008000004} --- !u!1 &835327588 GameObject: m_ObjectHideFlags: 0 @@ -5220,8 +4993,8 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 234772310} m_PrefabAsset: {fileID: 0} ---- !u!64 &861905859 -MeshCollider: +--- !u!65 &861905862 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5238,10 +5011,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &885749577 GameObject: m_ObjectHideFlags: 0 @@ -5599,8 +5371,8 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 547123730} m_PrefabAsset: {fileID: 0} ---- !u!64 &948756851 -MeshCollider: +--- !u!65 &948756854 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5617,10 +5389,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &951628647 GameObject: m_ObjectHideFlags: 0 @@ -5994,10 +5765,8 @@ MonoBehaviour: _useMouseDrag: 1 _useMouseRotate: 1 _rotateSpeed: 100 - _mouseRotationSpeed: 3 _moveSpeed: 25 _edgeScrollSize: 20 - _dragPanSpeed: 2 _zoomSpeed: 2 _zoomAmount: 3 --- !u!1 &1029354895 @@ -6292,7 +6061,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 1132079553} + addedObject: {fileID: 1132079556} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &1132079550 stripped Transform: @@ -6300,8 +6069,8 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1132079549} m_PrefabAsset: {fileID: 0} ---- !u!64 &1132079553 -MeshCollider: +--- !u!65 &1132079556 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6318,10 +6087,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &1133394518 GameObject: m_ObjectHideFlags: 0 @@ -6488,8 +6256,8 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 583524186} m_PrefabAsset: {fileID: 0} ---- !u!64 &1192573515 -MeshCollider: +--- !u!65 &1192573518 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6506,10 +6274,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0.00000023841858, y: 0, z: 0.0008000004} --- !u!1 &1198886760 GameObject: m_ObjectHideFlags: 0 @@ -7295,52 +7062,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _areaName: Central ave. ---- !u!1 &1492792593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1492792594} - - component: {fileID: 1492792595} - m_Layer: 0 - m_Name: Managers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1492792594 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1492792593} - serializedVersion: 2 - 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: 503537772} - - {fileID: 1832218964} - m_Father: {fileID: 495189437} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1492792595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1492792593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d53c0360fd8463a4b9481cbbaaf6da7a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1498687847 GameObject: m_ObjectHideFlags: 0 @@ -7705,7 +7426,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 1576822616} + addedObject: {fileID: 1576822619} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &1576822613 stripped Transform: @@ -7713,8 +7434,8 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1576822612} m_PrefabAsset: {fileID: 0} ---- !u!64 &1576822616 -MeshCollider: +--- !u!65 &1576822619 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7731,83 +7452,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} ---- !u!1 &1579048241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1579048244} - - component: {fileID: 1579048243} - - component: {fileID: 1579048242} - m_Layer: 5 - m_Name: LevelChanger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1579048242 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579048241} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b74b5768b1694e438b8afe6d1159a6b, type: 3} - m_Name: - m_EditorClassIdentifier: - _animator: {fileID: 1579048243} ---- !u!95 &1579048243 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579048241} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f0a89665d76a15e4fba436e90f296713, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!224 &1579048244 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579048241} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5432099, y: 0.5432099, z: 0.5432099} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 204845595} - m_Father: {fileID: 495189437} - 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &1587277784 GameObject: m_ObjectHideFlags: 0 @@ -13749,7 +13396,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1492792594} + m_Father: {fileID: 495189437} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1832218965 MonoBehaviour: @@ -14127,7 +13774,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} insertIndex: -1 - addedObject: {fileID: 1932383622} + addedObject: {fileID: 1932383625} m_SourcePrefab: {fileID: 100100000, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} --- !u!4 &1932383619 stripped Transform: @@ -14135,8 +13782,8 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1932383618} m_PrefabAsset: {fileID: 0} ---- !u!64 &1932383622 -MeshCollider: +--- !u!65 &1932383625 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -14153,10 +13800,9 @@ MeshCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -8561816718631508679, guid: 06629d5387e888e408bfe1c0a360997a, type: 3} + serializedVersion: 3 + m_Size: {x: 0.089999996, y: 0.089999996, z: 0.0016000008} + m_Center: {x: 0, y: 0, z: 0.0008000004} --- !u!1 &1947025042 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/City_new/NavMesh-NavMesh Surface.asset b/Assets/Scenes/City_new/NavMesh-NavMesh Surface.asset index ee301cb1..14114c47 100644 Binary files a/Assets/Scenes/City_new/NavMesh-NavMesh Surface.asset and b/Assets/Scenes/City_new/NavMesh-NavMesh Surface.asset differ diff --git a/Assets/Scripts/InteractableObjects/Bed.cs b/Assets/Scripts/InteractableObjects/Bed.cs index 03917004..6c9a1193 100644 --- a/Assets/Scripts/InteractableObjects/Bed.cs +++ b/Assets/Scripts/InteractableObjects/Bed.cs @@ -25,14 +25,14 @@ public class Bed : BaseInteractableObject private void OnConfirm(TimeSpan time) { _player.SetPlayerActing(PlayerStates.Sleeping); - TimeManager.Instance.FastForward(time); - TimeManager.Instance.OnFastForwardEnd += OnFastForwardEnd; + GameManager.Instance.Time.FastForward(time); + GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd; } private void OnFastForwardEnd() { _player.SetPlayerActing(PlayerStates.Awake); _player.SetPlayerAnimation(AnimationStates.Standing); - TimeManager.Instance.OnFastForwardEnd -= OnFastForwardEnd; + GameManager.Instance.Time.OnFastForwardEnd -= OnFastForwardEnd; } } diff --git a/Assets/Scripts/InteractableObjects/CashierDesk.cs b/Assets/Scripts/InteractableObjects/CashierDesk.cs index 2d4aa8a7..0acc5d7b 100644 --- a/Assets/Scripts/InteractableObjects/CashierDesk.cs +++ b/Assets/Scripts/InteractableObjects/CashierDesk.cs @@ -93,15 +93,15 @@ public class CashierDesk : BaseInteractableObject { _totalSalary = (float)(time.TotalHours * _playerJob.Salary); _player.SetPlayerActing(PlayerStates.Working); - TimeManager.Instance.FastForward(time); - TimeManager.Instance.OnFastForwardEnd += OnFastForwardEnd; + GameManager.Instance.Time.FastForward(time); + GameManager.Instance.Time.OnFastForwardEnd += OnFastForwardEnd; } private void OnFastForwardEnd() { _player.AddMoney(_totalSalary); _player.SetPlayerActing(PlayerStates.Awake); - TimeManager.Instance.OnFastForwardEnd -= OnFastForwardEnd; + GameManager.Instance.Time.OnFastForwardEnd -= OnFastForwardEnd; } } diff --git a/Assets/Scripts/InteractableObjects/Door.cs b/Assets/Scripts/InteractableObjects/Door.cs index e5229a91..d76fb210 100644 --- a/Assets/Scripts/InteractableObjects/Door.cs +++ b/Assets/Scripts/InteractableObjects/Door.cs @@ -24,7 +24,8 @@ public class Door : BaseInteractableObject { PlayerPrefs.SetString("lastExitName", _exitName.ToLower()); } - SceneManager.Instance.ChangeScene(_scene); + + GameManager.Instance.Scene.Change(_scene); } } diff --git a/Assets/Scripts/Managers/CameraSystem.cs b/Assets/Scripts/Managers/CameraSystem.cs index fd000617..d5e8cae2 100644 --- a/Assets/Scripts/Managers/CameraSystem.cs +++ b/Assets/Scripts/Managers/CameraSystem.cs @@ -1,5 +1,4 @@ using Cinemachine; -using System; using UnityEngine; using UnityEngine.InputSystem; @@ -30,14 +29,10 @@ public class CameraSystem : MonoBehaviour [SerializeField] private float _rotateSpeed = 100f; [SerializeField] - private float _mouseRotationSpeed = 3f; - [SerializeField] private float _moveSpeed = 25f; [SerializeField] private int _edgeScrollSize = 20; [SerializeField] - private float _dragPanSpeed = 2f; - [SerializeField] private float _zoomSpeed = 2f; [SerializeField] private float _zoomAmount = 3f; @@ -57,20 +52,20 @@ public class CameraSystem : MonoBehaviour private void Update() { - var cameraMove = InputManager.Instance.CameraAction.Move.ReadValue(); + var cameraMove = GameManager.Instance.Input.CameraAction.Move.ReadValue(); if (cameraMove.sqrMagnitude > 0.1f) { HandleCameraMovement(cameraMove); } - float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue().x; + float rotateDir = GameManager.Instance.Input.CameraAction.Rotate.ReadValue().x; if (rotateDir != 0) { HandleCameraRotation(rotateDir, _rotateSpeed); } - float zoomAmount = InputManager.Instance.CameraAction.Zoom.ReadValue().y; + float zoomAmount = GameManager.Instance.Input.CameraAction.Zoom.ReadValue().y; if (zoomAmount != 0) { HandleCameraZoom_MoveY(zoomAmount); @@ -181,7 +176,7 @@ public class CameraSystem : MonoBehaviour { } - float rotateDir = InputManager.Instance.CameraAction.Rotate.ReadValue().x; + float rotateDir = GameManager.Instance.Input.CameraAction.Rotate.ReadValue().x; //HandleCameraRotation(rotationValue, _mouseRotationSpeed); transform.eulerAngles += new Vector3(0, rotateDir * _rotateSpeed * Time.deltaTime, 0); } diff --git a/Assets/Scripts/Managers/DontDestroy.cs b/Assets/Scripts/Managers/DontDestroy.cs deleted file mode 100644 index b557b9b4..00000000 --- a/Assets/Scripts/Managers/DontDestroy.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; - -public class DontDestroy : MonoBehaviour -{ - public static DontDestroy Instance { get; private set; } - - private void Awake() - { - if (Instance == null) - { - Instance = this; - DontDestroyOnLoad(gameObject); - } - else - Destroy(gameObject); - - } -} diff --git a/Assets/Scripts/Managers/DontDestroy.cs.meta b/Assets/Scripts/Managers/DontDestroy.cs.meta deleted file mode 100644 index 8b2a5c61..00000000 --- a/Assets/Scripts/Managers/DontDestroy.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e7675785cd5331f4bb7a2aa78bf300fc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs new file mode 100644 index 00000000..24cc1f66 --- /dev/null +++ b/Assets/Scripts/Managers/GameManager.cs @@ -0,0 +1,57 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +public class GameManager : MonoBehaviour +{ + private bool _isPause; + private InputSystem _inputSystem; + private SceneManager _sceneManager; + private TimeSystem _timeSystem; + + public InputSystem Input => _inputSystem; + public SceneManager Scene => _sceneManager; + public TimeSystem Time => _timeSystem; + public static GameManager Instance { get; private set; } + + private void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + else + Destroy(gameObject); + + _inputSystem = new InputSystem(); + _sceneManager = new SceneManager(); + _timeSystem = new TimeSystem(); + + } + private void OnEnable() + { + _inputSystem.Enable(); + } + private void OnDisable() + { + _inputSystem.Disable(); + } + + public void Pause() + { + _isPause = true; + } + + internal void Resume() + { + _isPause = false; + } + + private void Update() + { + if (!_isPause) + { + _timeSystem.UpdateTime(); + } + } +} diff --git a/Assets/Scripts/Managers/GameManager.cs.meta b/Assets/Scripts/Managers/GameManager.cs.meta new file mode 100644 index 00000000..f4566e71 --- /dev/null +++ b/Assets/Scripts/Managers/GameManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3bb5f426eac8ce54f9134f80c025083d \ No newline at end of file diff --git a/Assets/Scripts/Managers/InGameMouseHandler.cs b/Assets/Scripts/Managers/InGameMouseHandler.cs index 3c72b113..ce0e712b 100644 --- a/Assets/Scripts/Managers/InGameMouseHandler.cs +++ b/Assets/Scripts/Managers/InGameMouseHandler.cs @@ -24,12 +24,12 @@ public class InGameMouseHandler : MonoBehaviour private void Start() { - InputManager.Instance.PlayerAction.PointClick.performed += ClickToMove; + GameManager.Instance.Input.PlayerAction.PointClick.performed += ClickToMove; } private void OnDestroy() { - InputManager.Instance.PlayerAction.PointClick.performed += ClickToMove; + GameManager.Instance.Input.PlayerAction.PointClick.performed += ClickToMove; } private void ClickToMove(InputAction.CallbackContext context) diff --git a/Assets/Scripts/Managers/InputManager.cs b/Assets/Scripts/Managers/InputSystem.cs similarity index 54% rename from Assets/Scripts/Managers/InputManager.cs rename to Assets/Scripts/Managers/InputSystem.cs index 8e0a83db..77d8f505 100644 --- a/Assets/Scripts/Managers/InputManager.cs +++ b/Assets/Scripts/Managers/InputSystem.cs @@ -1,34 +1,25 @@ -using UnityEngine; using static InputActions; -public class InputManager : MonoBehaviour +public class InputSystem { private InputActions _inputActions; - public static InputManager Instance { get; private set; } - public PlayerActions PlayerAction { get; private set; } public CameraActions CameraAction { get; private set; } - private void Awake() + public InputSystem() { - if (Instance != null) - { - Debug.Log("There's more than one Input manager instance"); - } - Instance = this; - _inputActions = new InputActions(); PlayerAction = _inputActions.Player; CameraAction = _inputActions.Camera; } - private void OnEnable() + public void Enable() { _inputActions.Enable(); } - private void OnDisable() + public void Disable() { _inputActions.Disable(); } diff --git a/Assets/Scripts/Managers/InputManager.cs.meta b/Assets/Scripts/Managers/InputSystem.cs.meta similarity index 100% rename from Assets/Scripts/Managers/InputManager.cs.meta rename to Assets/Scripts/Managers/InputSystem.cs.meta diff --git a/Assets/Scripts/Managers/LookAtCamera.cs b/Assets/Scripts/Managers/LookAtCamera.cs deleted file mode 100644 index bc37cb3e..00000000 --- a/Assets/Scripts/Managers/LookAtCamera.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UnityEngine; - -public class LookAtCamera : MonoBehaviour -{ - private void LateUpdate() - { - transform.LookAt(Camera.main.transform); - } -} diff --git a/Assets/Scripts/Managers/LookAtCamera.cs.meta b/Assets/Scripts/Managers/LookAtCamera.cs.meta deleted file mode 100644 index 2c7bc61e..00000000 --- a/Assets/Scripts/Managers/LookAtCamera.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7a74888cae6f9f14ba0d76cfc5c0198a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/SceneManager.cs b/Assets/Scripts/Managers/SceneManager.cs index a83a2dd5..c68aabb5 100644 --- a/Assets/Scripts/Managers/SceneManager.cs +++ b/Assets/Scripts/Managers/SceneManager.cs @@ -1,38 +1,9 @@ using UnityEngine; -public class SceneManager : MonoBehaviour +public class SceneManager { - [SerializeField] - private LevelChanger _levelChanger; - - public static SceneManager Instance { get; private set; } - - private void Awake() + public void Change(string sceneName) { - if (Instance == null) - { - Instance = this; - DontDestroyOnLoad(gameObject); - } - else - Destroy(gameObject); - - } - - private void Start() - { - _levelChanger.gameObject.SetActive(true); - _levelChanger.FadeIn(OnSceneChanged); - } - - public void ChangeScene(string sceneName) - { - _levelChanger.gameObject.SetActive(true); - _levelChanger.FadeToLevel(sceneName, OnSceneChanged); - - } - private void OnSceneChanged() - { - _levelChanger.gameObject.SetActive(false); + UnityEngine.SceneManagement.SceneManager.LoadScene(sceneName); } } diff --git a/Assets/Scripts/Managers/TimeManager.cs b/Assets/Scripts/Managers/TimeSystem.cs similarity index 73% rename from Assets/Scripts/Managers/TimeManager.cs rename to Assets/Scripts/Managers/TimeSystem.cs index 960925d7..cb09adbf 100644 --- a/Assets/Scripts/Managers/TimeManager.cs +++ b/Assets/Scripts/Managers/TimeSystem.cs @@ -1,10 +1,8 @@ using System; using UnityEngine; -public class TimeManager : MonoBehaviour +public class TimeSystem { - public static TimeManager Instance { get; private set; } - private const float MINUTE_TIME = 1f; private const float FF_TIME = 0.003f; @@ -14,9 +12,6 @@ public class TimeManager : MonoBehaviour [SerializeField] private TimeSpan _startTime = new TimeSpan(1, 08, 00, 00); - //[SerializeField] - //private Light _sunLight; - [SerializeField] private float _sunriseHour; [SerializeField] @@ -26,32 +21,19 @@ public class TimeManager : MonoBehaviour private TimeSpan _sunsetTime; private float _timer; - private float _sunInitialIntensity; private float _minuteToRealTime; - private static TimeSpan _currentTime; - public static TimeSpan CurrentTime => _currentTime; + private TimeSpan _currentTime; + public TimeSpan CurrentTime => _currentTime; private TimeSpan _timeToStop; - private bool _isPause = false; - private void Awake() - { - if (Instance == null) - { - Instance = this; - DontDestroyOnLoad(gameObject); - } - else - Destroy(gameObject); - - } // Start is called before the first frame update - void Start() + public TimeSystem() { // _sunInitialIntensity = _sunLight.intensity; _timer = _minuteToRealTime; @@ -62,16 +44,7 @@ public class TimeManager : MonoBehaviour } // Update is called once per frame - void Update() - { - if (!_isPause) - { - UpdateTime(); - RotateSun(); - } - } - - private void UpdateTime() + public void UpdateTime() { _timer -= Time.deltaTime; if (_timer <= 0) @@ -91,7 +64,7 @@ public class TimeManager : MonoBehaviour public void FastForward(TimeSpan timeToStop) { - _isPause = false; + GameManager.Instance.Resume(); _timeToStop = _currentTime.Add(timeToStop); _minuteToRealTime = FF_TIME; } @@ -112,7 +85,6 @@ public class TimeManager : MonoBehaviour { intensityMultiplier = 0; } - // _sunLight.intensity = _sunInitialIntensity * intensityMultiplier; } private TimeSpan CalculateTimeDifference(TimeSpan from, TimeSpan to) @@ -125,14 +97,4 @@ public class TimeManager : MonoBehaviour return diff; } - - public void Pause() - { - _isPause = true; - } - - internal void Resume() - { - _isPause = false; - } } diff --git a/Assets/Scripts/Managers/TimeManager.cs.meta b/Assets/Scripts/Managers/TimeSystem.cs.meta similarity index 100% rename from Assets/Scripts/Managers/TimeManager.cs.meta rename to Assets/Scripts/Managers/TimeSystem.cs.meta diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index a7dd6bf7..263579e0 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -54,7 +54,7 @@ public class Player : MonoBehaviour private void Start() { - TimeManager.Instance.OnMinuteChanged += UpdateStatsByClock; + GameManager.Instance.Time.OnMinuteChanged += UpdateStatsByClock; _animator.applyRootMotion = true; _navAgent.updatePosition = false; @@ -63,7 +63,7 @@ public class Player : MonoBehaviour private void OnDestroy() { - TimeManager.Instance.OnMinuteChanged -= UpdateStatsByClock; + GameManager.Instance.Time.OnMinuteChanged -= UpdateStatsByClock; } private void Update() diff --git a/Assets/Scripts/UIElements/TimeSliderUI.cs b/Assets/Scripts/UIElements/TimeSliderUI.cs index 458f89ec..42d4ae02 100644 --- a/Assets/Scripts/UIElements/TimeSliderUI.cs +++ b/Assets/Scripts/UIElements/TimeSliderUI.cs @@ -20,8 +20,8 @@ public class TimeSliderUI : MonoBehaviour public void ShowTimeSliderDialog(string title, string description, Action onCancel, Action onConfirm) { - TimeManager.Instance.OnFastForwardEnd += CloseDialog; - TimeManager.Instance.Pause(); + GameManager.Instance.Time.OnFastForwardEnd += CloseDialog; + GameManager.Instance.Pause(); UIManager.Instance.Freeze(); gameObject.SetActive(true); @@ -63,7 +63,7 @@ public class TimeSliderUI : MonoBehaviour { _slider.onValueChanged.RemoveListener(x=>SliderValueChanger(x)); gameObject.SetActive(false); - TimeManager.Instance.Resume(); + GameManager.Instance.Resume(); } } diff --git a/Assets/Scripts/UIElements/TopBarUI.cs b/Assets/Scripts/UIElements/TopBarUI.cs index ba167a62..bbcf8a66 100644 --- a/Assets/Scripts/UIElements/TopBarUI.cs +++ b/Assets/Scripts/UIElements/TopBarUI.cs @@ -24,12 +24,12 @@ public class TopBarUI : MonoBehaviour // Start is called before the first frame update private void Start() { - TimeManager.Instance.OnMinuteChanged += UpdateTime; + GameManager.Instance.Time.OnMinuteChanged += UpdateTime; } private void OnDisable() { - TimeManager.Instance.OnMinuteChanged -= UpdateTime; + GameManager.Instance.Time.OnMinuteChanged -= UpdateTime; } // Update is called once per frame @@ -44,7 +44,7 @@ public class TopBarUI : MonoBehaviour { if (_timeText != null) { - _timeText.text = $"{TimeManager.CurrentTime.GetDayName()} {TimeManager.CurrentTime.ToString(@"hh\:mm")} day ({TimeManager.CurrentTime.Days})"; + _timeText.text = $"{GameManager.Instance.Time.CurrentTime.GetDayName()} {GameManager.Instance.Time.CurrentTime.ToString(@"hh\:mm")} day ({GameManager.Instance.Time.CurrentTime.Days})"; } _energy.value = (Player.Instance.Stats[StatsId.Energy] as INumericStat).Value;