iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg

Browse Source
This commit is contained in:
SweetJJuya 2024-09-12 16:56:52 +09:00
commit 9ae0556534
12 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs
View File

@ -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("컴포넌트 초기화")]

15
Assets/02.Scripts/Tycoon/TycoonEvents.cs → Assets/02.Scripts/EventManager.cs
View File

@ -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<float, float, Color?, float> FadeInOut;
#endregion
// Tycoon events
#region Tycoon events
// 음료
// public static Action<string> OnDrinkRecipeAcquired;
// public static Action<LiquidData> OnDrinkRecipeSelected;
@ -18,5 +29,7 @@ namespace BlueWater
// 요리
//public static Action<string> OnFoodRecipeAcquired;
#endregion
}
}

0
Assets/02.Scripts/Tycoon/TycoonEvents.cs.meta → Assets/02.Scripts/EventManager.cs.meta
View File

10
Assets/02.Scripts/GlobalEvents.cs
View File

@ -1,10 +0,0 @@
using System;
using UnityEngine;
namespace BlueWater
{
public static class GlobalEvents
{
public static Action<float, float, Color?, float> FadeInOut;
}
}

2
Assets/02.Scripts/GlobalEvents.cs.meta
View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 2e838e8a31b7c6347bd379a901be2f75

10
Assets/02.Scripts/LiquidController.cs
View File

@ -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);

4
Assets/02.Scripts/LiquidInteractionRegion.cs
View File

@ -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();
}
}
}

3
Assets/02.Scripts/Map/MapPortal.cs
View File

@ -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);

2
Assets/02.Scripts/Prop/Tycoon/TrashCan.cs
View File

@ -4,7 +4,7 @@ namespace BlueWater.Tycoons
{
public override void Interaction()
{
TycoonEvents.OnCocktailDiscarded?.Invoke();
EventManager.OnCocktailDiscarded?.Invoke();
//CurrentTycoonPlayer.DiscardItem();
}

4
Assets/02.Scripts/Ui/Combat/CombatUiManager.cs
View File

@ -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("셋팅 초기화")]

8
Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs
View File

@ -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();
}

4
Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs
View File

@ -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