From 125379a0f70d039585aaaa55bb4e0e42959c2d71 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 1 Jul 2021 10:28:54 +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 --- popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity | 4 +++- .../MyGame/Scenes/Cooking/Scripts/ThermalControl.cs | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 7c95d502..e80d54e8 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -2682,7 +2682,9 @@ MonoBehaviour: panController: {fileID: 402129742} thermoMeter: {fileID: 1928679192} speed: 0.1 - panFactor: 0.05 + panFactor: 0.01 + deadZone: 0.1 + maxPanMagnitude: 2 --- !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 75a18f88..f7254615 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -5,8 +5,10 @@ public class ThermalControl : MonoBehaviour { [SerializeField] private PanController panController; [SerializeField] private ThermoMeter thermoMeter; - [SerializeField] private float speed = 1f; - [SerializeField] private float panFactor = .1f; + [SerializeField] private float speed = .1f; + [SerializeField] private float panFactor = .01f; + [SerializeField] private float deadZone = .1f; + [SerializeField] private float maxPanMagnitude = 2f; private float temperature; private void Start() @@ -15,9 +17,10 @@ public class ThermalControl : MonoBehaviour private void Update() { - if (panController.Delta != Vector2.zero) + var panMagnitude = panController.Delta.magnitude; + if (panMagnitude >= deadZone) { - temperature -= panController.Delta.magnitude * panFactor; + temperature -= Mathf.Min(panMagnitude, maxPanMagnitude) * panFactor; } else {