diff --git a/Assets/Scenes/LevelSelect.unity b/Assets/Scenes/LevelSelect.unity index 28ec709..c19eb8a 100644 --- a/Assets/Scenes/LevelSelect.unity +++ b/Assets/Scenes/LevelSelect.unity @@ -154,8 +154,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1319691314} - {fileID: 626526614} - - {fileID: 1168605378} m_Father: {fileID: 1537543430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -330,11 +330,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -25.8 + value: -37.6 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 83.5 + value: 67.289 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -469,11 +469,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 189.2 + value: 123.1 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 138.5 + value: 112.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -608,11 +608,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 352.2 + value: 294.26 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 49.289 + value: 32.1 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -704,10 +704,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1319691314} + m_Children: [] m_Father: {fileID: 110889290} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -871,15 +870,15 @@ RectTransform: m_GameObject: {fileID: 1168605377} 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_LocalScale: {x: 0.8343762, y: 0.8343762, z: 0.8343762} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 110889290} - m_RootOrder: 1 + m_Father: {fileID: 1602376024} + m_RootOrder: 11 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: 446.97733, y: 197.5437} + m_AnchoredPosition: {x: 376.59, y: 165.93} m_SizeDelta: {x: 46.8163, y: 36.9283} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1168605379 @@ -1069,11 +1068,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 257.3 + value: 188.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 119.29 + value: 103.9 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1133,13 +1132,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 626526614} + m_Father: {fileID: 110889290} 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.00045776367} - m_SizeDelta: {x: -0.4000244, y: 0} + m_AnchoredPosition: {x: 0.39996338, y: -0.00045776367} + m_SizeDelta: {x: 0.39990234, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1319691315 MonoBehaviour: @@ -1284,11 +1283,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -74.7 + value: -83.94 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 123.6 + value: 115.29 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1423,11 +1422,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 40.2 + value: 22.86 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 112.5 + value: 94.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1712,11 +1711,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 287.2 + value: 233.8 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 70.0775 + value: 62.8 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1851,11 +1850,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -207.69998 + value: -200.84 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 112.5 + value: 83.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1927,6 +1926,7 @@ RectTransform: - {fileID: 1216504575} - {fileID: 1538036938} - {fileID: 448638732} + - {fileID: 1168605378} m_Father: {fileID: 559218210} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1964,10 +1964,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 800, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -2106,11 +2106,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -141.69998 + value: -144.4 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 153.5 + value: 112.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2245,11 +2245,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 108.3 + value: 68.5 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 146.71 + value: 124.1 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2380,11 +2380,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -305.59998 + value: -261.3 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 83.5 + value: 70.078 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Scripts/LevelEditor/WorldEditor.cs b/Assets/Scripts/LevelEditor/WorldEditor.cs index ddff02d..b6b57c3 100644 --- a/Assets/Scripts/LevelEditor/WorldEditor.cs +++ b/Assets/Scripts/LevelEditor/WorldEditor.cs @@ -4,6 +4,7 @@ using UnityEngine.UI; using UnityEngine; using UnityEngine.SceneManagement; using System; +using UnityEditor; public class WorldEditor : MonoBehaviour { @@ -50,23 +51,25 @@ public class WorldEditor : MonoBehaviour private void ShowLockedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = Resources.Load("worldmap_level_locked"); + currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_locked.png", typeof(Sprite)); } private void ShowUnlockedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = Resources.Load("worldmap_level_playable"); + currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_playable.png", typeof(Sprite)); } private void ShowSavedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = Resources.Load("worldmap_level_completed"); + currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_playable.png", typeof(Sprite)); } public void CallLevelWorld1(int levelToCall) { - //TODO: Appliquer l'appel du code et la creation du niveau comme demander. string levelToGet = "1-" + levelToCall; - - //LevelManager.Instance.LoadLevel(levelToGet); + if (buttonList[levelToCall - 1].GetComponent().sprite.name != "worldmap_level_locked.png") + { + LevelManager.Instance.LoadLevel(levelToGet, true); + } + } }