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

エラー解消

This commit is contained in:
kimura 2021-09-28 11:00:39 +09:00
parent 2cda06db9f
commit 767fe761e4
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs
View File

@ -20,6 +20,7 @@ public class DebugOptionManager : MonoBehaviour
[SerializeField] private Toggle manyWalkerToggle; [SerializeField] private Toggle manyWalkerToggle;
[SerializeField] private InputField coinCount; [SerializeField] private InputField coinCount;
[SerializeField] private InputField heartCount; [SerializeField] private InputField heartCount;
#if UNITY_EDITOR || DEVELOPMENT_BUILD
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@ -124,4 +125,5 @@ public class DebugOptionManager : MonoBehaviour
UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x); UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugManyWalker", x);
}).AddTo(this); }).AddTo(this);
} }
#endif
} }

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

@ -26,7 +26,6 @@ public class Market : MonoBehaviour
[SerializeField] private GameObject customerPrefab; [SerializeField] private GameObject customerPrefab;
[SerializeField] private GameObject orderPosisionObject; [SerializeField] private GameObject orderPosisionObject;
private readonly List<RecipeData> allRecipe = RecipeData.GetAllRecipe();
private List<int> displayFlavors; private List<int> displayFlavors;
private List<int> shuffledOrder; private List<int> shuffledOrder;
private ReactiveProperty<ShopState> shopState = new ReactiveProperty<ShopState>(); private ReactiveProperty<ShopState> shopState = new ReactiveProperty<ShopState>();
@ -470,7 +469,7 @@ public class Market : MonoBehaviour
foreach (var flavorData in flavors) foreach (var flavorData in flavors)
{ {
var targetIndex = gameData.ShopStock.FindIndex(x => x == flavorData.flavor); 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); gameData.ShopStock.RemoveAt(targetIndex);
var bonusRate = 0; var bonusRate = 0;
coin += flavorRecipe.Price * (1 + bonusRate / 100); coin += flavorRecipe.Price * (1 + bonusRate / 100);

2
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() public void Initialize()
{ {
levelList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopLevelData>(Const.ShopLevelDataSheet).Select(shopLevelData => shopLevelData.heart).ToList();
compositeDisposable.Clear(); compositeDisposable.Clear();
shopLevel.Subscribe(x => shopLevel.Subscribe(x =>
{ {