diff --git a/T3-Unity/Assets/Scenes/Map_Tests1.unity b/T3-Unity/Assets/Scenes/Map_Tests1.unity
index 86732d4456a7754b62845267bfa9fa0248010d01..f21d74635481b03d83b91675eb7a6d2edc543000 100644
--- a/T3-Unity/Assets/Scenes/Map_Tests1.unity
+++ b/T3-Unity/Assets/Scenes/Map_Tests1.unity
@@ -240,7 +240,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2091460426}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -254,347 +254,33 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 52237254}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 22e95def6ff01ae4db51f6c6c8364c31, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!222 &52237257
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 52237254}
- m_CullTransparentMesh: 0
---- !u!1 &56089868
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 56089869}
- - component: {fileID: 56089871}
- - component: {fileID: 56089870}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &56089869
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56089868}
- 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: 1108485020}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &56089870
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56089868}
- 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: 'Moins
-
-'
- 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: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
- m_fontSizeBase: 24
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_textAlignment: 514
- 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: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 56089870}
- characterCount: 6
- spriteCount: 0
- spaceCount: 1
- wordCount: 1
- 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 &56089871
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 56089868}
- m_CullTransparentMesh: 0
---- !u!1 &129478868
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 129478869}
- - component: {fileID: 129478871}
- - component: {fileID: 129478870}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &129478869
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 129478868}
- 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: 1463677836}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &129478870
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 129478868}
- 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: 'Plus
-
-'
- 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: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24
- m_fontSizeBase: 24
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_textAlignment: 514
- 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: 0, y: 0, z: 0, w: 0}
- m_textInfo:
- textComponent: {fileID: 129478870}
- characterCount: 5
- spriteCount: 0
- spaceCount: 1
- wordCount: 1
- 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 &129478871
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 22e95def6ff01ae4db51f6c6c8364c31, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!222 &52237257
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 129478868}
+ m_GameObject: {fileID: 52237254}
m_CullTransparentMesh: 0
--- !u!1 &143949885
GameObject:
@@ -1024,7 +710,7 @@ GameObject:
- component: {fileID: 567138931}
- component: {fileID: 567138933}
m_Layer: 5
- m_Name: Image
+ m_Name: Fond_Ui
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1046,7 +732,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0.000030518, y: -71.4541}
+ m_AnchoredPosition: {x: 0, y: -71.45}
m_SizeDelta: {x: 888.2423, y: 66.11261}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &567138931
@@ -1394,7 +1080,7 @@ RectTransform:
- {fileID: 1427144197}
- {fileID: 1031563741}
m_Father: {fileID: 2091460426}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1818,7 +1504,7 @@ RectTransform:
m_Children:
- {fileID: 1224263488}
m_Father: {fileID: 2091460426}
- m_RootOrder: 6
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1941,11 +1627,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2091460426}
- m_RootOrder: 12
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -137.91, y: -117.60986}
+ m_AnchoredPosition: {x: -590.9, y: -112.26}
m_SizeDelta: {x: 237.37445, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &755087653
@@ -2442,7 +2128,7 @@ RectTransform:
- {fileID: 1511351837}
- {fileID: 1633859665}
m_Father: {fileID: 2091460426}
- m_RootOrder: 4
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -2809,131 +2495,6 @@ Transform:
m_Father: {fileID: 1160038181}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1108485019
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1108485020}
- - component: {fileID: 1108485023}
- - component: {fileID: 1108485022}
- - component: {fileID: 1108485021}
- m_Layer: 5
- m_Name: ButtonMinus
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1108485020
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1108485019}
- 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:
- - {fileID: 56089869}
- m_Father: {fileID: 2091460426}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -637, y: -117.34009}
- m_SizeDelta: {x: 190.2688, y: 75.3916}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1108485021
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1108485019}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 1108485022}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 964767766}
- m_MethodName: changeMinus
- m_Mode: 5
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &1108485022
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1108485019}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!222 &1108485023
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1108485019}
- m_CullTransparentMesh: 0
--- !u!1 &1160038180
GameObject:
m_ObjectHideFlags: 0
@@ -3313,12 +2874,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2091460426}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -331, y: -46}
- m_SizeDelta: {x: 70.45709, y: 82.51976}
+ m_AnchoredPosition: {x: -374, y: -71.45}
+ m_SizeDelta: {x: 111.21442, y: 117.69385}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!225 &1331080347
CanvasGroup:
@@ -3371,12 +2932,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0.4907095, b: 0.9622642, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: 8d31d9f5613008d4e97a46db994c76d3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3691,131 +3252,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1440548237}
m_CullTransparentMesh: 0
---- !u!1 &1463677835
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1463677836}
- - component: {fileID: 1463677839}
- - component: {fileID: 1463677838}
- - component: {fileID: 1463677837}
- m_Layer: 5
- m_Name: ButtonPlus
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1463677836
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1463677835}
- 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:
- - {fileID: 129478869}
- m_Father: {fileID: 2091460426}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -860, y: -117.34009}
- m_SizeDelta: {x: 199.99994, y: 75.38324}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1463677837
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1463677835}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 1463677838}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 964767768}
- m_MethodName: changePlus
- m_Mode: 5
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
---- !u!114 &1463677838
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1463677835}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
---- !u!222 &1463677839
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1463677835}
- m_CullTransparentMesh: 0
--- !u!1 &1470260037
GameObject:
m_ObjectHideFlags: 0
@@ -3849,12 +3285,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2091460426}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -241, y: -46}
- m_SizeDelta: {x: 70.45709, y: 82.519775}
+ m_AnchoredPosition: {x: -239.1, y: -63.8}
+ m_SizeDelta: {x: 111.2144, y: 117.6938}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!225 &1470260039
CanvasGroup:
@@ -3889,7 +3325,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1470260037}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 113da985b8fd6a14693d1c93fa5af6b4, type: 3}
+ m_Script: {fileID: 11500000, guid: 380d8a9115a818141b41c663eb957408, type: 3}
m_Name:
m_EditorClassIdentifier:
canvas: {fileID: 2091460429}
@@ -3907,12 +3343,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.6792453, g: 0.11213954, b: 0.11213954, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: bc9c6461c62937043bb7b31edc7164ca, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4685,12 +4121,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2091460426}
- m_RootOrder: 11
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -150, y: -46}
- m_SizeDelta: {x: 70.45709, y: 82.519775}
+ m_AnchoredPosition: {x: -99.8, y: -63.8}
+ m_SizeDelta: {x: 111.2144, y: 117.6938}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!225 &1896602725
CanvasGroup:
@@ -4725,7 +4161,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1896602723}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 113da985b8fd6a14693d1c93fa5af6b4, type: 3}
+ m_Script: {fileID: 11500000, guid: 6eb5a4ed1248c2d4eb03f052c9db5eb4, type: 3}
m_Name:
m_EditorClassIdentifier:
canvas: {fileID: 2091460429}
@@ -4743,12 +4179,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.048593827, g: 0.7924528, b: 0.13211423, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 0}
+ m_Sprite: {fileID: 21300000, guid: 6a60629f4bb329744888c825d873f9cb, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4797,7 +4233,7 @@ RectTransform:
m_Children:
- {fileID: 601173380}
m_Father: {fileID: 2091460426}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -5039,17 +4475,15 @@ RectTransform:
m_Children:
- {fileID: 567138930}
- {fileID: 1522705691}
- - {fileID: 1108485020}
- - {fileID: 1463677836}
- {fileID: 956645373}
- {fileID: 619556697}
- {fileID: 729711191}
- {fileID: 1953152065}
+ - {fileID: 755087652}
- {fileID: 52237255}
- {fileID: 1331080346}
- {fileID: 1470260038}
- {fileID: 1896602724}
- - {fileID: 755087652}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs b/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs
deleted file mode 100644
index 67103598f24c8d15283926ed705b7d447841503e..0000000000000000000000000000000000000000
--- a/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using TMPro;
-using UnityEngine.UI;
-
-public class ChangeMin : MonoBehaviour
-{
-
- public static float plus = Ui.motiv;
-
- public void changeMinus(string word)
- {
- plus = Ui.difficulty;
- plus--;
-
- if (plus < 0)
- {
- plus = 0;
- }
-
- Ui.difficulty = plus;
- }
-}
diff --git a/T3-Unity/Assets/Scripts/Button UI/changeplus.cs b/T3-Unity/Assets/Scripts/Button UI/changeplus.cs
deleted file mode 100644
index d38880b4a4268615957882ee0e4c8689048fb758..0000000000000000000000000000000000000000
--- a/T3-Unity/Assets/Scripts/Button UI/changeplus.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using TMPro;
-using UnityEngine.SceneManagement;
-public class ChangePlus : MonoBehaviour
-{
-
- public static float moins;
-
- public void changePlus(string word)
- {
-
- moins = Ui.difficulty;
- moins++;
-
- if (moins > 10)
- {
- moins = 10;
- }
-
- Ui.difficulty = moins;
-
-
- }
-}
diff --git a/T3-Unity/Assets/Scripts/Button UI/changeplus.cs.meta b/T3-Unity/Assets/Scripts/Button UI/changeplus.cs.meta
deleted file mode 100644
index 2c58c45c392b72580b68d47cc89db045cb5e8b85..0000000000000000000000000000000000000000
--- a/T3-Unity/Assets/Scripts/Button UI/changeplus.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: ef740db83eb559f43a863d061e079ade
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs b/T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1bbb395e206b7e742fc1f3c649925a9b2a1776a7
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs
@@ -0,0 +1,47 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using TMPro;
+
+
+public class DragDropM : MonoBehaviour, IDragHandler, IDropHandler
+{
+
+ [SerializeField] private Canvas canvas;
+
+ private RectTransform rectransform;
+ public TMP_Text textshowed;
+ bool block = true;
+
+
+ private void Awake()
+ {
+ rectransform = GetComponent<RectTransform>();
+
+ }
+
+
+ public void OnDrag(PointerEventData eventData)
+ {
+
+ rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+
+ }
+
+ public void OnDrop(PointerEventData eventData)
+ {
+
+
+ while (block == true)
+ {
+
+ Ui.nbObst = Ui.nbObst - 1;
+ Ui.difficulty = Ui.difficulty + 2;
+
+ block = false;
+ }
+
+
+ }
+}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs.meta
similarity index 83%
rename from T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs.meta
index 8036f1eae6ed9bd9ea63fdb3a9a6d676626f962b..6792f286d47fc2f0278df5b1305451e57c3e0a49 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta
+++ b/T3-Unity/Assets/Scripts/Obstacle/DragDropM.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 02e48c10dc39a4c498c2eccc20883084
+guid: 380d8a9115a818141b41c663eb957408
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs b/T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs
new file mode 100644
index 0000000000000000000000000000000000000000..24c4aec3d396e66b5ff22c210b40b5dff6d0540e
--- /dev/null
+++ b/T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs
@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using TMPro;
+
+
+public class DragDropS : MonoBehaviour, IDragHandler, IDropHandler
+{
+
+ [SerializeField] private Canvas canvas;
+
+ private RectTransform rectransform;
+ public TMP_Text textshowed;
+ bool block = true;
+
+
+ private void Awake()
+ {
+ rectransform = GetComponent<RectTransform>();
+
+ }
+
+
+ public void OnDrag(PointerEventData eventData)
+ {
+
+ rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor;
+
+ }
+
+ public void OnDrop(PointerEventData eventData)
+ {
+
+
+ while (block == true)
+ {
+
+ Ui.nbObst = Ui.nbObst - 1;
+ Ui.difficulty = Ui.difficulty + 3;
+
+
+ block = false;
+ }
+
+
+ }
+}
diff --git a/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs.meta
similarity index 83%
rename from T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs.meta
index 99abdf14b8c780da08ebe37ab4a02df2c4abdf82..ab9a3a44a1b9589524c56a50da788f946751d0f3 100644
--- a/T3-Unity/Assets/Scripts/Button UI/ChangeMin.cs.meta
+++ b/T3-Unity/Assets/Scripts/Obstacle/DragDropS.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 23ab3ae128f56e241b83e249e823556a
+guid: 6eb5a4ed1248c2d4eb03f052c9db5eb4
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs b/T3-Unity/Assets/Scripts/Obstacle/DragDropW.cs
similarity index 59%
rename from T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs
rename to T3-Unity/Assets/Scripts/Obstacle/DragDropW.cs
index db9bcb22093a6b7e8ffe460267deb0732a95e849..242e6f9464e363591d0faaaa479e49a069c3231d 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/DragDropW.cs
@@ -4,13 +4,14 @@ using UnityEngine;
using UnityEngine.EventSystems;
using TMPro;
-public class DragDrop : MonoBehaviour, IDragHandler, IDropHandler
+public class DragDropW : MonoBehaviour, IDragHandler, IDropHandler
{
[SerializeField] private Canvas canvas;
private RectTransform rectransform;
public TMP_Text textshowed;
+ bool block = true;
private void Awake()
@@ -29,18 +30,19 @@ public class DragDrop : MonoBehaviour, IDragHandler, IDropHandler
public void OnDrop(PointerEventData eventData)
{
-
- if (Ui.protec == false)
- {
- textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
- textshowed.GetComponent<TMP_Text>().text = "dffd";
- }
- else
+
+ while(block == true)
{
- textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
- textshowed.GetComponent<TMP_Text>().text = "aaaaa";
+
+ Ui.nbObst = Ui.nbObst - 1;
+ Ui.difficulty = Ui.difficulty + 1;
+
+
+ block = false;
}
-
+
+
+
}
}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/DragDropW.cs.meta
similarity index 100%
rename from T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs.meta
rename to T3-Unity/Assets/Scripts/Obstacle/DragDropW.cs.meta
diff --git a/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs b/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs
deleted file mode 100644
index e0bd01e85cc0513aeef3c94454b7bb1fe16a2c5c..0000000000000000000000000000000000000000
--- a/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.EventSystems;
-public class UiProtec : MonoBehaviour
-{
- public void protectedUi()
- {
- Ui.protec = true;
- }
-
- public void unProtectedUi()
- {
- Ui.protec = false;
- }
-}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/midObj.cs b/T3-Unity/Assets/Scripts/Obstacle/midObj.cs
index 079eebe2359e707e69f9541b7429ea376d9b41de..50f98234ce40979a4737b2b37f9cfa7e3ef0a6a4 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/midObj.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/midObj.cs
@@ -6,12 +6,12 @@ using UnityEngine.EventSystems;
public class midObj : MonoBehaviour, IDropHandler
{
private GameObject go;
+
public void OnDrop(PointerEventData eventData)
{
-
- float Uix = GameObject.Find("Image").transform.position.x;
- float Uiy = GameObject.Find("Image").transform.position.y;
+
+ Ui.nameObj = GameObject.FindWithTag("moyen").tag;
float objx = GameObject.Find("bin").transform.position.x;
float objy = GameObject.Find("bin").transform.position.y;
@@ -20,17 +20,11 @@ public class midObj : MonoBehaviour, IDropHandler
{
go = GameObject.FindWithTag("moyen");
Destroy(go);
-
+ Ui.difficulty = Ui.difficulty - 2;
+ Ui.nbObst = Ui.nbObst + 1;
}
- if (Uix + 888.2423/2 > Input.mousePosition.x && Uix - 888.2423/2 < Input.mousePosition.x && objy + 66.11261/2 > Input.mousePosition.y && Uiy - 66.11261/2 < Input.mousePosition.y)
- {
- Ui.protec = false;
- }
- else
- {
- Ui.protec = true;
- }
+
}
}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs b/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs
index e93a868bd75e2ed8abcd3442893e2ff1c0a2e154..ae027cee8a255fb9988db0b5ee664b6b38df4b5d 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/strongObj.cs
@@ -9,6 +9,8 @@ public class strongObj : MonoBehaviour, IDropHandler
public void OnDrop(PointerEventData eventData)
{
+
+ Ui.nameObj = GameObject.FindWithTag("fort").tag;
float objx = GameObject.Find("bin").transform.position.x;
float objy = GameObject.Find("bin").transform.position.y;
@@ -17,7 +19,8 @@ public class strongObj : MonoBehaviour, IDropHandler
{
go = GameObject.FindWithTag("fort");
Destroy(go);
-
+ Ui.difficulty = Ui.difficulty - 3;
+ Ui.nbObst = Ui.nbObst + 1;
}
}
diff --git a/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs b/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs
index aecb5399b2823c5fd77220b435519ae14bf3bf7a..b5401ec19a10095a3f77dfdf5e30c539dbfd9b8b 100644
--- a/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs
+++ b/T3-Unity/Assets/Scripts/Obstacle/weakObj.cs
@@ -9,15 +9,20 @@ public class weakObj : MonoBehaviour, IDropHandler
public void OnDrop(PointerEventData eventData)
{
+
+ Ui.nameObj = GameObject.FindWithTag("faible").tag;
float objx = GameObject.Find("bin").transform.position.x;
float objy = GameObject.Find("bin").transform.position.y;
if (objx + 90 > Input.mousePosition.x && objx - 90 < Input.mousePosition.x && objy + 90 > Input.mousePosition.y && objy - 90 < Input.mousePosition.y)
- {
- go = GameObject.FindWithTag("faible");
- Destroy(go);
-
+ {
+ go = GameObject.FindWithTag("faible");
+ Destroy(go);
+ Ui.difficulty = Ui.difficulty - 1;
+ Ui.nbObst = Ui.nbObst + 1;
+
+
}
}
diff --git a/T3-Unity/Assets/Scripts/UI/DiffScale.cs b/T3-Unity/Assets/Scripts/UI/DiffScale.cs
index f10f5e5673bdfa4e61ca271844324009fbd4e0ef..3848ef057c874add3f72c17055ba96e22fbc5ead 100644
--- a/T3-Unity/Assets/Scripts/UI/DiffScale.cs
+++ b/T3-Unity/Assets/Scripts/UI/DiffScale.cs
@@ -1,11 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-
+using UnityEngine.EventSystems;
+using TMPro;
public class DiffScale : MonoBehaviour
{
-
+ public TMP_Text textshowed;
// Start is called before the first frame update
void Start()
{
@@ -24,7 +25,8 @@ public class DiffScale : MonoBehaviour
Ui.difficulty = 0;
}
-
+ textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>();
+ textshowed.GetComponent<TMP_Text>().text = "Obstacles restants : " + Ui.nbObst.ToString();
}
}
diff --git a/T3-Unity/Assets/Scripts/UI/Ui.cs b/T3-Unity/Assets/Scripts/UI/Ui.cs
index 619f4f24580bc91358551010cfc88f0197516e94..e2d9b966e030de08784eaf2f442cc99cf0f258f5 100644
--- a/T3-Unity/Assets/Scripts/UI/Ui.cs
+++ b/T3-Unity/Assets/Scripts/UI/Ui.cs
@@ -8,13 +8,15 @@ public class Ui : MonoBehaviour
public static bool stop = false;
public static bool start = false;
- public static bool protec = false;
+
public static float motiv;
public static float difficulty;
public static int fame;
- public static int nbObst;
+ public static int nbObst = 5;
+
+ public static string nameObj;
public GameObject prefab;
public Canvas parent;
}
diff --git a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs
index 9fa3de7ab76cd2b98834f63b7afb5c656de707e9..dfe5b4b2dc117508f1e27e83559c8881d9b91060 100644
--- a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs
+++ b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs
@@ -8,9 +8,9 @@ public class nbObstacle : MonoBehaviour
public TMP_Text textshowed;
- public static void decreaseObstacle()
+ private void Start()
{
- Ui.nbObst = Ui.nbObst - 1;
+ textshowed.GetComponent<TMP_Text>().text = "Obstacles restants : " + Ui.nbObst.ToString();
}
}
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png b/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ea585b29d5adcee1b3340d5ab87ac82ecb922e0
Binary files /dev/null and b/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png differ
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png.meta b/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9f446db16ad6059769158653eed5737d7434c9b0
--- /dev/null
+++ b/T3-Unity/Assets/TextMesh Pro/Sprites/CoolClips_arch0117.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 6a60629f4bb329744888c825d873f9cb
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: d74f620a081855f498b9967ea84322be
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png b/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e7c9a23a4e5834daad2c61ab32f037dda96e6bb
Binary files /dev/null and b/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png differ
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png.meta b/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..76fe451390249c008bd8773c2229f94311555a8f
--- /dev/null
+++ b/T3-Unity/Assets/TextMesh Pro/Sprites/bouncers-250x250.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 8d31d9f5613008d4e97a46db994c76d3
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 835b1b5c496a3ef4aa95de3a2a1face9
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png b/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee714bc703a655c9968b8a6e6c3c3073d006cc1c
Binary files /dev/null and b/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png differ
diff --git a/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png.meta b/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f40c587eab9c2a12c1fef2b841988dca6d19ee47
--- /dev/null
+++ b/T3-Unity/Assets/TextMesh Pro/Sprites/warn_mines.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: bc9c6461c62937043bb7b31edc7164ca
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: -1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 3fc739af0ff529a47866609db4a74a4e
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant: