リファクタリング

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs

@@ -33,15 +33,12 @@ public class ThermalControl : MonoBehaviour
     
     private float duration = 0.3f;
 
+    private readonly ReactiveProperty<ThermalCondition> condition = new ReactiveProperty<ThermalCondition>(ThermalCondition.Cold); 
     public IReadOnlyReactiveProperty<ThermalCondition> Condition => condition;
-    private ReactiveProperty<ThermalCondition> condition; 
 
-    public void Initialize()
+    private void Start()
     {
-        temperature = 0f;
-        condition = new ReactiveProperty<ThermalCondition>(ThermalCondition.Cold);
-        thermoMeter.SetScale(coldValue, hotValue);
-        
+        condition.AddTo(this);
         condition.DistinctUntilChanged().Subscribe(x =>
         {
             Debug.Log($"cond :{x} temp: {temperature}");
@@ -71,7 +68,7 @@ public class ThermalControl : MonoBehaviour
         condition.Value = GetCondition();
     }
 
-    public ThermalCondition GetCondition()
+    private ThermalCondition GetCondition()
     {
         if (temperature <= coldValue)
         {
@@ -83,4 +80,11 @@ public class ThermalControl : MonoBehaviour
         }
         return ThermalCondition.Yellow;
     }
+
+    public void ResetMeter()
+    {
+        temperature = 0f;
+        temperatureSpeed = 0f;
+        thermoMeter.SetScale(coldValue, hotValue);
+    }
 }

popcorn/Assets/PopcornGameManager.cs

@@ -25,30 +25,29 @@ public class PopcornGameManager : MonoBehaviour
         gameResultText.text = "";
         // startingGuide.SetActive(true);
         isProgress = false;
-        cornManager.Initialize();
-        thermalControl.Initialize();
         
-        thermalControl.Condition.DistinctUntilChanged().Subscribe(x =>
+        thermalControl.Condition.Subscribe(x =>
         {
             cornManager.ChangeGrowSpeed(x);
         }).AddTo(this);
         
-        GameReset();
+        ResetGame();
 
         // タップ後スタート
-        GameStart();
+        StartGame();
     }
 
     private void Update()
     {
     }
 
-    private void GameReset()
+    private void ResetGame()
     {
-        cornManager.GenerateCorn();
+        thermalControl.ResetMeter();
+        cornManager.RespawnCorn();
     }
 
-    private void GameStart()
+    private void StartGame()
     {
     }
 }