From f731f5794fd41d0f4f1a10c16ace1ab236945023 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Thu, 1 Jul 2021 11:39:14 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyGame/Scenes/Cooking/Cooking.unity       | 10 ++++----
 .../Scenes/Cooking/Scripts/ThermalControl.cs  | 23 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
index e80d54e8..4ad3f8e1 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
@@ -2681,10 +2681,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   panController: {fileID: 402129742}
   thermoMeter: {fileID: 1928679192}
-  speed: 0.1
-  panFactor: 0.01
-  deadZone: 0.1
-  maxPanMagnitude: 2
+  temperature: 0
+  panSpeed: 0
+  panFactor: 0.5
+  deadZone: 0.08
+  baseIncreaseSpeed: 0.06
+  maxDecreaseSpeed: 0.09
 --- !u!1001 &1883189159
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs
index f7254615..23a61215 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs
@@ -5,26 +5,31 @@ public class ThermalControl : MonoBehaviour
 {
     [SerializeField] private PanController panController;
     [SerializeField] private ThermoMeter thermoMeter;
-    [SerializeField] private float speed = .1f;
-    [SerializeField] private float panFactor = .01f;
+    [Space]
+    [SerializeField, ReadOnly] private float temperature;
+    [SerializeField, ReadOnly] private float panSpeed;
+    [Space]
+    [Header("フライパン感度/デッドゾーン")]
+    [SerializeField] private float panFactor = .5f;
     [SerializeField] private float deadZone = .1f;
-    [SerializeField] private float maxPanMagnitude = 2f;
-    private float temperature;
+    [Header("熱くなるスピード/冷えるスピードの最大値")]
+    [SerializeField] private float baseIncreaseSpeed = .03f;
+    [SerializeField] private float maxDecreaseSpeed = .03f;
 
     private void Start()
     {
     }
 
     private void Update()
-    {
-        var panMagnitude = panController.Delta.magnitude;
-        if (panMagnitude >= deadZone)
+    { 
+        panSpeed = panController.Delta.magnitude * panFactor;
+        if (panSpeed > deadZone)
         {
-            temperature -= Mathf.Min(panMagnitude, maxPanMagnitude) * panFactor;
+            temperature -= Mathf.Min(panSpeed, maxDecreaseSpeed) * Time.deltaTime;
         }
         else
         {
-            temperature += Time.deltaTime * speed;
+            temperature += baseIncreaseSpeed * Time.deltaTime;
         }
         temperature = Mathf.Clamp01(temperature);
         thermoMeter.SetValue(temperature);