Merge branch 'main' into 'main'

Resolution erreur duplication See merge request !70

Merge branch 'main' into 'main'
Resolution erreur duplication See merge request !70
def2126c · LE-CUDENEC JOFFREY · 97ba4a58 · 1aa4a82d · def2126c
Commit def2126c authored 3 years ago by LE-CUDENEC JOFFREY
--- a/T3-Unity/Assets/Scripts/UI/Ui.cs
+++ b/T3-Unity/Assets/Scripts/UI/Ui.cs
@@ -15,8 +15,6 @@ public class Ui : MonoBehaviour

    public static int fame;
    public static int nbObst;
-    public static bool stop = false;
-    public static bool start = false;
    public GameObject prefab;
    public Canvas parent;
 }