diff --git a/Images/readme/coling.jpeg b/Images/readme/coling.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e8df846130bf992a92b09a6a66cd9e7729544a40 Binary files /dev/null and b/Images/readme/coling.jpeg differ diff --git a/Images/readme/joffreylc.jpeg b/Images/readme/joffreylc.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4e895ba4758a9d2c5abf545e532dcb6a98d010ef Binary files /dev/null and b/Images/readme/joffreylc.jpeg differ diff --git a/Images/readme/jordanp.jpeg b/Images/readme/jordanp.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..bc6f874c1bc135981c41014697dbc0faf9a2bcaf Binary files /dev/null and b/Images/readme/jordanp.jpeg differ diff --git a/T3-Unity/Assets/Scenes/Map_Tests1.unity b/T3-Unity/Assets/Scenes/Map_Tests1.unity index a390d9e1453cd95d1c4de257467c2f23f1344e4f..7211a3960fb1e07e70859b9e16bdce1add689125 100644 --- a/T3-Unity/Assets/Scenes/Map_Tests1.unity +++ b/T3-Unity/Assets/Scenes/Map_Tests1.unity @@ -818,7 +818,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &313702765 GameObject: @@ -1022,6 +1022,7 @@ GameObject: - component: {fileID: 567138930} - component: {fileID: 567138932} - component: {fileID: 567138931} + - component: {fileID: 567138933} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -1083,6 +1084,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567138929} m_CullTransparentMesh: 0 +--- !u!114 &567138933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 567138929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 964767772} + m_MethodName: protectedUi + m_Mode: 1 + 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 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 964767772} + m_MethodName: unProtectedUi + m_Mode: 1 + 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 + delegates: [] --- !u!1 &596864101 GameObject: m_ObjectHideFlags: 0 @@ -2101,12 +2146,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: canvas: {fileID: 2091460429} ---- !u!224 &812185531 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - m_PrefabInstance: {fileID: 1630539905762565082} - m_PrefabAsset: {fileID: 0} + textshowed: {fileID: 0} --- !u!1 &817057766 GameObject: m_ObjectHideFlags: 0 @@ -2457,7 +2497,9 @@ GameObject: - component: {fileID: 964767769} - component: {fileID: 964767768} - component: {fileID: 964767767} + - component: {fileID: 964767772} - component: {fileID: 964767766} + - component: {fileID: 964767771} m_Layer: 0 m_Name: Ui_Object m_TagString: Untagged @@ -2536,12 +2578,37 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 964767764} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 520.3, y: 163.97, z: 0} + m_LocalPosition: {x: 520.3, y: 163.97003, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &964767771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964767764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8ba3639b91827141a24a34f7fc23a8a, type: 3} + m_Name: + m_EditorClassIdentifier: + textshowed: {fileID: 755087653} +--- !u!114 &964767772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 964767764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02e48c10dc39a4c498c2eccc20883084, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1031563740 GameObject: m_ObjectHideFlags: 0 @@ -3213,6 +3280,119 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 624cf9dc8f2652e459b56928068e7af3, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1331080345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331080346} + - component: {fileID: 1331080351} + - component: {fileID: 1331080350} + - component: {fileID: 1331080349} + - component: {fileID: 1331080348} + - component: {fileID: 1331080347} + m_Layer: 5 + m_Name: weak_obj + m_TagString: faible + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1331080346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + 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: 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: -330, y: -44.67407} + m_SizeDelta: {x: 70.45709, y: 82.51976} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1331080347 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1331080348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df0e122aa4cdf49458d0cc812b157a5e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1331080349 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 113da985b8fd6a14693d1c93fa5af6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 2091460429} + textshowed: {fileID: 0} +--- !u!114 &1331080350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + 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.4907095, b: 0.9622642, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &1331080351 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1331080345} + m_CullTransparentMesh: 0 --- !u!1 &1427144196 GameObject: m_ObjectHideFlags: 0 @@ -3298,12 +3478,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1427144196} m_CullTransparentMesh: 0 ---- !u!224 &1439040865 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - m_PrefabInstance: {fileID: 4492123872469984316} - m_PrefabAsset: {fileID: 0} --- !u!1 &1440367856 GameObject: m_ObjectHideFlags: 0 @@ -3642,6 +3816,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1463677835} m_CullTransparentMesh: 0 +--- !u!1 &1470260037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1470260038} + - component: {fileID: 1470260043} + - component: {fileID: 1470260042} + - component: {fileID: 1470260041} + - component: {fileID: 1470260040} + - component: {fileID: 1470260039} + m_Layer: 5 + m_Name: normal_obj + m_TagString: moyen + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1470260038 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + 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: 10 + 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: -230, y: 399.05} + m_SizeDelta: {x: 70.45709, y: 82.51976} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &1470260039 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1470260040 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 643478a71ee34d54f80bf90d40e00823, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1470260041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 113da985b8fd6a14693d1c93fa5af6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 2091460429} + textshowed: {fileID: 0} +--- !u!114 &1470260042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + 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.6792453, g: 0.11213954, b: 0.11213954, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &1470260043 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470260037} + m_CullTransparentMesh: 0 --- !u!1 &1511351836 GameObject: m_ObjectHideFlags: 0 @@ -4291,12 +4578,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1756448748} m_CullTransparentMesh: 0 ---- !u!224 &1821686626 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - m_PrefabInstance: {fileID: 367132698235949062} - m_PrefabAsset: {fileID: 0} --- !u!1 &1831370941 GameObject: m_ObjectHideFlags: 0 @@ -4371,7 +4652,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1831370941} m_CullTransparentMesh: 1 ---- !u!1 &1953152064 +--- !u!1 &1896602723 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4379,66 +4660,179 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1953152065} - - component: {fileID: 1953152068} - - component: {fileID: 1953152067} - - component: {fileID: 1953152066} + - component: {fileID: 1896602724} + - component: {fileID: 1896602729} + - component: {fileID: 1896602728} + - component: {fileID: 1896602727} + - component: {fileID: 1896602726} + - component: {fileID: 1896602725} m_Layer: 5 - m_Name: StartButton - m_TagString: Untagged + m_Name: 'strong_obj ' + m_TagString: fort m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1953152065 +--- !u!224 &1896602724 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1953152064} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 1896602723} + 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: 601173380} + m_Children: [] m_Father: {fileID: 2091460426} - m_RootOrder: 7 + m_RootOrder: 11 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: 252, y: -76.949} - m_SizeDelta: {x: 227.8191, y: 66.76709} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -125, y: 398.43} + m_SizeDelta: {x: 70.45709, y: 82.51976} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1953152066 +--- !u!225 &1896602725 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896602723} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1896602726 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1953152064} + m_GameObject: {fileID: 1896602723} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: c47ceb5600e99564d8b1369275c62d23, 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} +--- !u!114 &1896602727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896602723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 113da985b8fd6a14693d1c93fa5af6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + canvas: {fileID: 0} + textshowed: {fileID: 0} +--- !u!114 &1896602728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896602723} + 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.048593827, g: 0.7924528, b: 0.13211423, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &1896602729 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1896602723} + m_CullTransparentMesh: 0 +--- !u!1 &1953152064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953152065} + - component: {fileID: 1953152068} + - component: {fileID: 1953152067} + - component: {fileID: 1953152066} + m_Layer: 5 + m_Name: StartButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953152065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953152064} + 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: 601173380} + m_Father: {fileID: 2091460426} + m_RootOrder: 7 + 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: 252, y: -76.949} + m_SizeDelta: {x: 227.8191, y: 66.76709} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1953152066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953152064} + 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 @@ -4652,9 +5046,9 @@ RectTransform: - {fileID: 729711191} - {fileID: 1953152065} - {fileID: 52237255} - - {fileID: 1821686626} - - {fileID: 1439040865} - - {fileID: 812185531} + - {fileID: 1331080346} + - {fileID: 1470260038} + - {fileID: 1896602724} - {fileID: 755087652} m_Father: {fileID: 0} m_RootOrder: 5 @@ -4775,391 +5169,3 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &367132698235949062 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2091460426} - m_Modifications: - - target: {fileID: 367132696416906083, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: canvas - value: - objectReference: {fileID: 2091460429} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -330 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.674 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_SizeDelta.x - value: 70.45709 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_SizeDelta.y - value: 82.519775 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906084, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 367132696416906087, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_Name - value: weak_obj - objectReference: {fileID: 0} - - target: {fileID: 367132696416906087, guid: 2f719202d40e02f4a99ac3fb499ca69a, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2f719202d40e02f4a99ac3fb499ca69a, type: 3} ---- !u!1001 &1630539905762565082 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2091460426} - m_Modifications: - - target: {fileID: 1630539906574675040, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_Name - value: 'strong_obj ' - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675040, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -133 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -45.3 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_SizeDelta.x - value: 70.45709 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_SizeDelta.y - value: 82.519775 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675041, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1630539906574675044, guid: 6e9fee84338b0334aa752fd2b6d734f2, - type: 3} - propertyPath: canvas - value: - objectReference: {fileID: 2091460429} - m_RemovedComponents: - - {fileID: 1630539906574675047, guid: 6e9fee84338b0334aa752fd2b6d734f2, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 6e9fee84338b0334aa752fd2b6d734f2, type: 3} ---- !u!1001 &4492123872469984316 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2091460426} - m_Modifications: - - target: {fileID: 4492123873321820505, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: canvas - value: - objectReference: {fileID: 2091460429} - - target: {fileID: 4492123873321820508, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_Name - value: normal_obj - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820508, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -232 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -44.67401 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_SizeDelta.x - value: 70.45709 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_SizeDelta.y - value: 82.519775 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4492123873321820509, guid: e01d765240081fa498149d9286a0af9f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e01d765240081fa498149d9286a0af9f, type: 3} diff --git a/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs b/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs index 8b8ad04ff6854f21b892f5ec6b68e53a66623e22..db9bcb22093a6b7e8ffe460267deb0732a95e849 100644 --- a/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs +++ b/T3-Unity/Assets/Scripts/Obstacle/DragDrop.cs @@ -2,21 +2,21 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; +using TMPro; -public class DragDrop : MonoBehaviour, IDragHandler +public class DragDrop : MonoBehaviour, IDragHandler, IDropHandler { [SerializeField] private Canvas canvas; private RectTransform rectransform; - - + public TMP_Text textshowed; private void Awake() { rectransform = GetComponent<RectTransform>(); - + } @@ -24,7 +24,23 @@ public class DragDrop : MonoBehaviour, IDragHandler { rectransform.anchoredPosition += eventData.delta / canvas.scaleFactor; + } + public void OnDrop(PointerEventData eventData) + { + + if (Ui.protec == false) + { + textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>(); + textshowed.GetComponent<TMP_Text>().text = "dffd"; + } + else + { + textshowed = GameObject.Find("nbobstacle").GetComponent<TMP_Text>(); + textshowed.GetComponent<TMP_Text>().text = "aaaaa"; + } + + } } diff --git a/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs b/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs new file mode 100644 index 0000000000000000000000000000000000000000..e0bd01e85cc0513aeef3c94454b7bb1fe16a2c5c --- /dev/null +++ b/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs @@ -0,0 +1,16 @@ +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/UiProtec.cs.meta b/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..8036f1eae6ed9bd9ea63fdb3a9a6d676626f962b --- /dev/null +++ b/T3-Unity/Assets/Scripts/Obstacle/UiProtec.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 02e48c10dc39a4c498c2eccc20883084 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/T3-Unity/Assets/Scripts/UI/Ui.cs b/T3-Unity/Assets/Scripts/UI/Ui.cs index 1252549e660ed00a251935f22687a486f02a83eb..d57ce9c9090b80038cd1ff7d878855a544cd37df 100644 --- a/T3-Unity/Assets/Scripts/UI/Ui.cs +++ b/T3-Unity/Assets/Scripts/UI/Ui.cs @@ -6,8 +6,13 @@ using TMPro; 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 bool stop = false; diff --git a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs index bf860297667ac82d5f212f899d3e718632b95ed7..9fa3de7ab76cd2b98834f63b7afb5c656de707e9 100644 --- a/T3-Unity/Assets/Scripts/UI/nbObstacle.cs +++ b/T3-Unity/Assets/Scripts/UI/nbObstacle.cs @@ -1,16 +1,16 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using TMPro; public class nbObstacle : MonoBehaviour { + public TMP_Text textshowed; + public static void decreaseObstacle() { Ui.nbObst = Ui.nbObst - 1; } - public void changeObs(string word) - { - } } diff --git a/T3-Unity/Assets/scip.cs b/T3-Unity/Assets/scip.cs new file mode 100644 index 0000000000000000000000000000000000000000..d64018fdb1936ee69dd5be5f6facbe99c4a99eef --- /dev/null +++ b/T3-Unity/Assets/scip.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class scip : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/T3-Unity/Assets/scip.cs.meta b/T3-Unity/Assets/scip.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..9f8a1b6c0872ecd18f414589814ad0fe14c07093 --- /dev/null +++ b/T3-Unity/Assets/scip.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de6aaac61bc640941b6724081c5d0eb9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: