Merge Joffrey - Jordan

T3-Unity/Assets/Scenes/Map_Tests.unity → T3-Unity/Assets/Scenes/Map_Tests1.unity

@@ -1745,7 +1745,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1440548237}
   m_CullTransparentMesh: 0
---- !u!1 &1468520958
+--- !u!1 &1521155461
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1753,44 +1753,97 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1468520960}
-  - component: {fileID: 1468520959}
-  m_Layer: 0
-  m_Name: Sportifs
+  - component: {fileID: 1521155465}
+  - component: {fileID: 1521155464}
+  - component: {fileID: 1521155463}
+  - component: {fileID: 1521155462}
+  m_Layer: 5
+  m_Name: Canvas_Step2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1468520959
+  m_IsActive: 0
+--- !u!114 &1521155462
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1468520958}
-  m_Enabled: 0
+  m_GameObject: {fileID: 1521155461}
+  m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7e94988962f28d44cb28d67668b8f1ad, type: 3}
+  m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  nbJoueur: 25
-  parent: {fileID: 1468520960}
-  copy: {fileID: 114736490466060796, guid: 4256cfb91b73ae34aab9be42e6a067de, type: 3}
---- !u!4 &1468520960
-Transform:
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1521155463
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521155461}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+--- !u!223 &1521155464
+Canvas:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1468520958}
+  m_GameObject: {fileID: 1521155461}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1521155465
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1521155461}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 117.85736, y: 2.7792358, z: 82.664764}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children:
+  - {fileID: 1831370942}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &1756448748
 GameObject:
   m_ObjectHideFlags: 0
@@ -2019,7 +2072,7 @@ CanvasRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1831370941}
-  m_CullTransparentMesh: 0
+  m_CullTransparentMesh: 1
 --- !u!1 &2056313308
 GameObject:
   m_ObjectHideFlags: 0

T3-Unity/Assets/Scripts/GameManager.cs

@@ -54,7 +54,7 @@ public class GameManager : MonoBehaviour
                         canvasStep2.transform.GetChild(0).GetChild(1).gameObject.SetActive(true);
                         break;
                     case 1:
-                        canvasStep2.Destroy();
+                        canvasStep2.gameObject.SetActive(false);
                         break;
                 }
 
@@ -103,7 +103,7 @@ public class GameManager : MonoBehaviour
     public void lockMovement()
     {
         map.GetComponent<QuadTreeCameraMovement>().enabled = false;
-        canvasStep1.Destroy();
+        canvasStep1.gameObject.SetActive(false);
         locked = true;
 
         canvasStep2.GetComponentInChildren<Transform>().gameObject.SetActive(true);

T3-Unity/ProjectSettings/EditorBuildSettings.asset

@@ -12,7 +12,7 @@ EditorBuildSettings:
     path: Assets/Scenes/PlacementObject_1.unity
     guid: 40275f15a185c5242b37076a9c27b1d1
   - enabled: 0
-    path: Assets/Scenes/Map_Tests.unity
+    path: Assets/Scenes/Map_Tests1.unity
     guid: 32fc8cc296ff6a44ca9e752fdfb4a379
   - enabled: 1
     path: Assets/Scenes/Main_Menu.unity