Some conflicts resolved

Assets/Scripts/flappy_bird - přejmenovat/flappy bird.cs

@@ -2,7 +2,10 @@ using System;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using TMPro;
+<<<<<<< HEAD
 using GeoSus.Client;
+=======
+>>>>>>> origin/main
 
 public class FlappyBirdAllInOne : MonoBehaviour, ITask
 {
@@ -36,6 +39,7 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     public string TaskID { get; set; }
     public TaskType TaskType { get; set; }
     public string TaskName { get; set; }
+<<<<<<< HEAD
     public Position TaskLocation { get; set; }
     public bool IsCompleted { get; private set; }
 
@@ -45,11 +49,27 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
         Time.timeScale = 1f;
         score = 0;
         UpdateScore();
+=======
+    public (double, double) TaskLocation { get; set; }
+    public bool IsCompleted { get; private set; }
+
+    private bool _isPaused = false;
+
+    void Start()
+    {
+        _isPaused = false;
+        score = 0;
+        if (scoreText != null) UpdateScore();
+>>>>>>> origin/main
     }
 
     void Update()
     {
+<<<<<<< HEAD
         if (isDead) return;
+=======
+        if (isDead || _isPaused) return;
+>>>>>>> origin/main
 
         HandleInput();
         HandleSpawning();
@@ -100,6 +120,13 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     {
         score++;
         UpdateScore();
+<<<<<<< HEAD
+=======
+        if (score >= 10)
+        {
+            Complete();
+        }
+>>>>>>> origin/main
     }
 
     void UpdateScore()
@@ -111,14 +138,26 @@ public class FlappyBirdAllInOne : MonoBehaviour, ITask
     public void GameOver()
     {
         isDead = true;
+<<<<<<< HEAD
         gameOverPanel.SetActive(true);
         Time.timeScale = 0f;
+=======
+        _isPaused = true;
+        if (gameOverPanel != null) gameOverPanel.SetActive(true);
+        // NOTE: do NOT set Time.timeScale — GPS and network must keep running
+>>>>>>> origin/main
     }
 
     public void Restart()
     {
+<<<<<<< HEAD
         Time.timeScale = 1f;
         SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+=======
+        // TaskManager will unload and reload via additive loading
+        // Calling ExitTask lets TaskManager handle scene lifecycle
+        ExitTask(_onExit);
+>>>>>>> origin/main
     }