From 650be5af17bb1cce240c91c276bc01a1438b9f48 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 7 Oct 2022 20:13:57 +0900 Subject: [PATCH] =?UTF-8?q?=E7=95=91=E5=BC=B7=E5=8C=96=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/Scripts/CornField.cs | 2 ++ .../CornField/Scripts/CornFieldReinforcement.cs | 2 ++ .../Scripts/CornFieldReinforcementDetailView.cs | 16 ++++++++++------ .../Scripts/CornFieldReinforcementView.cs | 12 +++++++----- .../CornField/Scripts/MachineUpgradeView.cs | 4 ++++ 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index fb459ade..4c8aab3c 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -291,6 +291,8 @@ public class CornField : MonoBehaviour compositeDisposable.Clear(); var gameData = GameDataManager.GameData; var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); var machineList = fieldData.Where(data => data.Type == CornFieldUpgradeType.Machine); cornHarvester.SetMachine(machineList.First(data => data.level == gameData.MachineLevel).GetPrefab()); diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs index c91f4da7..55c0b99e 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcement.cs @@ -34,6 +34,8 @@ public class CornFieldReinforcement : MonoBehaviour compositeDisposable.Clear(); var gameData = GameDataManager.GameData; var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); // 畑 foreach (var view in reinforcementViews) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs index 3034d6e1..d9e2926d 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs @@ -82,9 +82,9 @@ public class CornFieldReinforcementDetailView : MonoBehaviour }).AddTo(this); } - private void SetFieldData(PlantLineData data, int price) + private void SetFieldData(PlantLineData lineData, int price) { - if (data is null) + if (lineData is null) { reinforceObject.SetActive(false); releaseObject.SetActive(true); @@ -102,12 +102,14 @@ public class CornFieldReinforcementDetailView : MonoBehaviour releaseButton.gameObject.SetActive(false); machineObject.SetActive(false); reinforcePriceText.text = price.ToString(); - var nextRank = CornFieldReinforcement.GetNextRank(data.Level); - var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(data.Type); + var nextRank = CornFieldReinforcement.GetNextRank(lineData.Level); + var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(lineData.Type); var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); - var currentHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)data.Level)?.harvested ?? 1; + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); + var currentHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)lineData.Level)?.harvested ?? 1; var nextHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)nextRank)?.harvested ?? 1; - currentSeedling.SetSeedling(data.Level); + currentSeedling.SetSeedling(lineData.Level); currentSignBoard.text = string.Format(SigbBoardFormat, currentHarvestCount); nextSeedling.SetSeedling(nextRank); nextSignBoard.text = string.Format(SigbBoardFormat, nextHarvestCount); @@ -122,6 +124,8 @@ public class CornFieldReinforcementDetailView : MonoBehaviour purchaseButton.gameObject.SetActive(true); releaseButton.gameObject.SetActive(false); var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); var machineList = fieldData.Where(data => data.Type == CornFieldUpgradeType.Machine).ToList(); var currentMachineData = machineList.FirstOrDefault(data => data.level == machineLevel); var nextMachineData = machineList.FirstOrDefault(data => data.level == machineLevel + 1); diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementView.cs index fdf96dc2..79295aa8 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementView.cs @@ -29,18 +29,20 @@ public class CornFieldReinforcementView : MonoBehaviour public IObservable ButtonClickObserve => dialogButton.OnClickAsObservable().Merge(dialogButton2.OnClickAsObservable()).TakeUntilDestroy(this); - public void SetReinforcement(PlantLineData data, int price) + public void SetReinforcement(PlantLineData lineData, int price) { reinforcementWindow.SetActive(true); releaseWindow.SetActive(false); maxWindow.SetActive(false); - var nextRank = CornFieldReinforcement.GetNextRank(data.Level); - var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(data.Type); + var nextRank = CornFieldReinforcement.GetNextRank(lineData.Level); + var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(lineData.Type); var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); - var currentHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)data.Level)?.harvested ?? 1; + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); + var currentHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)lineData.Level)?.harvested ?? 1; var nextHarvestCount = fieldData.FirstOrDefault(x => x.Type == upgradeType && x.level == (int)nextRank)?.harvested ?? 1; reinforcePriceText.text = price.ToString(); - currentSeedling.SetSeedling(data.Level); + currentSeedling.SetSeedling(lineData.Level); currentSignBoard.text = string.Format(SigbBoardFormat, currentHarvestCount); nextSeedling.SetSeedling(nextRank); nextSignBoard.text = string.Format(SigbBoardFormat, nextHarvestCount); diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/MachineUpgradeView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/MachineUpgradeView.cs index a3497b85..94b467f5 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/MachineUpgradeView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/MachineUpgradeView.cs @@ -24,6 +24,8 @@ public class MachineUpgradeView : MonoBehaviour { maxWindow.SetActive(false); var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); var machineList = fieldData.Where(data => data.Type == CornFieldUpgradeType.Machine).ToList(); var currentMachineData = machineList.FirstOrDefault(data => data.level == level); var nextMachineData = machineList.FirstOrDefault(data => data.level == level + 1); @@ -42,6 +44,8 @@ public class MachineUpgradeView : MonoBehaviour { maxWindow.SetActive(true); var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + var tmpFieldData = fieldData.Where(data => data.cityId == GameDataManager.GameData.CurrentCityId).ToList(); + fieldData = tmpFieldData.Count > 0 ? tmpFieldData : fieldData.Where(data => data.cityId == 0).ToList(); var machine = fieldData.First(x => x.Type == CornFieldUpgradeType.Machine && x.level == maxLevel); maxMachineImage.DestroyAllChildrens(); Instantiate(machine.GetIconPrefab(), maxMachineImage);