Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
T3-Unity/Assets/Scenes/Map_Tests1.unity
View file @ b40b9c5d
...@@ -1459,18 +1459,18 @@ MonoBehaviour: ...@@ -1459,18 +1459,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 37fbb0aa1ad2c2442ad9509b246ad3fd, type: 3} m_Script: {fileID: 11500000, guid: 37fbb0aa1ad2c2442ad9509b246ad3fd, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
spawnedObjects: []
parent: {fileID: 1041475211}
_map: {fileID: 703254553} _map: {fileID: 703254553}
_locations: [] _locations: []
_spawnScale: 1 _spawnScale: 1
_spawnScaleStartEnd: 6 _spawnScaleStartEnd: 6
_markerPrefab: {fileID: 901362092215755285, guid: 18761a72aa6233c4bb4bd29dd401981e, _markerPrefab: {fileID: 901362092215755285, guid: 18761a72aa6233c4bb4bd29dd401981e,
type: 3} type: 3}
_prefabDebut: {fileID: 2042676738254883600, guid: adcf133badada334581b9bd798be23cd, _startPrefab: {fileID: 2042676738254883600, guid: adcf133badada334581b9bd798be23cd,
type: 3} type: 3}
_prefabFin: {fileID: 5106668611982552037, guid: 6a798f905f6b7dd4ea45b512de8e4537, _endPrefab: {fileID: 5106668611982552037, guid: 6a798f905f6b7dd4ea45b512de8e4537,
type: 3} type: 3}
_spawnedObjects: []
parent: {fileID: 1041475211}
--- !u!1 &729711190 --- !u!1 &729711190
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2478,7 +2478,6 @@ MonoBehaviour: ...@@ -2478,7 +2478,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 46bc6c53f411bc84882c76fe1694830a, type: 3} m_Script: {fileID: 11500000, guid: 46bc6c53f411bc84882c76fe1694830a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_prefab: {fileID: 901362092215755284, guid: 18761a72aa6233c4bb4bd29dd401981e, type: 3}
_prefabs_parent: {fileID: 1041475211} _prefabs_parent: {fileID: 1041475211}
--- !u!4 &1041475211 --- !u!4 &1041475211
Transform: Transform:
...@@ -3003,6 +3002,7 @@ MonoBehaviour: ...@@ -3003,6 +3002,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5bb377307b2f3c4fa798dd192a7c84b, type: 3} m_Script: {fileID: 11500000, guid: e5bb377307b2f3c4fa798dd192a7c84b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
textshowed: {fileID: 0}
--- !u!114 &1427144199 --- !u!114 &1427144199
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
T3-Unity/Assets/Scripts/UI/DiffScale.cs
View file @ b40b9c5d
...@@ -11,6 +11,8 @@ public class DiffScale : MonoBehaviour ...@@ -11,6 +11,8 @@ public class DiffScale : MonoBehaviour
void Start() void Start()
{ {
Ui.motiv = 5f; Ui.motiv = 5f;
Ui.difficulty = 0f;
Ui.nbObst = 5;
} }
// Update is called once per frame // Update is called once per frame
......
T3-Unity/Assets/Scripts/Waypoints/WaypointsFactory.cs
View file @ b40b9c5d
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
{ {
return instance; return instance;
} }
/*
//! @brief Retourne si les waypoints ont fini d'être crée //! @brief Retourne si les waypoints ont fini d'être crée
//! @details Retourne si les waypoints ont fini d'être crée //! @details Retourne si les waypoints ont fini d'être crée
public bool getTest() public bool getTest()
{ {
return test; return test;
} }*/
//! @brief Retourne les coordonnées des waypoints //! @brief Retourne les coordonnées des waypoints
......