From b7967a58aac1c5f574d45349c7d66b662eefbd1c Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 16 Aug 2021 13:29:27 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=83=96=E6=A7=8B=E9=80=A0?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/CornField/Scripts/CornField.cs | 10 ++++---- .../CornField/Scripts/FacilityExpantion.cs | 4 ++-- .../Scenes/Main/Scripts/KitchenManager.cs | 12 +++++----- .../Scenes/recipe/Scripts/RecipeDetailView.cs | 24 +++++++++---------- .../Assets/MyGame/Scripts/GameDataManager.cs | 12 ++++++---- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 10a4e60b..dbdec506 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -74,16 +74,16 @@ public class CornField : MonoBehaviour gameData.SeedlingDataList = new List(); } availableLines.Clear(); - foreach (var line in gameData.PlantLineTypes) + foreach (var line in gameData.PlantLines) { - var plantLine = plantLines.First(x => x.LineName == line.type); + var plantLine = plantLines.First(x => x.LineName == line.Type); plantLine.gameObject.SetActive(true); - plantLine.SetFieldLevel(line.level); + plantLine.SetFieldLevel(line.Level); availableLines.Add(plantLine); // コーン株の進行度初回データ作成 - if (!gameData.SeedlingDataList.Exists(x => x.type == line.type)) + if (!gameData.SeedlingDataList.Exists(x => x.type == line.Type)) { - gameData.SeedlingDataList.Add(GenerateSeedlingData(line.type, line.level)); + gameData.SeedlingDataList.Add(GenerateSeedlingData(line.Type, line.Level)); } } GameDataManager.SaveGameData(); diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/FacilityExpantion.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/FacilityExpantion.cs index 515585f5..f7b0ee8e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/FacilityExpantion.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/FacilityExpantion.cs @@ -26,12 +26,12 @@ public class FacilityExpantion : MonoBehaviour // 適用できるかどうか判定 foreach (var item in items) { - if (!GameDataManager.GameData.PlantLineTypes.Exists(x => x.type == item.Type)) + if (!GameDataManager.GameData.PlantLines.Exists(x => x.Type == item.Type)) { item.SetItem(false, CornFieldRank.Rank1); return; } - item.SetItem(true, GameDataManager.GameData.PlantLineTypes.First(x => x.type == item.Type).level); + item.SetItem(true, GameDataManager.GameData.PlantLines.First(x => x.Type == item.Type).Level); item.ClickObservable.Subscribe(_ => { // 購入時コイン比較後、コイン減算（ここコイン増加と処理がかぶるとややこしい（Batchとかで処理するといいかも diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs index 5c08d8d8..17768392 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs @@ -58,20 +58,20 @@ public class KitchenManager : MonoBehaviour // 所持素材 if (gameData.Material == null || gameData.Material.Count == 0) { - gameData.Material = new List<(int id, int amount)> + gameData.Material = new List { - (1, 10), - (2, 10), - (6, 10), + new MaterialData(1, 10), + new MaterialData(2, 10), + new MaterialData(6, 10), }; } // 素材の補充 - var materialStockIndex = gameData.Material.FindIndex(x => x.amount == 0); + var materialStockIndex = gameData.Material.FindIndex(x => x.Amount == 0); if (materialStockIndex != -1) { var temp = gameData.Material[materialStockIndex]; - temp.amount += 10; + temp.Amount += 10; gameData.Material[materialStockIndex] = temp; } diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 2005421d..4f10c08d 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -48,15 +48,15 @@ public class RecipeDetailView : MonoBehaviour { var gameData = GameDataManager.GameData; gameData.cornSeed -= data.CornAmount; - var flavorIndex1 = gameData.Material.FindIndex(x => x.id == data.Flavors[0].id); + var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.Flavors[0].id); var stockMaterial1 = gameData.Material[flavorIndex1]; - stockMaterial1.amount -= data.Flavors[0].amount; + stockMaterial1.Amount -= data.Flavors[0].amount; gameData.Material[flavorIndex1] = stockMaterial1; if (data.Flavors.Count == 2) { - var flavorIndex2 = gameData.Material.FindIndex(x => x.id == data.Flavors[1].id); + var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.Flavors[1].id); var stockMaterial2 = gameData.Material[flavorIndex2]; - stockMaterial2.amount -= data.Flavors[1].amount; + stockMaterial2.Amount -= data.Flavors[1].amount; gameData.Material[flavorIndex2] = stockMaterial2; } @@ -85,20 +85,20 @@ public class RecipeDetailView : MonoBehaviour cornAmountText.text = string.Format(cornAmountFormat, gameData.cornSeed, data.CornAmount); var flavor1Amount = 0; - var flavorIndex1 = gameData.Material.FindIndex(x => x.id == data.Flavors[0].id); + var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.Flavors[0].id); if (flavorIndex1 != -1) { - flavor1Amount = gameData.Material[flavorIndex1].amount; + flavor1Amount = gameData.Material[flavorIndex1].Amount; } flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.Flavors[0].amount); var flavor2Amount = 0; if (data.Flavors.Count == 2) { - var flavorIndex2 = gameData.Material.FindIndex(x => x.id == data.Flavors[1].id); + var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.Flavors[1].id); if (flavorIndex2 != -1) { - flavor2Amount = gameData.Material[flavorIndex2].amount; + flavor2Amount = gameData.Material[flavorIndex2].Amount; } flavor2View.SetActive(true); flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.Flavors[1].amount); @@ -118,16 +118,16 @@ public class RecipeDetailView : MonoBehaviour flag = false; cornAmountText.color = Color.red; } - var flavorIndex1 = gameData.Material.FindIndex(x => x.id == data.Flavors[0].id); - if (flavorIndex1 == -1 || gameData.Material[flavorIndex1].amount < data.Flavors[0].amount) + var flavorIndex1 = gameData.Material.FindIndex(x => x.Id == data.Flavors[0].id); + if (flavorIndex1 == -1 || gameData.Material[flavorIndex1].Amount < data.Flavors[0].amount) { flag = false; flavor1AmountText.color = Color.red; } if (data.Flavors.Count == 2) { - var flavorIndex2 = gameData.Material.FindIndex(x => x.id == data.Flavors[1].id); - if (flavorIndex2 == -1 || gameData.Material[flavorIndex2].amount < data.Flavors[1].amount) + var flavorIndex2 = gameData.Material.FindIndex(x => x.Id == data.Flavors[1].id); + if (flavorIndex2 == -1 || gameData.Material[flavorIndex2].Amount < data.Flavors[1].amount) { flag = false; flavor2AmountText.color = Color.red; diff --git a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs index 30b4bf50..150aeca8 100644 --- a/popcorn/Assets/MyGame/Scripts/GameDataManager.cs +++ b/popcorn/Assets/MyGame/Scripts/GameDataManager.cs @@ -53,9 +53,8 @@ public sealed class GameData { // public bool isRandomAvatar; // CornField [DataMember(Name = "Data12")] - public List<(PlantLineType type, CornFieldRank level)> PlantLineTypes; - [DataMember(Name = "Data13")] - public CornFieldRank FieldLevel = CornFieldRank.Rank1; + public List PlantLines = new List(); + // [DataMember(Name = "Data13")] [DataMember(Name = "Data14")] public int MachineLevel = 1; [DataMember(Name = "Data15")] @@ -68,9 +67,10 @@ public sealed class GameData { public int[] MyRecipes; // 所持素材 [DataMember(Name = "Data18")] - public List<(int id, int amount)> Material = new List<(int id, int amount)>(); + public List Material = new List(); // 店頭ポップコーン在庫 - [DataMember(Name = "Data19")] + [DataMember(Name = "Data19")] + private int[] shopStock; public List ShopStock; // タンクポップコーン在庫 [DataMember(Name = "Data20")] @@ -111,6 +111,7 @@ public sealed class GameData { // avatarIdList = avatarIdArray == null ? new List() : avatarIdArray.ToList(); // newAvatarIdList = newAvatarIdArray == null ? new List() : newAvatarIdArray.ToList(); // lastAdRewardTimeList = lastAdRewardTimeArray == null ? new List() : lastAdRewardTimeArray.ToList(); + ShopStock = shopStock?.ToList() ?? new List(); } private Dictionary ArrayToDictionary(KeyValueOfintint[] array){ var dictionary = new Dictionary(); @@ -125,6 +126,7 @@ public sealed class GameData { // avatarIdArray = avatarIdList.ToArray(); // newAvatarIdArray = newAvatarIdList.ToArray(); // lastAdRewardTimeArray = lastAdRewardTimeList.ToArray(); + shopStock = ShopStock.ToArray(); } private KeyValueOfintint[] DictionaryToArray(Dictionary dictionary){ var array = new KeyValueOfintint[dictionary.Count];