From b54c87d16f482432d971b68b2a81d9d9dca23c97 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 24 Sep 2021 17:13:16 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=BC=E3=83=88=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E8=A1=A8=E7=A4=BA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs | 2 ++ popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs | 4 +--- popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs | 2 +- .../MyGame/Scenes/marketing/Scripts/ProductManagement.cs | 1 + popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs | 1 + popcorn/Assets/MyGame/Scripts/HeartMeter.cs | 4 ++-- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 3cddad3c..8e325005 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -51,6 +51,8 @@ public class CornField : MonoBehaviour // データ var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); + HeartMeter.Instance.Initialize(); + HeartMeter.Instance.SetHeart(gameData.Heart); counterView.Initialize(gameData.cornSeed); SetData(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index c784ef38..d6a0864a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -22,9 +22,7 @@ public class KitchenManager : MonoBehaviour var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); - - var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); - HeartMeter.Instance.Initialize(shopLevelList); + HeartMeter.Instance.Initialize(); HeartMeter.Instance.SetHeart(gameData.Heart); SetData(); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 052085ea..348f16f2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -49,7 +49,7 @@ public class Market : MonoBehaviour var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); var shopLevelToCustomerList = shopLevelList.Select(shopLevel => (level:shopLevel.shopLevel, tenMinCustomer:shopLevel.customer)); - HeartMeter.Instance.Initialize(shopLevelList); + HeartMeter.Instance.Initialize(); HeartMeter.Instance.SetHeart(gameData.Heart); // 在庫数表示 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index 728ec06c..d3502653 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -23,6 +23,7 @@ public class ProductManagement : MonoBehaviour state.Value = ManagementState.None; var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); + HeartMeter.Instance.Initialize(); HeartMeter.Instance.SetHeart(gameData.Heart); // 補充方法設定 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 46d55e8c..5f94fae9 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -16,6 +16,7 @@ public class Shopping : MonoBehaviour var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); + HeartMeter.Instance.Initialize(); HeartMeter.Instance.SetHeart(gameData.Heart); // 一覧データ diff --git a/popcorn/Assets/MyGame/Scripts/HeartMeter.cs b/popcorn/Assets/MyGame/Scripts/HeartMeter.cs index 40eb47f9..732e68f3 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(List shopLevelDataList) + public void Initialize() { - levelList = shopLevelDataList.Select(shopLevelData => shopLevelData.heart).ToList(); compositeDisposable.Clear(); shopLevel.Subscribe(x => {