diff --git a/T3-Unity/Assets/Scenes/Map_Tests1.unity b/T3-Unity/Assets/Scenes/Map_Tests1.unity
index 2a33381fb2d6556c5f78fb63d3a36d355d7968b4..805bba549518524193377dc39ffb3687e5cfd8cb 100644
--- a/T3-Unity/Assets/Scenes/Map_Tests1.unity
+++ b/T3-Unity/Assets/Scenes/Map_Tests1.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 170076734}
- m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
+ m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1864,6 +1864,161 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 729711190}
m_CullTransparentMesh: 0
+--- !u!1 &755087651
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 755087652}
+ - component: {fileID: 755087654}
+ - component: {fileID: 755087653}
+ m_Layer: 5
+ m_Name: nbobstacle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &755087652
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 755087651}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2091460426}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -137.91, y: 326.39}
+ m_SizeDelta: {x: 237.37445, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &755087653
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 755087651}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: 'Obstacles restants :'
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 36
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 257
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_VertexBufferAutoSizeReduction: 1
+ m_firstVisibleCharacter: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: -238.23183, y: 0, z: 0, w: 0}
+ m_textInfo:
+ textComponent: {fileID: 755087653}
+ characterCount: 20
+ spriteCount: 0
+ spaceCount: 2
+ wordCount: 2
+ linkCount: 0
+ lineCount: 1
+ pageCount: 1
+ materialCount: 1
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_spriteAnimator: {fileID: 0}
+ m_hasFontAssetChanged: 0
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &755087654
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 755087651}
+ m_CullTransparentMesh: 0
--- !u!1 &758898508
GameObject:
m_ObjectHideFlags: 0
@@ -4498,6 +4653,7 @@ RectTransform:
- {fileID: 1821686626}
- {fileID: 1439040865}
- {fileID: 812185531}
+ - {fileID: 755087652}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4687,12 +4843,12 @@ PrefabInstance:
- target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -332
+ value: -330
objectReference: {fileID: 0}
- target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -76.949
+ value: -44.674
objectReference: {fileID: 0}
- target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a,
type: 3}
@@ -4821,12 +4977,12 @@ PrefabInstance:
- target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -104
+ value: -133
objectReference: {fileID: 0}
- target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -76.949
+ value: -45.3
objectReference: {fileID: 0}
- target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2,
type: 3}
@@ -4956,12 +5112,12 @@ PrefabInstance:
- target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -221
+ value: -232
objectReference: {fileID: 0}
- target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -76.949
+ value: -44.67401
objectReference: {fileID: 0}
- target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f,
type: 3}
diff --git a/T3-Unity/Assets/Scripts/Button UI.meta b/T3-Unity/Assets/Scripts/Button UI.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c8f76efdfd1162fb071ac42b41adbcec9f71be70
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/Button UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 607157bcd612982428eb831284c1bead
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/T3-Unity/Assets/Scripts/ChangeMin.cs b/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/ChangeMin.cs
rename to T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs
diff --git a/T3-Unity/Assets/Scripts/ChangeMin.cs.meta b/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/ChangeMin.cs.meta
rename to T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs.meta
diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs b/T3-Unity/Assets/Scripts/Button UI/ExitScene.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/ExitScene.cs
rename to T3-Unity/Assets/Scripts/Button UI/ExitScene.cs
diff --git a/T3-Unity/Assets/Scripts/ExitScene.cs.meta b/T3-Unity/Assets/Scripts/Button UI/ExitScene.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/ExitScene.cs.meta
rename to T3-Unity/Assets/Scripts/Button UI/ExitScene.cs.meta
diff --git a/T3-Unity/Assets/Scripts/MenuToggle.cs b/T3-Unity/Assets/Scripts/Button UI/MenuToggle.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/MenuToggle.cs
rename to T3-Unity/Assets/Scripts/Button UI/MenuToggle.cs
diff --git a/T3-Unity/Assets/Scripts/MenuToggle.cs.meta b/T3-Unity/Assets/Scripts/Button UI/MenuToggle.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/MenuToggle.cs.meta
rename to T3-Unity/Assets/Scripts/Button UI/MenuToggle.cs.meta
diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs b/T3-Unity/Assets/Scripts/Button UI/SceneChanger.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/SceneChanger.cs
rename to T3-Unity/Assets/Scripts/Button UI/SceneChanger.cs
diff --git a/T3-Unity/Assets/Scripts/SceneChanger.cs.meta b/T3-Unity/Assets/Scripts/Button UI/SceneChanger.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/SceneChanger.cs.meta
rename to T3-Unity/Assets/Scripts/Button UI/SceneChanger.cs.meta
diff --git a/T3-Unity/Assets/Scripts/changeplus.cs b/T3-Unity/Assets/Scripts/Button UI/changeplus.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/changeplus.cs
rename to T3-Unity/Assets/Scripts/Button UI/changeplus.cs
diff --git a/T3-Unity/Assets/Scripts/ChangePlus.cs.meta b/T3-Unity/Assets/Scripts/Button UI/changeplus.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/ChangePlus.cs.meta
rename to T3-Unity/Assets/Scripts/Button UI/changeplus.cs.meta
diff --git a/T3-Unity/Assets/Scripts/Obstacle.meta b/T3-Unity/Assets/Scripts/Obstacle.meta
new file mode 100644
index 0000000000000000000000000000000000000000..35a6ec1869db913aec6a2e4d08c142d481096d5c
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/Obstacle.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 52b8bf46189c1df4b8cf3ad8b5c919cb
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/T3-Unity/Assets/Scripts/DragDrop.cs b/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/DragDrop.cs
rename to T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs
diff --git a/T3-Unity/Assets/Scripts/DragDrop.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/DragDrop.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs.meta
diff --git a/T3-Unity/Assets/Scripts/midObj.cs b/T3-Unity/Assets/Scripts/Obstacle/midObj.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/midObj.cs
rename to T3-Unity/Assets/Scripts/Obstacle/midObj.cs
diff --git a/T3-Unity/Assets/Scripts/midObj.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/midObj.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/midObj.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/midObj.cs.meta
diff --git a/T3-Unity/Assets/Scripts/strongObj.cs b/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/strongObj.cs
rename to T3-Unity/Assets/Scripts/Obstacle/strongObj.cs
diff --git a/T3-Unity/Assets/Scripts/strongObj.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/strongObj.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/strongObj.cs.meta
diff --git a/T3-Unity/Assets/Scripts/weakObj.cs b/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/weakObj.cs
rename to T3-Unity/Assets/Scripts/Obstacle/weakObj.cs
diff --git a/T3-Unity/Assets/Scripts/weakObj.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/weakObj.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/weakObj.cs.meta
diff --git a/T3-Unity/Assets/Scripts/DiffScale.cs b/T3-Unity/Assets/Scripts/UI/DiffScale.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/DiffScale.cs
rename to T3-Unity/Assets/Scripts/UI/DiffScale.cs
diff --git a/T3-Unity/Assets/Scripts/DiffScale.cs.meta b/T3-Unity/Assets/Scripts/UI/DiffScale.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/DiffScale.cs.meta
rename to T3-Unity/Assets/Scripts/UI/DiffScale.cs.meta
diff --git a/T3-Unity/Assets/Scripts/MotivScale.cs b/T3-Unity/Assets/Scripts/UI/MotivScale.cs
similarity index 100%
rename from T3-Unity/Assets/Scripts/MotivScale.cs
rename to T3-Unity/Assets/Scripts/UI/MotivScale.cs
diff --git a/T3-Unity/Assets/Scripts/MotivScale.cs.meta b/T3-Unity/Assets/Scripts/UI/MotivScale.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/MotivScale.cs.meta
rename to T3-Unity/Assets/Scripts/UI/MotivScale.cs.meta
diff --git a/T3-Unity/Assets/Scripts/Ui.cs b/T3-Unity/Assets/Scripts/UI/Ui.cs
similarity index 80%
rename from T3-Unity/Assets/Scripts/Ui.cs
rename to T3-Unity/Assets/Scripts/UI/Ui.cs
index 36b5a6bc591af45218f3de14f79c090587129a80..d05a920b15fc7cea4c67dbb33087205f0948751a 100644
--- a/T3-Unity/Assets/Scripts/Ui.cs
+++ b/T3-Unity/Assets/Scripts/UI/Ui.cs
@@ -9,15 +9,13 @@ public class Ui : MonoBehaviour
public static float motiv;
public static float difficulty;
public static int fame;
+ public static int nbObst;
public static bool stop = false;
public static int rep;
public static bool start = false;
public GameObject prefab;
public Canvas parent;
- private void Start()
- {
- // Instantiate(prefab, prefab.transform, parent);
- }
+
}
diff --git a/T3-Unity/Assets/Scripts/Ui.cs.meta b/T3-Unity/Assets/Scripts/UI/Ui.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/Ui.cs.meta
rename to T3-Unity/Assets/Scripts/UI/Ui.cs.meta
diff --git a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0a81fb777d02df84d2a0d5c1261079a2fbff052e
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class nbObstacle : MonoBehaviour
+{
+
+ public static void decreaseObstacle()
+ {
+ Ui.nbObst = Ui.nbObst - 1;
+ }
+
+ public void changeObs(string word)
+ {
+ textshowed.text
+ }
+}
diff --git a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs.meta b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f30c3ebe3cb4de87c12c145565d21ba2a7cb10a8
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a8ba3639b91827141a24a34f7fc23a8a
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: