rc

2026-08-20 19:45:38 +05:30
parent 74d9fae6e6
commit 78592e8d8e
87 changed files with 13154 additions and 223 deletions
@@ -154,6 +154,7 @@ public class Puck : NetworkBehaviour
    bool holdingCollisionLock;
    public void Reset(Vector3? position = null, float duration = 0.5f)
    {
+        UnscheduleReset();
        Vector3 pos = position ?? startPosition;
        if (coroutineReset != null)
        {
@@ -175,20 +176,38 @@ public class Puck : NetworkBehaviour
    }
    Coroutine coroutineScheduleReset;
    public void ScheduleReset(Vector3 position, float duration = 0.5f){
+        UnscheduleReset();
        coroutineScheduleReset = StartCoroutine(CoroutineScheduleReset(position, duration));
    }

    public void UnscheduleReset(){
        if(coroutineScheduleReset != null){
            StopCoroutine(coroutineScheduleReset);
+            coroutineScheduleReset = null;
+        }
+    }
+
+    public void CancelInGoalReset()
+    {
+        UnscheduleReset();
+        if (coroutineReset != null)
+        {
+            StopCoroutine(coroutineReset);
+            RestoreAfterReset();
        }
    }

    IEnumerator CoroutineScheduleReset(Vector3 position, float duration){
        while(GameManager.isMoving){
+            if (GameManager.instance != null && !GameManager.instance.CanProcessGoal)
+                yield break;
            yield return null;
        }

+        if (GameManager.instance != null && !GameManager.instance.CanProcessGoal)
+            yield break;
+
+        coroutineScheduleReset = null;
        Debug.Log("Resetting puck", gameObject);
        Vector3 dir = position - transform.position;
        Vector3 centerDir = Vector3.zero - transform.position;