diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanController.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanController.cs index 5c115829..746a4b61 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanController.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PanController.cs @@ -18,13 +18,17 @@ public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler private Vector2 delta; public Vector2 Delta => delta; - // Start is called before the first frame update - void Start() + void Awake() { firstPos = target.position; prevPos = firstPos; } + private void OnDisable() + { + delta = Vector2.zero; + } + // Update is called once per frame void Update() { @@ -58,4 +62,9 @@ public class PanController : MonoBehaviour, IDragHandler, IBeginDragHandler offset = targetPos - Camera.main.ScreenToWorldPoint(new Vector3(eventData.position.x, eventData.position.y, targetPos.z)); } + + public void ResetTargetPosition() + { + target.position = firstPos; + } } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs index 031e5812..d2d779fa 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/ThermalControl.cs @@ -93,15 +93,18 @@ public class ThermalControl : MonoBehaviour temperature = 0f; temperatureSpeed = 0f; thermoMeter.SetScale(coldValue, hotValue); + panController.ResetTargetPosition(); } public void StartMeter() { isMove = true; + panController.enabled = true; } public void StopMeter() { isMove = false; + panController.enabled = false; } }