From 126b301abc919bbc9bf25a5677dc7cd55446c290 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 16 Aug 2021 14:10:54 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B7=E3=83=AA=E3=82=A2=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=82=A8=E3=83=A9=E3=83=BC=E8=A7=A3=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/CornField/Scripts/CornField.cs | 20 +++++++++---------- .../Scenes/CornField/Scripts/SeedlingData.cs | 19 ++++++++++++++++++ .../CornField/Scripts/SeedlingData.cs.meta | 3 +++ .../CornField/Scripts/SeedlingProgressData.cs | 2 +- 4 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index fd0f2158..ceb56ead 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -76,12 +76,12 @@ public class CornField : MonoBehaviour { var index = i; i++; - seedling.SetSeedlingGene(lineData.Seedlings[index].firstTime, lineData.Seedlings[index].period, lineData.Seedlings[index].level); + seedling.SetSeedlingGene(lineData.Seedlings[index].FirstTime, lineData.Seedlings[index].Period, lineData.Seedlings[index].Level); seedling.Harvested.Subscribe(_ => { // 収穫 VibrationManager.Instance.PlayVibrationOnce(); - var harvestCount = GetHarvestCount(lineData.Seedlings[index].level); + var harvestCount = GetHarvestCount(lineData.Seedlings[index].Level); var harvestedCorn = GetHarvestedCornCount(gameData.MachineLevel); gameData.cornSeed += harvestedCorn * harvestCount; var seedlingTransform = seedling.transform; @@ -112,7 +112,7 @@ public class CornField : MonoBehaviour } // 新しい苗 var newGene = GenerateSeedlingGene(line.FieldLevel); - seedling.SetSeedlingGene(newGene.firstTime, newGene.period, newGene.level); + seedling.SetSeedlingGene(newGene.FirstTime, newGene.Period, newGene.Level); gameData.SeedlingDataList[seedlingDataIndex].Seedlings[index] = newGene; GameDataManager.SaveGameData(); }).AddTo(compositeDisposable); @@ -131,8 +131,8 @@ public class CornField : MonoBehaviour if (Random.Range(0, 2) == 0) { var tmpData = gameData.SeedlingDataList[seedlingDataIndex].Seedlings[i]; - tmpData.firstTime = tmpData.firstTime.AddSeconds(-1); - line.Seedlings[i].PromoteGrowth(tmpData.firstTime); + tmpData.FirstTime = tmpData.FirstTime.AddSeconds(-1); + line.Seedlings[i].PromoteGrowth(tmpData.FirstTime); gameData.SeedlingDataList[seedlingDataIndex].Seedlings[i] = tmpData; } } @@ -176,7 +176,7 @@ public class CornField : MonoBehaviour return new SeedlingProgressData { type = PlantLineType.Top, - Seedlings = new List<(DateTime firstTime, int period, CornFieldRank rank)>() + Seedlings = new List() { GenerateSeedlingGene(level), GenerateSeedlingGene(level), @@ -188,7 +188,7 @@ public class CornField : MonoBehaviour return new SeedlingProgressData { type = PlantLineType.Center, - Seedlings = new List<(DateTime firstTime, int period, CornFieldRank rank)>() + Seedlings = new List() { GenerateSeedlingGene(level), GenerateSeedlingGene(level), @@ -199,7 +199,7 @@ public class CornField : MonoBehaviour return new SeedlingProgressData { type = PlantLineType.Bottom, - Seedlings = new List<(DateTime firstTime, int period, CornFieldRank rank)>() + Seedlings = new List() { GenerateSeedlingGene(level), GenerateSeedlingGene(level), @@ -212,10 +212,10 @@ public class CornField : MonoBehaviour } } - private (DateTime firstTime, int period, CornFieldRank level) GenerateSeedlingGene(CornFieldRank level) + private SeedlingData GenerateSeedlingGene(CornFieldRank level) { // return (DateTime.Now, Random.Range(minPeriod, maxPeriod + 1)); - return (DateTime.Now.AddSeconds(-Random.Range(0, 15)), 15 + Random.Range(0, 15), level); + return new SeedlingData(DateTime.Now.AddSeconds(-Random.Range(0, 15)), 15 + Random.Range(0, 15), level); } private int GetHarvestCount(CornFieldRank rank) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs new file mode 100644 index 00000000..14b36cc2 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs @@ -0,0 +1,19 @@ +using System; + +public class SeedlingData +{ + public DateTime FirstTime; + public int Period; + public CornFieldRank Level; + + public SeedlingData() + { + } + + public SeedlingData(DateTime firstTime, int period, CornFieldRank level) + { + this.FirstTime = firstTime; + this.Period = period; + this.Level = level; + } +} diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs.meta b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs.meta new file mode 100644 index 00000000..fad64f87 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingData.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 75f5330a759540399e645faea986ac87 +timeCreated: 1629089702 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingProgressData.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingProgressData.cs index fd6112c9..41a1eec3 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingProgressData.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/SeedlingProgressData.cs @@ -4,5 +4,5 @@ using System.Collections.Generic; public class SeedlingProgressData { public PlantLineType type; - public List<(DateTime firstTime, int period, CornFieldRank level)> Seedlings; + public List Seedlings; } \ No newline at end of file