diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs index 775b2c836..3f056aa89 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs @@ -21,14 +21,14 @@ namespace BlueWater.Players.Tycoons private void Start() { - TycoonEvents.OnCocktailCompleted += PickupItem; - TycoonEvents.OnCocktailDiscarded += DiscardItem; + EventManager.OnCocktailCompleted += PickupItem; + EventManager.OnCocktailDiscarded += DiscardItem; } private void OnDestroy() { - TycoonEvents.OnCocktailCompleted -= PickupItem; - TycoonEvents.OnCocktailDiscarded -= DiscardItem; + EventManager.OnCocktailCompleted -= PickupItem; + EventManager.OnCocktailDiscarded -= DiscardItem; } [Button("컴포넌트 초기화")] diff --git a/Assets/02.Scripts/Tycoon/TycoonEvents.cs b/Assets/02.Scripts/EventManager.cs similarity index 64% rename from Assets/02.Scripts/Tycoon/TycoonEvents.cs rename to Assets/02.Scripts/EventManager.cs index 13caba042..598179f51 100644 --- a/Assets/02.Scripts/Tycoon/TycoonEvents.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -1,10 +1,21 @@ using System; using BlueWater.Items; +using UnityEngine; namespace BlueWater { - public static class TycoonEvents + public static class EventManager { + // Global events + #region Global events + + public static Action FadeInOut; + + #endregion + + // Tycoon events + #region Tycoon events + // 음료 // public static Action OnDrinkRecipeAcquired; // public static Action OnDrinkRecipeSelected; @@ -18,5 +29,7 @@ namespace BlueWater // 요리 //public static Action OnFoodRecipeAcquired; + + #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonEvents.cs.meta b/Assets/02.Scripts/EventManager.cs.meta similarity index 100% rename from Assets/02.Scripts/Tycoon/TycoonEvents.cs.meta rename to Assets/02.Scripts/EventManager.cs.meta diff --git a/Assets/02.Scripts/GlobalEvents.cs b/Assets/02.Scripts/GlobalEvents.cs deleted file mode 100644 index 633c661d3..000000000 --- a/Assets/02.Scripts/GlobalEvents.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using UnityEngine; - -namespace BlueWater -{ - public static class GlobalEvents - { - public static Action FadeInOut; - } -} diff --git a/Assets/02.Scripts/GlobalEvents.cs.meta b/Assets/02.Scripts/GlobalEvents.cs.meta deleted file mode 100644 index 010adfd6c..000000000 --- a/Assets/02.Scripts/GlobalEvents.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 2e838e8a31b7c6347bd379a901be2f75 \ No newline at end of file diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index 7a18ce63c..f034fe93c 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -122,8 +122,8 @@ namespace BlueWater private void Start() { - TycoonEvents.OnLiquidRegionEntered += ShowPanel; - TycoonEvents.OnLiquidRegionExited += HidePanel; + EventManager.OnLiquidRegionEntered += ShowPanel; + EventManager.OnLiquidRegionExited += HidePanel; _instanceMaterial = Instantiate(_liquidRenderer.material); _liquidRenderer.material = _instanceMaterial; @@ -179,8 +179,8 @@ namespace BlueWater private void OnDestroy() { - TycoonEvents.OnLiquidRegionEntered -= ShowPanel; - TycoonEvents.OnLiquidRegionExited -= HidePanel; + EventManager.OnLiquidRegionEntered -= ShowPanel; + EventManager.OnLiquidRegionExited -= HidePanel; } #endregion @@ -378,7 +378,7 @@ namespace BlueWater _completeText.enabled = true; // 1. 플레이어 음료 들기 - TycoonEvents.OnCocktailCompleted?.Invoke(matchingCocktail); + EventManager.OnCocktailCompleted?.Invoke(matchingCocktail); yield return new WaitForSeconds(1f); diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs b/Assets/02.Scripts/LiquidInteractionRegion.cs index d4e238c7d..e03999e4e 100644 --- a/Assets/02.Scripts/LiquidInteractionRegion.cs +++ b/Assets/02.Scripts/LiquidInteractionRegion.cs @@ -8,12 +8,12 @@ namespace BlueWater { if (GameManager.Instance.CurrentTycoonPlayer.IsCarriedItem()) return; - TycoonEvents.OnLiquidRegionEntered?.Invoke(); + EventManager.OnLiquidRegionEntered?.Invoke(); } private void OnTriggerExit(Collider other) { - TycoonEvents.OnLiquidRegionExited?.Invoke(); + EventManager.OnLiquidRegionExited?.Invoke(); } } } diff --git a/Assets/02.Scripts/Map/MapPortal.cs b/Assets/02.Scripts/Map/MapPortal.cs index 342f7260e..662719996 100644 --- a/Assets/02.Scripts/Map/MapPortal.cs +++ b/Assets/02.Scripts/Map/MapPortal.cs @@ -1,5 +1,4 @@ using System.Collections; -using BlueWater.Uis; using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; @@ -46,7 +45,7 @@ namespace BlueWater.Maps private IEnumerator PortalCoroutine(Collider other) { PlayerInputKeyManager.Instance.DisableCurrentPlayerInput(); - GlobalEvents.FadeInOut?.Invoke(_fadeInOutTime.x, _fadeInOutTime.y, _fadeColor, _delayAfterFadeIn); + EventManager.FadeInOut?.Invoke(_fadeInOutTime.x, _fadeInOutTime.y, _fadeColor, _delayAfterFadeIn); //CombatUiManager.Instance.FadeInOut(_fadeInOutTime.x, _fadeInOutTime.y, _fadeColor, _delayAfterFadeIn); yield return new WaitForSeconds(_fadeInOutTime.x); diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index da6345a23..5449e8817 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -4,7 +4,7 @@ namespace BlueWater.Tycoons { public override void Interaction() { - TycoonEvents.OnCocktailDiscarded?.Invoke(); + EventManager.OnCocktailDiscarded?.Invoke(); //CurrentTycoonPlayer.DiscardItem(); } diff --git a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs index 6772fa9d1..5e1037fcd 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatUiManager.cs @@ -62,7 +62,7 @@ namespace BlueWater.Uis { PopupUi.OnPopupUiOpenEvent += RegisterPopup; PopupUi.OnPopupUiCloseEvent += UnregisterPopup; - GlobalEvents.FadeInOut += FadeInOut; + EventManager.FadeInOut += FadeInOut; Invoke(nameof(StartTutorial), 0.1f); } @@ -78,7 +78,7 @@ namespace BlueWater.Uis PopupUi.OnPopupUiOpenEvent -= RegisterPopup; PopupUi.OnPopupUiCloseEvent -= UnregisterPopup; - GlobalEvents.FadeInOut -= FadeInOut; + EventManager.FadeInOut -= FadeInOut; } [Button("셋팅 초기화")] diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index aad9c81cb..6a20660ab 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -41,14 +41,14 @@ namespace BlueWater.Uis private void Start() { - TycoonEvents.OnCocktailCompleted += SetItemImage; - TycoonEvents.OnCocktailDiscarded += DiscardItem; + EventManager.OnCocktailCompleted += SetItemImage; + EventManager.OnCocktailDiscarded += DiscardItem; } private void OnDestroy() { - TycoonEvents.OnCocktailCompleted -= SetItemImage; - TycoonEvents.OnCocktailDiscarded -= DiscardItem; + EventManager.OnCocktailCompleted -= SetItemImage; + EventManager.OnCocktailDiscarded -= DiscardItem; _tween.Kill(); } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index 95bb8d04c..7bfd7d4ca 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -53,7 +53,7 @@ namespace BlueWater.Uis PopupUi.OnPopupUiCloseEvent += UnregisterPopup; TycoonManager.Instance.OnTycoonOpenedEvent += TycoonOpenEvent; TycoonManager.Instance.OnTycoonClosedEvent += TycoonClosedEvent; - GlobalEvents.FadeInOut += FadeInOut; + EventManager.FadeInOut += FadeInOut; } private void OnDestroy() @@ -64,7 +64,7 @@ namespace BlueWater.Uis PopupUi.OnPopupUiCloseEvent -= UnregisterPopup; TycoonManager.Instance.OnTycoonOpenedEvent -= TycoonOpenEvent; TycoonManager.Instance.OnTycoonClosedEvent -= TycoonClosedEvent; - GlobalEvents.FadeInOut -= FadeInOut; + EventManager.FadeInOut -= FadeInOut; } #endregion