From ffa8793b95c440548aacda60d73d6930fb786fb4 Mon Sep 17 00:00:00 2001 From: Joffrey LE CUDENEC <joffrey.le-cudenec@etu.unistra.fr> Date: Fri, 17 Dec 2021 02:24:24 +0100 Subject: [PATCH] Modification --- T3-Unity/Assets/Scenes/Map_Tests1.unity | 10 +++++----- T3-Unity/Assets/Scripts/UI/DiffScale.cs | 2 ++ T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/T3-Unity/Assets/Scenes/Map_Tests1.unity b/T3-Unity/Assets/Scenes/Map_Tests1.unity index a3f1a4e..4c2e0d7 100644 --- a/T3-Unity/Assets/Scenes/Map_Tests1.unity +++ b/T3-Unity/Assets/Scenes/Map_Tests1.unity @@ -1459,18 +1459,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 37fbb0aa1ad2c2442ad9509b246ad3fd, type: 3} m_Name: m_EditorClassIdentifier: + spawnedObjects: [] + parent: {fileID: 1041475211} _map: {fileID: 703254553} _locations: [] _spawnScale: 1 _spawnScaleStartEnd: 6 _markerPrefab: {fileID: 901362092215755285, guid: 18761a72aa6233c4bb4bd29dd401981e, type: 3} - _prefabDebut: {fileID: 2042676738254883600, guid: adcf133badada334581b9bd798be23cd, + _startPrefab: {fileID: 2042676738254883600, guid: adcf133badada334581b9bd798be23cd, type: 3} - _prefabFin: {fileID: 5106668611982552037, guid: 6a798f905f6b7dd4ea45b512de8e4537, + _endPrefab: {fileID: 5106668611982552037, guid: 6a798f905f6b7dd4ea45b512de8e4537, type: 3} - _spawnedObjects: [] - parent: {fileID: 1041475211} --- !u!1 &729711190 GameObject: m_ObjectHideFlags: 0 @@ -2478,7 +2478,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 46bc6c53f411bc84882c76fe1694830a, type: 3} m_Name: m_EditorClassIdentifier: - _prefab: {fileID: 901362092215755284, guid: 18761a72aa6233c4bb4bd29dd401981e, type: 3} _prefabs_parent: {fileID: 1041475211} --- !u!4 &1041475211 Transform: @@ -3003,6 +3002,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e5bb377307b2f3c4fa798dd192a7c84b, type: 3} m_Name: m_EditorClassIdentifier: + textshowed: {fileID: 0} --- !u!114 &1427144199 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/T3-Unity/Assets/Scripts/UI/DiffScale.cs b/T3-Unity/Assets/Scripts/UI/DiffScale.cs index 3848ef0..8d451cf 100644 --- a/T3-Unity/Assets/Scripts/UI/DiffScale.cs +++ b/T3-Unity/Assets/Scripts/UI/DiffScale.cs @@ -11,6 +11,8 @@ public class DiffScale : MonoBehaviour void Start() { Ui.motiv = 5f; + Ui.difficulty = 0f; + Ui.nbObst = 5; } // Update is called once per frame diff --git a/T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs b/T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs index c667697..5e1b3db 100644 --- a/T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs +++ b/T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs @@ -57,13 +57,13 @@ { return instance; } - + /* //! @brief Retourne si les waypoints ont fini d'être crée //! @details Retourne si les waypoints ont fini d'être crée public bool getTest() { return test; - } + }*/ //! @brief Retourne les coordonnées des waypoints -- GitLab