Fixed the touch feedback staying in place when the player touches the…

… "auto play" toggle in practice mode.
fhalfkg · Jul 2, 2021 · 9996793 · 9996793
1 parent 82f4f93
commit 9996793
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/TECHMANIA/Assets/Scripts/Components/Game Scene/Game.cs b/TECHMANIA/Assets/Scripts/Components/Game Scene/Game.cs
@@ -1773,6 +1773,11 @@ private void OnFingerDown(int finger, Vector2 screenPosition)
 
     private void OnFingerMove(int finger, Vector2 screenPosition)
     {
+        if (!fingerInLane.ContainsKey(finger))
+        {
+            OnFingerDown(finger, screenPosition);
+            return;
+        }
         List<RaycastResult> results = Raycast(screenPosition);
         int lane = RaycastResultToLane(results);
         if (fingerInLane[finger] != lane)

diff --git a/TECHMANIA/Assets/Scripts/Components/Game Scene/TouchClickFeedbackManager.cs b/TECHMANIA/Assets/Scripts/Components/Game Scene/TouchClickFeedbackManager.cs
@@ -19,7 +19,14 @@ void Start()
     // Update is called once per frame
     void Update()
     {
-        if (Game.autoPlay) return;
+        if (Game.autoPlay)
+        {
+            if (fingerToFeedback.Count > 0)
+            {
+                DestroyAllFeedback();
+            }
+            return;
+        }
         switch (GameSetup.pattern.patternMetadata.controlScheme)
         {
             case ControlScheme.Touch:
@@ -92,17 +99,33 @@ private void SpawnFeedback(int fingerId, Vector2 position)
 
     private void MoveFeedback(int fingerId, Vector2 position)
     {
+        if (!fingerToFeedback.ContainsKey(fingerId))
+        {
+            SpawnFeedback(fingerId, position);
+            return;
+        }
         fingerToFeedback[fingerId].GetComponent<RectTransform>()
             .anchoredPosition =
             TouchPositionToAnchoredPosition(position);
     }
 
     private void DestroyFeedback(int fingerId)
     {
+        if (!fingerToFeedback.ContainsKey(fingerId)) return;
         Destroy(fingerToFeedback[fingerId]);
         fingerToFeedback.Remove(fingerId);
     }
 
+    private void DestroyAllFeedback()
+    {
+        if (fingerToFeedback == null) return;
+        foreach (GameObject o in fingerToFeedback.Values)
+        {
+            Destroy(o);
+        }
+        fingerToFeedback.Clear();
+    }
+
     private void OnDisable()
     {
         foreach (GameObject o in fingerToFeedback.Values)