diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab deleted file mode 100644 index 69f67755e..000000000 --- a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab +++ /dev/null @@ -1,206 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &645007492175346922 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8625885928614466139} - - component: {fileID: 5533625503660040844} - - component: {fileID: 2068856588424138268} - - component: {fileID: 827366504865157138} - - component: {fileID: 8205940526588409056} - - component: {fileID: 5136368050551183548} - m_Layer: 5 - m_Name: FadeManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8625885928614466139 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - 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: 1 - m_Children: - - {fileID: 2840604718763097518} - m_Father: {fileID: 0} - 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!223 &5533625503660040844 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - 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: 6 - m_TargetDisplay: 0 ---- !u!114 &2068856588424138268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &827366504865157138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - 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: 55 ---- !u!225 &8205940526588409056 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_Alpha: 0 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &5136368050551183548 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645007492175346922} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41f0ee0aabb2f954d918caa8d484f646, type: 3} - m_Name: - m_EditorClassIdentifier: - _persistent: 1 ---- !u!1 &6954525544416039378 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2840604718763097518} - - component: {fileID: 8274624108829164416} - - component: {fileID: 4134486114940038904} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2840604718763097518 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - 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: 1 - m_Children: [] - m_Father: {fileID: 8625885928614466139} - 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!222 &8274624108829164416 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - m_CullTransparentMesh: 1 ---- !u!114 &4134486114940038904 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6954525544416039378} - 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 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta b/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta deleted file mode 100644 index 64474a920..000000000 --- a/Assets/_DDD/_ScriptAssets/Prefabs/FadeManager.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0aa6654feb91ef040b8b99d4f64688fc -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs deleted file mode 100644 index 288b8f1ce..000000000 --- a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Threading.Tasks; -using DG.Tweening; -using UnityEngine; - -namespace DDD -{ - public class FadeManager : Singleton, IManager - { - [SerializeField] - private float _fadeOutDuration = 0.5f; - - [SerializeField] - private float _fadeInDuration = 1f; - - private CanvasGroup _canvasGroup; - - public void PreInit() - { - _canvasGroup = GetComponent(); - } - - public Task Init() - { - return Task.CompletedTask;; - } - - public void PostInit() - { - _canvasGroup.alpha = 0f; - _canvasGroup.gameObject.SetActive(false); - } - - public async Task FadeOut() - { - _canvasGroup.gameObject.SetActive(true); - _canvasGroup.blocksRaycasts = true; - - await _canvasGroup.DOFade(1f, _fadeOutDuration) - .SetUpdate(true) - .AsyncWaitForCompletion(); - } - - public async Task FadeIn() - { - await _canvasGroup.DOFade(0f, _fadeInDuration) - .SetUpdate(true) - .AsyncWaitForCompletion(); - - _canvasGroup.blocksRaycasts = false; - _canvasGroup.gameObject.SetActive(false); - } - - public async Task FadeOutIn() - { - await FadeOut(); - await FadeIn(); - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta b/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta deleted file mode 100644 index 8c526c9c7..000000000 --- a/Assets/_DDD/_Scripts/GameFramework/FadeManager.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 41f0ee0aabb2f954d918caa8d484f646 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs index ed8a033cb..1d2e1a428 100644 --- a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs +++ b/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs @@ -9,15 +9,27 @@ public class FadeSceneTransitionHandlerSo : SceneTransitionHandler [SerializeField] private float _delayBeforeFadeIn = 1f; + [SerializeField] + private float _fadeOutDuration = 1f; + + [SerializeField] + private float _fadeInDuration = 0.5f; + public override async Task OnBeforeSceneActivate(SceneType sceneType) { - await FadeManager.Instance.FadeOut(); + var evt = new FadeOutEvent(_fadeOutDuration); + EventBus.Broadcast(evt); + await evt.WaitAsync(); } public override async Task OnAfterSceneActivate(SceneType sceneType) { - await Task.Delay((int)(_delayBeforeFadeIn * 1000)); - await FadeManager.Instance.FadeIn(); + float seconds = _delayBeforeFadeIn * 1000; + await Task.Delay((int)(seconds)); + + var evt = new FadeInEvent(_fadeInDuration); + EventBus.Broadcast(evt); + await evt.WaitAsync(); } } } \ No newline at end of file