diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs index 95df2208..a2527a46 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs @@ -23,10 +23,16 @@ public class PanSelector : MonoBehaviour var panList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.PanDataSheet); var myPanList = panList.Where(data => GameDataManager.GameData.Pans.Contains(data.id)).ToList(); var panCount = myPanList.Count; - selectedPanData.Value = myPanList[0]; - selectedPanData.Subscribe(data => + var initIndex = myPanList.FindIndex(data => data.id == GameDataManager.GameData.SelectedPanId); + if (initIndex == -1) + { + initIndex = 0; + } + selectedIndex.Value = initIndex; + selectedPanData.SkipLatestValueOnSubscribe().Subscribe(data => { SetData(data); + GameDataManager.GameData.SelectedPanId = data.id; }).AddTo(this); selectedIndex.Subscribe(x => { diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 3023a23b..e7509a59 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -132,6 +132,10 @@ public sealed class GameData { [DataMember(Name = "Data38")] public bool isFirstPlay = true; + // フライパン + [DataMember(Name = "Data39")] + public int SelectedPanId; + // mission [DataMember(Name = "Data1001")] public int TotalAddCoin { get; private set; }