diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 1f2d2ff4..57930ce0 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -769,13 +769,19 @@ MonoBehaviour: closeButton: {fileID: 1130921226} reinforceObject: {fileID: 1937871401} releaseObject: {fileID: 944967792} + machineObject: {fileID: 225302517} currentSeedling: {fileID: 3910593343511446857} nextSeedling: {fileID: 1480555406} currentSignBoard: {fileID: 3910593343511446856} nextSignBoard: {fileID: 1480555405} - messageText: {fileID: 1977897798} reinforcePriceText: {fileID: 1565131239} releasePriceText: {fileID: 1133773169} + currentMachineImage: {fileID: 1402887489} + nextMachineImage: {fileID: 1766466140} + currentHarvestedText: {fileID: 1402887488} + nextHarvestedText: {fileID: 1766466139} + machinePriceText: {fileID: 457453804} + messageText: {fileID: 1977897798} --- !u!4 &791576059 Transform: m_ObjectHideFlags: 0 @@ -1939,6 +1945,24 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1402887486} m_PrefabAsset: {fileID: 0} +--- !u!114 &1402887488 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 1402887486} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1402887489 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 1402887486} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1480555403 PrefabInstance: m_ObjectHideFlags: 0 @@ -2581,6 +2605,24 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1766466137} m_PrefabAsset: {fileID: 0} +--- !u!114 &1766466139 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6731104945823381073, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 1766466137} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1766466140 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8700982206849067008, guid: a03eacc36379f7a4b9c976a5aaa17ee2, + type: 3} + m_PrefabInstance: {fileID: 1766466137} + m_PrefabAsset: {fileID: 0} --- !u!1 &1929329150 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs index bb925451..26bc3417 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornFieldReinforcementDetailView.cs @@ -7,6 +7,7 @@ using UnityEngine.UI; public class CornFieldReinforcementDetailView : MonoBehaviour { + private static readonly string harvestedTextFormat = "{0}"; private static readonly string ReinforceFormat = "強化しますか?"; private static readonly string ReleaseFormat = "開放しますか?"; private static readonly string SigbBoardFormat = "x{0}"; @@ -19,13 +20,19 @@ public class CornFieldReinforcementDetailView : MonoBehaviour [SerializeField] private Button closeButton; [SerializeField] private GameObject reinforceObject; [SerializeField] private GameObject releaseObject; + [SerializeField] private GameObject machineObject; [SerializeField] private ReinforcementSeedlingView currentSeedling; [SerializeField] private ReinforcementSeedlingView nextSeedling; [SerializeField] private TextMeshProUGUI currentSignBoard; [SerializeField] private TextMeshProUGUI nextSignBoard; - [SerializeField] private Text messageText; [SerializeField] private Text reinforcePriceText; [SerializeField] private Text releasePriceText; + [SerializeField] private Transform currentMachineImage; + [SerializeField] private Transform nextMachineImage; + [SerializeField] private Text currentHarvestedText; + [SerializeField] private Text nextHarvestedText; + [SerializeField] private Text machinePriceText; + [SerializeField] private Text messageText; private void Start() { @@ -78,6 +85,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { reinforceObject.SetActive(false); releaseObject.SetActive(true); + machineObject.SetActive(false); purchaseButton.gameObject.SetActive(false); releaseButton.gameObject.SetActive(true); releasePriceText.text = price.ToString(); @@ -89,6 +97,7 @@ public class CornFieldReinforcementDetailView : MonoBehaviour releaseObject.SetActive(false); purchaseButton.gameObject.SetActive(true); releaseButton.gameObject.SetActive(false); + machineObject.SetActive(false); reinforcePriceText.text = price.ToString(); var nextRank = CornFieldReinforcement.GetNextRank(data.Level); var upgradeType = FieldUpgradeData.PlantTypeToUpgradeType(data.Type); @@ -106,7 +115,22 @@ public class CornFieldReinforcementDetailView : MonoBehaviour { reinforceObject.SetActive(false); releaseObject.SetActive(false); + machineObject.SetActive(true); purchaseButton.gameObject.SetActive(true); releaseButton.gameObject.SetActive(false); + var fieldData = SpreadsheetDataManager.Instance.GetBaseDataList(Const.FieldUpgradeDataSheet); + 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); + var currentHarvestedCorn = currentMachineData?.harvested ?? 20; + var nextHarvestedCorn = nextMachineData?.harvested ?? 20; + currentMachineImage.DestroyAllChildrens(); + nextMachineImage.DestroyAllChildrens(); + Instantiate(currentMachineData.GetIconPrefab(), currentMachineImage); + Instantiate(nextMachineData.GetIconPrefab(), nextMachineImage); + currentHarvestedText.text = string.Format(harvestedTextFormat, currentHarvestedCorn.ToString()); + nextHarvestedText.text = string.Format(harvestedTextFormat, nextHarvestedCorn.ToString()); + machinePriceText.text = price.ToString(); + messageText.text = ReinforceFormat; } }