diff --git a/Assets/EpreuveCondition.cs b/Assets/EpreuveCondition.cs index 0a401bbead3b3f44268887c69a6a1a26cfc09d26..1f77f807bad07c96496aef9c4f6ddbdfc9db1882 100644 --- a/Assets/EpreuveCondition.cs +++ b/Assets/EpreuveCondition.cs @@ -10,14 +10,13 @@ class EpreuveCondition public DateTime end; public ChargementJSONStructure test; - public EpreuveCondition(Epreuve ep, ChargementJSONStructure jsonStructureScript) + public EpreuveCondition(Epreuve ep) { text_condition = ep.condition; start = ep.debut; end = ep.fin; Debug.Log("instance début" + start); Debug.Log("instance fin" + end); - test = jsonStructureScript; } public bool eval() diff --git a/Assets/mainManager.cs b/Assets/mainManager.cs index 4c9c183904681817ab7926e04380f7d7ec9598b0..458f59ecc4ae96e8ef78538241032a6e4374e69f 100644 --- a/Assets/mainManager.cs +++ b/Assets/mainManager.cs @@ -374,7 +374,7 @@ public class mainManager : MonoBehaviour return shuffled; } - public void nextEpreuve(bool addOne) + public void nextEpreuve() { Debug.Log("nextEpreuve"); // on regarde s'il y a une autre epreuve dans la m�me session � lancer @@ -405,7 +405,7 @@ public class mainManager : MonoBehaviour public bool playableEpreuve(Epreuve test_ep) { - EpreuveCondition cond = new EpreuveCondition(test_ep, jsonStructureScript); + EpreuveCondition cond = new EpreuveCondition(test_ep); return cond.eval(); }