diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs index 04ededdd..35af0fa8 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedling.cs @@ -51,13 +51,18 @@ public class CornSeedling : MonoBehaviour, IPointerEnterHandler { completed = false; compositeDisposable.Clear(); - UpdateStage(); beginTime = dateTime; period = periodTime; // resume対応 + UpdateStage(); + var currentStage = GetCurrentStage(); // 苗の状態復元 - seedlingView.SetView(rank, GetCurrentStage()); + seedlingView.SetView(rank, currentStage); + if (currentStage == SeedlingStage.Stage4) + { + completed = true; + } // 成長進捗度更新 Observable.Interval(TimeSpan.FromSeconds(1f)) diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingStageView.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingStageView.cs index d1b51ec0..1eaf6ec7 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingStageView.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornSeedlingStageView.cs @@ -32,7 +32,7 @@ public class CornSeedlingStageView : MonoBehaviour break; case SeedlingStage.Stage2: seedlingStage1.SetTrigger(Save); - this.CallWaitForSeconds(.25f, () => + this.CallWaitForSeconds(1f, () => { SetView(stage); seedlingStage2.SetTrigger(Grow); @@ -40,15 +40,15 @@ public class CornSeedlingStageView : MonoBehaviour break; case SeedlingStage.Stage3: seedlingStage2.SetTrigger(Save); - this.CallWaitForSeconds(.25f, () => + this.CallWaitForSeconds(1f, () => { SetView(stage); - seedlingStage4.SetTrigger(Grow); + seedlingStage3.SetTrigger(Grow); }); break; case SeedlingStage.Stage4: seedlingStage3.SetTrigger(Save); - this.CallWaitForSeconds(.25f, () => + this.CallWaitForSeconds(1f, () => { SetView(stage); seedlingStage4.SetTrigger(Grow);