diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index dbdec506..fd0f2158 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -42,24 +42,7 @@ public class CornField : MonoBehaviour // データ var gameData = GameDataManager.GameData; CoinManager.Instance.ChangeCoin(gameData.coin); - // 解放済みの畑 - gameData.PlantLineTypes = new List<(PlantLineType type, CornFieldRank level)>() - { - (PlantLineType.Top, CornFieldRank.Rank2), - (PlantLineType.Center, CornFieldRank.Rank1), - (PlantLineType.Bottom, CornFieldRank.Rank3) - }; - if (gameData.PlantLineTypes == null || gameData.PlantLineTypes.Count == 0) - { - gameData.PlantLineTypes = new List<(PlantLineType type, CornFieldRank level)>() - { - (PlantLineType.Center, CornFieldRank.Rank1), - }; - } - // 畑の質 - // gameData.FieldLevel = CornFieldRank.Rank3; - // 収穫機レベル - gameData.MachineLevel = 1; + SetData(); // 畑リセット foreach (var line in plantLines) @@ -68,11 +51,6 @@ public class CornField : MonoBehaviour } // セーブデータから畑を復元 - // gameData.SeedlingDataList = new List(); - if (gameData.SeedlingDataList == null || gameData.SeedlingDataList.Count == 0) - { - gameData.SeedlingDataList = new List(); - } availableLines.Clear(); foreach (var line in gameData.PlantLines) { @@ -164,6 +142,32 @@ public class CornField : MonoBehaviour }).AddTo(compositeDisposable); } + private void SetData() + { + var gameData = GameDataManager.GameData; + // 解放済みの畑 + gameData.PlantLines = new List + { + new PlantLineData(PlantLineType.Top, CornFieldRank.Rank2), + new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), + new PlantLineData(PlantLineType.Bottom, CornFieldRank.Rank3) + }; + if (gameData.PlantLines == null || gameData.PlantLines.Count == 0) + { + gameData.PlantLines = new List + { + new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), + }; + } + if (gameData.SeedlingDataList == null || gameData.SeedlingDataList.Count == 0) + { + gameData.SeedlingDataList = new List(); + } + // 収穫機レベル + gameData.MachineLevel = 1; + GameDataManager.SaveGameData(); + } + private SeedlingProgressData GenerateSeedlingData(PlantLineType type, CornFieldRank level) { switch (type)