From 8f4d28f77d19e718aaf0828734ecd59fc4ff2ee0 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 3 Dec 2021 17:02:35 +0900 Subject: [PATCH] =?UTF-8?q?=E7=95=91=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=83=AB=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 | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index 1d420c31..52993e3a 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -67,10 +67,10 @@ public class CornField : MonoBehaviour // データ var gameData = GameDataManager.GameData; - if (gameData.isFirstPlay) + if (!gameData.FinishedFlags.HasFlag(TutorialFlag.CornField)) { promoteGrowthButton.gameObject.SetActive(false); - TutorialManager.Instance.ShowTutorialConversation(3, () => + TutorialManager.Instance.ShowTutorialConversation(5, () => { // コーンスワイプ指示 cornFieldMask.gameObject.SetActive(true); @@ -316,7 +316,7 @@ public class CornField : MonoBehaviour }); } - if (gameData.isFirstPlay) + if (!gameData.FinishedFlags.HasFlag(TutorialFlag.CornField)) { // 既に収穫できる状態にする var plantLine = gameData.SeedlingDataList.First(data => data.type == PlantLineType.Center); @@ -335,14 +335,10 @@ public class CornField : MonoBehaviour this.CallWaitForSeconds(4f, () => { cornFieldMask.gameObject.SetActive(false); - TutorialManager.Instance.ShowTutorialConversation(4, () => + TutorialManager.Instance.ShowTutorialConversation(6, () => { - // gameData.SeedlingDataList.Clear(); - var go = FindObjectOfType().transform; - go.transform.FindChildByName("Button_Purchasing", t => - { - TutorialManager.Instance.ShowTutorialMask(go.parent, t as RectTransform, true); - }); + gameData.FinishedFlags |= TutorialFlag.CornField; + GameDataManager.SaveGameData(); }); }); }).AddTo(compositeDisposable); @@ -426,7 +422,7 @@ public class CornField : MonoBehaviour } #endif // チュートリアル時新しい苗を隠す - if (gameData.isFirstPlay) + if (!gameData.FinishedFlags.HasFlag(TutorialFlag.CornField)) { seedling.SetSeedlingGene(DateTime.MaxValue, Int32.MaxValue, newGene.Level); }