diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs index 62a30567..68db7048 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs @@ -36,6 +36,7 @@ public class Corn : MonoBehaviour private float cornGrowSpeed; private float cornSpillSpeed; private float cornPopSpeed; + private bool isHot; public IReadOnlyReactiveProperty Condition => condition; private readonly ReactiveProperty condition = new ReactiveProperty(CornCondition.Seed); @@ -118,14 +119,22 @@ public class Corn : MonoBehaviour private void Update() { + if (condition.Value == CornCondition.Burnt) return; cornGrowTime += Time.deltaTime * cornGrowSpeed; if (cornGrowTime >= cornBurntTime) { condition.Value = CornCondition.Burnt; } - else if (cornGrowTime >= cornPopTime) + if (cornGrowTime >= cornPopTime && condition.Value == CornCondition.Seed) { - condition.Value = CornCondition.Simple; + if (isHot) + { + condition.Value = CornCondition.Burnt; + } + else + { + condition.Value = CornCondition.Simple; + } } } @@ -157,4 +166,9 @@ public class Corn : MonoBehaviour { cornGrowSpeed = speed; } + + public void ChangeHotStatus(bool status) + { + isHot = status; + } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs index ccba4c90..3bdf4a0e 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs @@ -117,6 +117,7 @@ public class CornManager : MonoBehaviour public void RespawnCorn() { cornGrowSpeed.Value = 0f; + isHot = false; missCount.Value = 0; isCompleted = false; compositeDisposable.Clear(); @@ -146,6 +147,7 @@ public class CornManager : MonoBehaviour return; } corn.ChangeGrowSpeed(x); + corn.ChangeHotStatus(isHot); }).AddTo(compositeDisposable);