diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs index 1cf1e6864..07012d940 100644 --- a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs @@ -53,6 +53,7 @@ namespace BlueWater.Items [field: SerializeField, BoxGroup("직접 추가하는 영역")] public Sprite Sprite { get; set; } + [field: SerializeField] public List ValidIngredients { get; set; } = new(5); public List GetValidIngredients(int liquidMaxAmount) diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs b/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs index 8b9108b87..efcafad89 100644 --- a/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs @@ -1,3 +1,6 @@ +#if UNITY_EDITOR +using UnityEditor; +#endif using UnityEngine; namespace BlueWater.Items @@ -7,15 +10,23 @@ namespace BlueWater.Items { protected override void OnEnable() { - if (!Application.isPlaying) return; - base.OnEnable(); +#if UNITY_EDITOR + if (!EditorApplication.isPlayingOrWillChangePlaymode) + { + Debug.Log("실행 중 아님"); + return; + } +#endif + var maxLiquidAmount = FindAnyObjectByType().GetMaxLiquidCount(); foreach (var element in _datas.Values) { element.ValidIngredients = element.GetValidIngredients(maxLiquidAmount); } } + + } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/DataSo.cs b/Assets/02.Scripts/Item/DataSo.cs index 967897b3e..d1f1b32d8 100644 --- a/Assets/02.Scripts/Item/DataSo.cs +++ b/Assets/02.Scripts/Item/DataSo.cs @@ -14,8 +14,6 @@ namespace BlueWater.Items protected virtual void OnEnable() { - if (!Application.isPlaying) return; - InitializeDictionary(); }