diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index b865eab9..273539d7 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -20,6 +20,7 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Toggle manyWalkerToggle; [SerializeField] private InputField coinCount; [SerializeField] private InputField heartCount; +#if UNITY_EDITOR || DEVELOPMENT_BUILD // Start is called before the first frame update void Start() { @@ -124,4 +125,5 @@ public class DebugOptionManager : MonoBehaviour UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x); }).AddTo(this); } +#endif } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index c67f6f1e..1afd8082 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -26,7 +26,6 @@ public class Market : MonoBehaviour [SerializeField] private GameObject customerPrefab; [SerializeField] private GameObject orderPosisionObject; - private readonly List allRecipe = RecipeData.GetAllRecipe(); private List displayFlavors; private List shuffledOrder; private ReactiveProperty shopState = new ReactiveProperty(); @@ -470,7 +469,7 @@ public class Market : MonoBehaviour foreach (var flavorData in flavors) { var targetIndex = gameData.ShopStock.FindIndex(x => x == flavorData.flavor); - var flavorRecipe = allRecipe.First(x => x.RecipeId == gameData.ShopStock[targetIndex]); + var flavorRecipe = RecipeData.GetAllRecipe().First(x => x.RecipeId == gameData.ShopStock[targetIndex]); gameData.ShopStock.RemoveAt(targetIndex); var bonusRate = 0; coin += flavorRecipe.Price * (1 + bonusRate / 100); diff --git a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs index 732e68f3..763c2035 100644 --- a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs +++ b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs @@ -29,11 +29,11 @@ public class HeartMeter : SingletonMonoBehaviour shopLevel.AddTo(this); viewHeartCount.AddTo(this); compositeDisposable.AddTo(this); - levelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet).Select(shopLevelData => shopLevelData.heart).ToList(); } public void Initialize() { + levelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet).Select(shopLevelData => shopLevelData.heart).ToList(); compositeDisposable.Clear(); shopLevel.Subscribe(x => {