From 2a5d3dd8c6ceac7f5699edc76d6e3bda1483cb4a Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 28 Sep 2022 14:57:37 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=90=E3=82=A4=E3=83=88=E8=A9=B3=E7=B4=B0?= =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=ABMax=E8=A1=A8=E7=A4=BA=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity | 5 +++-- .../Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity index c0d6203b..cfbd3569 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity @@ -3664,6 +3664,7 @@ MonoBehaviour: tipsText: {fileID: 907682419} levelUpButton: {fileID: 45079309} disableButton: {fileID: 1961680769} + maxLevelFillObject: {fileID: 1973412669} --- !u!1 &1676914697 GameObject: m_ObjectHideFlags: 0 @@ -4665,7 +4666,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1973412670 RectTransform: m_ObjectHideFlags: 0 @@ -4682,7 +4683,7 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 42} m_Pivot: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs index c3e6ac02..8af3e03f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs @@ -27,6 +27,7 @@ namespace MyGame.Scenes.Main.Scripts [SerializeField] private Text tipsText; [SerializeField] private Button levelUpButton; [SerializeField] private GameObject disableButton; + [SerializeField] private GameObject maxLevelFillObject; private bool buttonActive; @@ -46,6 +47,7 @@ namespace MyGame.Scenes.Main.Scripts }); }).AddTo(this); + maxLevelFillObject.SetActive(false); cityIconTarget.DestroyAllChildrens(); Instantiate(cityData.GetIconPrefab(), cityIconTarget); cityNameText.text = cityData.Name; @@ -64,7 +66,7 @@ namespace MyGame.Scenes.Main.Scripts { // レベルアップを挟むと報酬がプレイヤーに有利になる件 CoinManager.Instance.SubCoin(nextData.needAmount); - cityGameData.Coin += CoinManager.Instance.OwnCoin; + cityGameData.Coin = CoinManager.Instance.OwnCoin; cityGameData.PartTimerLevel = nextData.level; GameDataManager.SaveGameData(); levelText.text = $"Lv.{cityGameData.PartTimerLevel}"; @@ -83,7 +85,11 @@ namespace MyGame.Scenes.Main.Scripts private void SetMaxLevel() { + maxLevelFillObject.SetActive(true); + tipsText.text = "最大レベルに達しました"; + heartMaxObject.SetActive(true); SetButtonActive(false); + amountText.text = "--"; } private void SetPartTimerData(CityData cityData, PartTimerData nextPartTimerData)