yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ハートメーター表示修正

This commit is contained in:
kimura 2021-09-24 17:13:16 +09:00
parent a0a766d1b4
commit b54c87d16f
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs
View File

@ -51,6 +51,8 @@ public class CornField : MonoBehaviour
// データ // データ
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin); CoinManager.Instance.ChangeCoin(gameData.coin);
HeartMeter.Instance.Initialize();
HeartMeter.Instance.SetHeart(gameData.Heart);
counterView.Initialize(gameData.cornSeed); counterView.Initialize(gameData.cornSeed);
SetData(); SetData();

4
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -22,9 +22,7 @@ public class KitchenManager : MonoBehaviour
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin); CoinManager.Instance.ChangeCoin(gameData.coin);
HeartMeter.Instance.Initialize();
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
HeartMeter.Instance.Initialize(shopLevelList);
HeartMeter.Instance.SetHeart(gameData.Heart); HeartMeter.Instance.SetHeart(gameData.Heart);
SetData(); SetData();

2
popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs
View File

@ -49,7 +49,7 @@ public class Market : MonoBehaviour
var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet);
var shopLevelToCustomerList = shopLevelList.Select(shopLevel => (level:shopLevel.shopLevel, tenMinCustomer:shopLevel.customer)); var shopLevelToCustomerList = shopLevelList.Select(shopLevel => (level:shopLevel.shopLevel, tenMinCustomer:shopLevel.customer));
HeartMeter.Instance.Initialize(shopLevelList); HeartMeter.Instance.Initialize();
HeartMeter.Instance.SetHeart(gameData.Heart); HeartMeter.Instance.SetHeart(gameData.Heart);
// 在庫数表示 // 在庫数表示

1
popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs
View File

@ -23,6 +23,7 @@ public class ProductManagement : MonoBehaviour
state.Value = ManagementState.None; state.Value = ManagementState.None;
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin); CoinManager.Instance.ChangeCoin(gameData.coin);
HeartMeter.Instance.Initialize();
HeartMeter.Instance.SetHeart(gameData.Heart); HeartMeter.Instance.SetHeart(gameData.Heart);
// 補充方法設定 // 補充方法設定

1
popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs
View File

@ -16,6 +16,7 @@ public class Shopping : MonoBehaviour
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
CoinManager.Instance.ChangeCoin(gameData.coin); CoinManager.Instance.ChangeCoin(gameData.coin);
HeartMeter.Instance.Initialize();
HeartMeter.Instance.SetHeart(gameData.Heart); HeartMeter.Instance.SetHeart(gameData.Heart);
// 一覧データ // 一覧データ

4
popcorn/Assets/MyGame/Scripts/HeartMeter.cs
View File

@ -29,11 +29,11 @@ public class HeartMeter : SingletonMonoBehaviour<HeartMeter>
shopLevel.AddTo(this); shopLevel.AddTo(this);
viewHeartCount.AddTo(this); viewHeartCount.AddTo(this);
compositeDisposable.AddTo(this); compositeDisposable.AddTo(this);
levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet).Select(shopLevelData => shopLevelData.heart).ToList();
} }
public void Initialize(List<ShopLevelData> shopLevelDataList) public void Initialize()
{ {
levelList = shopLevelDataList.Select(shopLevelData => shopLevelData.heart).ToList();
compositeDisposable.Clear(); compositeDisposable.Clear();
shopLevel.Subscribe(x => shopLevel.Subscribe(x =>
{ {