From 83817c0cc10f3638fb3a9c3374dd2dcbe695d78a Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 12 Nov 2021 19:58:40 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=83=A9=E3=82=A4=E3=83=91=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E9=81=B8=E6=8A=9E=E7=8A=B6=E6=85=8B=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs | 10 ++++++++-- popcorn/Assets/MyGame/Scripts/GameDataManager.cs | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) 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; }