diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 535e168c..ed3f790e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -82,12 +82,12 @@ public class CornField : MonoBehaviour } } GameDataManager.SaveGameData(); - Debug.Log(gameData.SeedlingDataList.Count); // 株設定 foreach (var line in availableLines) { - var lineData = gameData.SeedlingDataList.First(x => x.type == line.LineName); + var seedlingDataIndex = gameData.SeedlingDataList.FindIndex(x => x.type == line.LineName); + var lineData = gameData.SeedlingDataList[seedlingDataIndex]; var i = 0; foreach (var seedling in line.Seedlings) { @@ -118,10 +118,9 @@ public class CornField : MonoBehaviour }); } // 新しい苗 - var seedlingDataIndex = gameData.SeedlingDataList.FindIndex(x => x.type == line.LineName); var newGene = GenerateSeedlingGene(line.FieldLevel); - gameData.SeedlingDataList[seedlingDataIndex].Seedlings[index] = newGene; seedling.SetSeedlingGene(newGene.firstTime, newGene.period, newGene.level); + gameData.SeedlingDataList[seedlingDataIndex].Seedlings[index] = newGene; GameDataManager.SaveGameData(); }).AddTo(compositeDisposable); } @@ -133,26 +132,21 @@ public class CornField : MonoBehaviour VibrationManager.Instance.PlayVibrationOnce(); foreach (var line in availableLines) { - var lineData = gameData.SeedlingDataList.First(x => x.type == line.LineName); - var i = 0; - foreach (var seedling in line.Seedlings) + var seedlingDataIndex = gameData.SeedlingDataList.FindIndex(x => x.type == line.LineName); + for (int i = 0; i < line.Seedlings.Count; i++) { if (Random.Range(0, 2) == 0) { - var tmpData = lineData.Seedlings[i]; + var tmpData = gameData.SeedlingDataList[seedlingDataIndex].Seedlings[i]; tmpData.firstTime = tmpData.firstTime.AddSeconds(-1); - seedling.PromoteGrowth(tmpData.firstTime); - lineData.Seedlings[i] = tmpData; + line.Seedlings[i].PromoteGrowth(tmpData.firstTime); + gameData.SeedlingDataList[seedlingDataIndex].Seedlings[i] = tmpData; } } - var seedlingDataIndex = gameData.SeedlingDataList.FindIndex(x => x.type == line.LineName); - gameData.SeedlingDataList[seedlingDataIndex] = lineData; } // 設定のセーブ - Debug.Log($"{gameData.SeedlingDataList[0].Seedlings[2].firstTime} {gameData.SeedlingDataList[0].Seedlings[0].period}"); GameDataManager.SaveGameData(); }).AddTo(compositeDisposable); - Debug.Log($"{gameData.SeedlingDataList[0].Seedlings[2].firstTime} {gameData.SeedlingDataList[0].Seedlings[0].period}"); } private SeedlingProgressData GenerateSeedlingData(PlantLineType type, CornFieldRank level)