yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

セーブ構造変更対応

This commit is contained in:
kimura 2021-08-16 13:29:27 +09:00
parent 019c55ba05
commit b7967a58aa
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs
View File

@ -74,16 +74,16 @@ public class CornField : MonoBehaviour
gameData.SeedlingDataList = new List<SeedlingProgressData>(); gameData.SeedlingDataList = new List<SeedlingProgressData>();
} }
availableLines.Clear(); 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.gameObject.SetActive(true);
plantLine.SetFieldLevel(line.level); plantLine.SetFieldLevel(line.Level);
availableLines.Add(plantLine); 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(); GameDataManager.SaveGameData();

4
popcorn/Assets/MyGame/Scenes/CornField/Scripts/FacilityExpantion.cs
View File

@ -26,12 +26,12 @@ public class FacilityExpantion : MonoBehaviour
// 適用できるかどうか判定 // 適用できるかどうか判定
foreach (var item in items) 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); item.SetItem(false, CornFieldRank.Rank1);
return; 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(_ => item.ClickObservable.Subscribe(_ =>
{ {
// 購入時コイン比較後、コイン減算（ここコイン増加と処理がかぶるとややこしい（Batchとかで処理するといいかも // 購入時コイン比較後、コイン減算（ここコイン増加と処理がかぶるとややこしい（Batchとかで処理するといいかも

12
popcorn/Assets/MyGame/Scenes/Main/Scripts/KitchenManager.cs
View File

@ -58,20 +58,20 @@ public class KitchenManager : MonoBehaviour
// 所持素材 // 所持素材
if (gameData.Material == null || gameData.Material.Count == 0) if (gameData.Material == null || gameData.Material.Count == 0)
{ {
gameData.Material = new List<(int id, int amount)> gameData.Material = new List<MaterialData>
{ {
(1, 10), new MaterialData(1, 10),
(2, 10), new MaterialData(2, 10),
(6, 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) if (materialStockIndex != -1)
{ {
var temp = gameData.Material[materialStockIndex]; var temp = gameData.Material[materialStockIndex];
temp.amount += 10; temp.Amount += 10;
gameData.Material[materialStockIndex] = temp; gameData.Material[materialStockIndex] = temp;
} }

24
popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs
View File

@ -48,15 +48,15 @@ public class RecipeDetailView : MonoBehaviour
{ {
var gameData = GameDataManager.GameData; var gameData = GameDataManager.GameData;
gameData.cornSeed -= data.CornAmount; 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]; var stockMaterial1 = gameData.Material[flavorIndex1];
stockMaterial1.amount -= data.Flavors[0].amount; stockMaterial1.Amount -= data.Flavors[0].amount;
gameData.Material[flavorIndex1] = stockMaterial1; gameData.Material[flavorIndex1] = stockMaterial1;
if (data.Flavors.Count == 2) 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]; var stockMaterial2 = gameData.Material[flavorIndex2];
stockMaterial2.amount -= data.Flavors[1].amount; stockMaterial2.Amount -= data.Flavors[1].amount;
gameData.Material[flavorIndex2] = stockMaterial2; gameData.Material[flavorIndex2] = stockMaterial2;
} }
@ -85,20 +85,20 @@ public class RecipeDetailView : MonoBehaviour
cornAmountText.text = string.Format(cornAmountFormat, gameData.cornSeed, data.CornAmount); cornAmountText.text = string.Format(cornAmountFormat, gameData.cornSeed, data.CornAmount);
var flavor1Amount = 0; 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) if (flavorIndex1 != -1)
{ {
flavor1Amount = gameData.Material[flavorIndex1].amount; flavor1Amount = gameData.Material[flavorIndex1].Amount;
} }
flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.Flavors[0].amount); flavor1AmountText.text = string.Format(flavorAmountFormat, flavor1Amount, data.Flavors[0].amount);
var flavor2Amount = 0; var flavor2Amount = 0;
if (data.Flavors.Count == 2) 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) if (flavorIndex2 != -1)
{ {
flavor2Amount = gameData.Material[flavorIndex2].amount; flavor2Amount = gameData.Material[flavorIndex2].Amount;
} }
flavor2View.SetActive(true); flavor2View.SetActive(true);
flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.Flavors[1].amount); flavor2AmountText.text = string.Format(flavorAmountFormat, flavor2Amount, data.Flavors[1].amount);
@ -118,16 +118,16 @@ public class RecipeDetailView : MonoBehaviour
flag = false; flag = false;
cornAmountText.color = Color.red; cornAmountText.color = Color.red;
} }
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 || gameData.Material[flavorIndex1].amount < data.Flavors[0].amount) if (flavorIndex1 == -1 || gameData.Material[flavorIndex1].Amount < data.Flavors[0].amount)
{ {
flag = false; flag = false;
flavor1AmountText.color = Color.red; flavor1AmountText.color = Color.red;
} }
if (data.Flavors.Count == 2) 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 || gameData.Material[flavorIndex2].amount < data.Flavors[1].amount) if (flavorIndex2 == -1 || gameData.Material[flavorIndex2].Amount < data.Flavors[1].amount)
{ {
flag = false; flag = false;
flavor2AmountText.color = Color.red; flavor2AmountText.color = Color.red;

12
popcorn/Assets/MyGame/Scripts/GameDataManager.cs
View File

@ -53,9 +53,8 @@ public sealed class GameData {
// public bool isRandomAvatar; // public bool isRandomAvatar;
// CornField // CornField
[DataMember(Name = "Data12")] [DataMember(Name = "Data12")]
public List<(PlantLineType type, CornFieldRank level)> PlantLineTypes; public List<PlantLineData> PlantLines = new List<PlantLineData>();
[DataMember(Name = "Data13")] // [DataMember(Name = "Data13")]
public CornFieldRank FieldLevel = CornFieldRank.Rank1;
[DataMember(Name = "Data14")] [DataMember(Name = "Data14")]
public int MachineLevel = 1; public int MachineLevel = 1;
[DataMember(Name = "Data15")] [DataMember(Name = "Data15")]
@ -68,9 +67,10 @@ public sealed class GameData {
public int[] MyRecipes; public int[] MyRecipes;
// 所持素材 // 所持素材
[DataMember(Name = "Data18")] [DataMember(Name = "Data18")]
public List<(int id, int amount)> Material = new List<(int id, int amount)>(); public List<MaterialData> Material = new List<MaterialData>();
// 店頭ポップコーン在庫 // 店頭ポップコーン在庫
[DataMember(Name = "Data19")] [DataMember(Name = "Data19")]
private int[] shopStock;
public List<int> ShopStock; public List<int> ShopStock;
// タンクポップコーン在庫 // タンクポップコーン在庫
[DataMember(Name = "Data20")] [DataMember(Name = "Data20")]
@ -111,6 +111,7 @@ public sealed class GameData {
// avatarIdList = avatarIdArray == null ? new List<int>() : avatarIdArray.ToList(); // avatarIdList = avatarIdArray == null ? new List<int>() : avatarIdArray.ToList();
// newAvatarIdList = newAvatarIdArray == null ? new List<int>() : newAvatarIdArray.ToList(); // newAvatarIdList = newAvatarIdArray == null ? new List<int>() : newAvatarIdArray.ToList();
// lastAdRewardTimeList = lastAdRewardTimeArray == null ? new List<long>() : lastAdRewardTimeArray.ToList(); // lastAdRewardTimeList = lastAdRewardTimeArray == null ? new List<long>() : lastAdRewardTimeArray.ToList();
ShopStock = shopStock?.ToList() ?? new List<int>();
} }
private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){ private Dictionary<int, int> ArrayToDictionary(KeyValueOfintint[] array){
var dictionary = new Dictionary<int, int>(); var dictionary = new Dictionary<int, int>();
@ -125,6 +126,7 @@ public sealed class GameData {
// avatarIdArray = avatarIdList.ToArray(); // avatarIdArray = avatarIdList.ToArray();
// newAvatarIdArray = newAvatarIdList.ToArray(); // newAvatarIdArray = newAvatarIdList.ToArray();
// lastAdRewardTimeArray = lastAdRewardTimeList.ToArray(); // lastAdRewardTimeArray = lastAdRewardTimeList.ToArray();
shopStock = ShopStock.ToArray();
} }
private KeyValueOfintint[] DictionaryToArray(Dictionary<int, int> dictionary){ private KeyValueOfintint[] DictionaryToArray(Dictionary<int, int> dictionary){
var array = new KeyValueOfintint[dictionary.Count]; var array = new KeyValueOfintint[dictionary.Count];