From ea59babf93a60252d439ff5bdc5a7436be0a1740 Mon Sep 17 00:00:00 2001 From: Vova <3emaster@gmail.com> Date: Mon, 11 Dec 2023 11:53:00 +0200 Subject: [PATCH] Refactor: added GameManager --- Assets/LevelChanger.cs | 46 -- Assets/LevelChanger.cs.meta | 11 - Assets/Scenes/City_new.unity | 490 +++--------------- .../City_new/NavMesh-NavMesh Surface.asset | Bin 30660 -> 24684 bytes Assets/Scripts/InteractableObjects/Bed.cs | 6 +- .../InteractableObjects/CashierDesk.cs | 6 +- Assets/Scripts/InteractableObjects/Door.cs | 3 +- Assets/Scripts/Managers/CameraSystem.cs | 13 +- Assets/Scripts/Managers/DontDestroy.cs | 18 - Assets/Scripts/Managers/DontDestroy.cs.meta | 11 - Assets/Scripts/Managers/GameManager.cs | 57 ++ Assets/Scripts/Managers/GameManager.cs.meta | 2 + Assets/Scripts/Managers/InGameMouseHandler.cs | 4 +- .../{InputManager.cs => InputSystem.cs} | 17 +- ...putManager.cs.meta => InputSystem.cs.meta} | 0 Assets/Scripts/Managers/LookAtCamera.cs | 9 - Assets/Scripts/Managers/LookAtCamera.cs.meta | 11 - Assets/Scripts/Managers/SceneManager.cs | 35 +- .../{TimeManager.cs => TimeSystem.cs} | 50 +- ...TimeManager.cs.meta => TimeSystem.cs.meta} | 0 Assets/Scripts/Player/Player.cs | 4 +- Assets/Scripts/UIElements/TimeSliderUI.cs | 6 +- Assets/Scripts/UIElements/TopBarUI.cs | 6 +- 23 files changed, 162 insertions(+), 643 deletions(-) delete mode 100644 Assets/LevelChanger.cs delete mode 100644 Assets/LevelChanger.cs.meta delete mode 100644 Assets/Scripts/Managers/DontDestroy.cs delete mode 100644 Assets/Scripts/Managers/DontDestroy.cs.meta create mode 100644 Assets/Scripts/Managers/GameManager.cs create mode 100644 Assets/Scripts/Managers/GameManager.cs.meta rename Assets/Scripts/Managers/{InputManager.cs => InputSystem.cs} (54%) rename Assets/Scripts/Managers/{InputManager.cs.meta => InputSystem.cs.meta} (100%) delete mode 100644 Assets/Scripts/Managers/LookAtCamera.cs delete mode 100644 Assets/Scripts/Managers/LookAtCamera.cs.meta rename Assets/Scripts/Managers/{TimeManager.cs => TimeSystem.cs} (73%) rename Assets/Scripts/Managers/{TimeManager.cs.meta => TimeSystem.cs.meta} (100%) 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 ee301cb1bd8467c72d0bb738560462364227998d..14114c472c8b5afc7a9e6f9e104017ba214449a8 100644 GIT binary patch literal 24684 zcmbuHdz@WWb;r--iJ%fxKtN>T17Cni1_KC$%-lc#c?7~!#blD)gdy`t=8=RTasdGm zG*O-bszF+OpjNT1Lo1q5TWpJ3D}AZxXiF4YX{%PPi0SXU_geexd+uEPqv!KkcmLM< zt+n>^>~rqibEYWLaX>=Ffgg`}Wq&LWoOEu%yaioHEjVhy+WE!r_Uzfy(IMh#$US>L z^`Sv-F^n7#mQ?m}fN7hHC7sWJa9mfg7qoe33?w?*X9_%O@ zGh`tp;s^ZmrJOvYXi$=`nV(jCU%6i)JMpSgd_$k{=upH_%Krwbdr4v)jY#T~{70+o zwfr-KEzx3|^Un%=BRN#_&u-y6itDEpjbY1A8=kBE&ufWqZvWmbd`EGr`uBi3&G_yE z-=LOwsC^ytH9iPDW7x4c=ckA9J487cn-{=`k@EQI#W{+-OhUU~*ur-d|Df2@WGDZ= zD)(#X!;WhGb7bFdm$TH>T>pOXB^~&Sq*FinUj*MM9Xg5`q5ex{f`4%fKeMU-FM(gI z4?8-FSxx=lU-stuXB9iuKkq;1Ni#pAxKVREB0GIMu!Wx);5d|%my|B3OhYQz7`_*b{#e{1~VZTMN5T;}&R6@I#`b40vaa-z7`O6D~5VTbQ8 zCy3|#d!2-J~C*|Z{&RQ{(e0C;+${Z zUr&H9X|1m5#i`28{&uG9tkIljfBheE7szL^xJ51e%&Hczs?9bJ|mGBlz z;rCyRFYWJ@H1k-C#xGSr_fD%?_?cmR_K0VERtLUQpYb67y^8noStIkDqSM$|KfI4m zy$$c0M@LeJw{|z!X_doJJ{u|ry-v8kiKGv`A zcwzqIeR!w5;!&-CROaWZf21q7XNUc5f$C?aZVtRY?BM+5{@`fix5(Z+esTX= zD4zMd9KK<}DysVz-y@pmuX+Ev0=^7a{Pf~v<@Wh|XA3_g%-_ZG;rzKW@SXaM2m5nA zfA5mHdHf>p^LJGn-p8-e!pHi1t^TW9_~!brX~TQ{*S6uk{&%02XmC+6 zu;P@y{`zT41eW!VUMdj$mJQd}_O3c@aAdT1aCIFwOLd;SM~X}dxd&FHY6e!E+BtD0HK04YrxNfBETeG=$U43x$yvsK*I02vAyQXh!B;r%+ed{hAjd*$g(1v=1wf??= zRYiY&&AR%M;h_!YHPE}|^s#{r-K&R(Mn;zO#W5`g`UcOfuhS%S57&E(f!@Kf-u_y> zzkhk()_SqpL9{dK!9MC>6%$|(hT-~1eRxwn%+}dsqa%H5 z>ODhagKN^%g}yGSuNqsI#$gQ_3!=X_j7rQt(7R!zNHEOy$k_1O-qrQ>05dPd*i`jMi0Y;-6ySnbP4dxyz)@*pj>wK1@Q5EhMWabAOE zN#AgN^{D1r=H)|U!>fHZ6iIJkHj7&}G}32o-P!Wvgbo*qV%KZ=Q%!l?%s0ya=W(Fo z?Zi0J%Fg9+igkG@ioa8h7j&PsgbkR=v2jp7&r0;!l39|juJ84HZ_Z~Xj{aOyJJi?CaKUsTCpqfr%V{i-cRov{*J5t^tIff^_$l6t{q`5`}&3R zb(iC#M|RZQ2OQ@<_H$OFY^B#-T3Y)V$DH}(Y;8S87Yt5+nenT~w(@t3 z;;tP#7Oh>oTYr-~x(8fFHBO>VY?Qx|c)v@ZXnVhi#vM=e9CXO1CdNCjubr``#JjI7 zaq`*u?$Sp%`3SFiX0m7fw;z~Tc<&9h-Oo<;yz}u2o_lTSBaF{p`+X|-Usn7uw1HU1 zWgEtY-M&z5yR3LB^(EoZ<|kvnavb{m zWa`VRXP%7XsWv-~V-kJni`!}c?q|&|oa~`5W*1KO&=<3ZG55OYi|1#Yqn*C2x}xk$ z!t}9G&R4?p>&nTVCx5KD3;27jnEtwt;WXE>2OMIb%3=)%|EHrp$L3$=c`D`cHOUwz zEPr2<*b~m|!tOu5^Y+q5IQa;d>v>05Ke25Yo_kyABkXHz;k`S`wUpuU zNwvY(p|G#F&^EWLZOOj!j?!N^*=eWy3n%+z*@kgpw=Y!N(i#r!vGowz?CY6W!}9U9 zL|=R@(SFC+-6yxlzW91B{l`OJd_CWh@-Y4>PZ)Dw&#^u15A-F~%b2J2thPC(k7+$? z{2kLrt;x8a!M>g|Okdo`aGGn`<9f#5*K>x0zprQV7!LK?8V)|bo^MO*jWI0O^KEHO zV)ymQ+&SLRy)pTNeXW8^pTW#$F!LGI7{>E`eb1=IJoc*@ug`qe2Oq{CA74v3-Y_wo ze8BD#+NS)(f|Gq>DDxjG?cHi;@*gbi6aA%K*z>IKSuY&daBPob+8oy~J|(8VaqZ#n zYl${H#_m43J@zHWg57^Z=!@BflRfms{TcJPo;QTPxPO1L(@tN*p>4LFLmzDohdw5( zerZjzo>^miQn%RF&C6YFaj{}QiHYZAM! zPy8K^?|g6a2m5*kC!fw6OCRCnBkb#W;oO@wcYdBm9PTS*_ceo$vrK}r#)^LPWF}WDec0(R%1JTzongVJz)2BLfag>zqixvVXQ0`oa~{U zG3U5&vWIq>T{zi8JIyZa>oAN}+CSCKv}b~SFO4|vjbPs!!M+DZyZiXsAivLVj>mW2 zQqHw-nrmVAAMgBN=_8zcz?zFt*S*`-N58k(p5`K62jhL__{v+89h~NldVNlXlYKJg z4|5@$>{f5E3n%-^50rU?-M&z5OY1?{_bBY;dMK}Vv7J6gx0Z7k+G%#-G^e4RW*1KO z&`z@pCwpk8=l?*m)1I^*XtS>e+UaW`V7s20-N!$zhhVq$5U^hpx2JieE}!2VZ|vTh ze84`}VE5nHy*cyQocU~4U*a0*@3}I}1#NT8e1Uyla=dZkiZpj%_X%yVwE<4{i7lD` zmeQ`a`C6i#rT++v)Q~dmQIJxjnWs&MDaaH->haT{zi8JKdjg zi`T4;YMZY~u&;+OR<<5O8*G1wIPMRQ)0o@-5bbe2L>$)x*!Ksp&u@;$cV3-*z`h>9 z?mynyD1C&J57_1|e!ug5;F@F~UwKWMqmV!C16P;!$uiHlu+J&=dVa9mH%`1O*&~kQ z9KM(N_e9m}<4hZT{9_xUKRDS#8_X`8?4b>27j}DIFSs15ZP{3D%f@P3>9g~FrH^nL zPq2@t&R_5E_@wgqxCtkFXJ!{p_Lc81{e_b~%Rerh?322tr2JqTPqo4O8{6RHv#qp; zHu(5t_Rt2i3#UAx4Q3Zk_Rt2;e{=2Ui@ItD>+dJWp1mo<{lbTtJ;(SQRvY`o0~2Ex zM|;5k(kJ^q(VpYrvrm@aalhu`>7H0`j>*4|{&x4tiT6ITrNm1&1^-~raq#KN+G9Ah zp)1Q{Sh2L<^CTSdEY1842mhs6e#6R7`@Qc8hyE_j`s=vAc9H&6%MY0R$jJ|tIp&9N zY;fSun*KS{`Qf~Z@xd3nV}4-eM_A88iH;pio#Y~pAJcQpkGt**=Eq=ke)OkA2NR1< zJQ!OQW8+~0?2bPse4pgw67WY%=SO>fm~TkHlvkVJgAJWn^eT3rKNNSr+S;K1a^=TKp6_+kgYOoE*f{Sd?0zz3WD0+qzz2d0GEPl6p= zj+uk|CG%tlQ_hz#m(152g%?OD(ZQ6g3w*G@$mGQ;Sszuq+wz4-mkOUB@EfxE06$N{+~gR4*Y^_7oZ(05 z^XNXT1J=Wl;=z6Y{urXOHzaP91i#qpy7eqhh>W?}Lkr~Ela$BrMEl6d3* zILRW@$p^*`zrV_tNYHaU!)$QJOUQu@OgViD>^|^da=uvdA_;l0Q=(%BQzyCLW>)Zi z(%lz4$8`ME^l(rTi(l1_jTr3s;G1LSlzD!=q>8c4lFTz6KQJZhh&et=!bA9A<{h0p z9!vae32O*U3BRx8g%a8Zrlfzg4-A*vbAM66Z<@*%NS-gjAMA0*8ioUt7mgV8H&21_ zfy2i!@%xy4ZaJ9QezoMhQO5g(k|M&OEO`Y{#7wNe%Kw;AL9Q^lH)H)|Dt4<1WZXB ze&3h;z{*`J@vGX&35Oj_Opb|p*z8|WiB3IW?C5Jc^iZ(`J;z@6MdHAe7fL9p2Y)an z@z3QC-z!-q0aFhc8@lJcSa_vmg#-@lapwzDA3A>MycCpUZ1BWm#~)jcnN#L^y6itz z$y{Rt@6L4RbAPbgXDOaM-;sc^qqF8%do!hjDQ8IDA-P0C+rX6cFSpZH?D*wAZ_jMt zx0!x{%DpA~NWjFS=NO%Q#DMWZ&tu;z{pV^cJ_s0J?C8|_Gui%I0+-`|GhggrO8mf- z|0($|E78G}j%$$?g^MKvwKZO5XLfgQU^dq5Ai3FSHI9C`RI~eX9$uiS(yjeDU7fY%b+ev13Oo=~v!Ib1Z+e&gT zHhh*!?3DPBYq6xeg3pwGh6F#b$KiLPB zzTi_$AGH#l7-F$iF}6)+cT9;tc~6m$gWTYyreg!+`yt7PC4W%C=-5AJ9OV^~dnClb zgDLMe0pqj7bnsmg{O|!&!XxloBv)FAp5r^E<9CM%7=P^KLa$=?zf~M@_=71Qlx(#U zJ;%36#}A()I*I}ve57G)IYx)y*Gj%4JN}I9=BJEGS}WnPyNwvW!#-aEro<=5#A0(F_kWFSaEF_K@yYFA>VwNMe&pf1a*kguoqVq} z0mEY_9-Wwll4GX8*zm{4F}bjzze0lkD#PS;of4mOCGcQ`y7)d^#n_HFyJKSU!@f*{ z4o2`fv4YQ%jvqYSv2E~i#^K|bSmKB|LxK)Q@Zmddj!&14A2zt-wdSV6$H@+dk7Hu- z#r_%zI{4M5JEoj2d8KjSxu%0>N;s+*A8Z_lNznaJRmC*P%Or3d=x+`v+JWe~{ZQ$| zV1G=4?wIoPlE0V0f&b2Q$CQ5}dB{ri9DhSPG5Gwg1ReZ!!`Qfo|A7R1j^VJu{f&ee zY+%YqO~CjJY7nqFro2$LehC~Hxk$o2@?{b@Z0OuygRxWk{kGdLH4Yu&-je&u9Ius* zA2u+h->*`l6XUo;7(etqYA-sNFUVkQIYx*7S1Y;qn+oqOA2@s+|4usb&q~1Lb)Awt zzm>p0V*++NG3ZZ7ekhqVOo>lBJGtN|CBKoN|8E7OW1loT?Lf!h@vlwC_g50iNy(2S zn={Nk7&>;x_)kjQ?*6M~gG29?pgX2KNwPu$2foB~$CM{Xx~)Xd@!O;mgU>}0bnqex z_Zn4<4>q`qCFtO7k`G8eXn4Enx2wEUa)$&=d8_0W(;ZWC4esoSxyS>ioU3xVg#Dbo zILGIhjr|u4htJs(Z0x6CIP{lVzJpYPse}AyO7LZGtzzQguseQ>Futctz;NiNNwB>} zxxsMghfBxCUYp}rneCM-!EpGzLV|6sVL0>yCA9ru!}I~YQ-bedhKWb-w6bb{xpCOR zlrNJUV!C6>LnZ%UszF9Zj zF=dD3Jk{|(lJg~C>PG*yiWe{p}KX_5v{R=vC}KZxx5{MG`Q6=od<`U2GT*oxNe3WaktZ+r4IY{AshHga6oc za&Z10C8=U;JH=yn{3f%Z6ZcYauag{OK92FL`rr@mcE{v6Q1V&{m=dmv-Djck_<^Y# ze|Xm3KN_aQ2YZg)=W*GI#|KP_AN(}6bt=pngTu!$%dV?+Oh2ER{ zC3b8_n;qO`I_38={9V(Zrx?bMaR4*E=v_~4i7s~SX-v&GYCn4po@a}HBmT^3 z$K$Pk;rT=5r+(tk6#smQx8I-Xi~YMX%x`GF^}mVNJ5JU9!+ZOAj;`9iD$n&WpFen? zAL7{)18?o;xjvsC-WN;xGoJeCAMxxbP4Rk$FOT2qy!DTma(-_N{hN@Fk5A6?Zc}Uh zF+Ps(^|kA!$j|d~j4$zA|C`%)UD-aJe=Yg-zL~e5_`9p|dQZ)H&fojR=kx3DW5xP+ zg!7w|EcMUc*9!Bm=Z`tRNALdFaZ~bo){goASetmBAE*7>UUk8HeEoa$m6Mz5n#@4~xq; z@{Dz;KjV2Gn)>g2-7Q~9{WCuFPtPlU-}1MMfAaU#pXNVnUphZj|1Uh=*T0^lO#RdR zvAH(Se|(0KH~WfOaJK~@$tR3_<*zc&=sJtNB%D%CGD1-4&jg z^enSo-}3y;{MEJlEAd<(^Z3t-_w~W}@h-L3&-$s(Z!^C=&99Gd&htK0b^PJIe)j5z zt$n^ec)!}~C;n^I_G^E3-uKtM|4r{#X@C88OMLk(IPu@F@Yu@yJ6ige^Stv^?OzkG zcXghus{CZhGyc{5;~CGpwR)NR{9>Ex{15l<#{2o_ z@3iFe?>YH?;5_#aetu8Ib1&rWpNi-FI6&>={BoZ4>-mYFTjAq-9`T(U>aXU{dDhnv zE%E%H0Xu&ce@ulZCe^R;ulBE*kJoqBpSM5f$94bEQ_ZjIf0=)Kjqg5r|9StR>u1hOzU;rpH}l(T*R{m!y^^f`+l}Y_r>Xj%=GS=o&pR02|FpiQ z;x(82^VTqb;=_CDT0guG;qmu-`|N#>{QEcWczAw)A0+be9TWJ^TD-rHQjPzDc;=Vm z=ZhZE|Mr=u>;6Ht_g(Zz&&MC1*FF8y2Zis*(Sy&%NySIL)V=%1Kj^;hnQgnU{2#k! B4Wa-5 literal 30660 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 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;