From c48f275fce9edd27ab37dcac37d0b1c498f998b4 Mon Sep 17 00:00:00 2001 From: MaximilienBlanchardBizien1 Date: Sun, 25 Jun 2023 17:58:05 -0400 Subject: [PATCH] =?UTF-8?q?-=20Correction=20du=20scaling=20des=20boutons?= =?UTF-8?q?=20dans=20la=20carte=20du=20monde;=20-=20Modification=20de=20l'?= =?UTF-8?q?=C3=A9diteur=20du=20monde=20pour=20mieux=20charger=20les=20spri?= =?UTF-8?q?tes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/WorldMap/WorldMapEditor.prefab | 4 + Assets/Scenes/LevelSelect.unity | 226 ++++++++++++------ Assets/Scripts/LevelEditor/WorldEditor.cs | 12 +- 3 files changed, 170 insertions(+), 72 deletions(-) diff --git a/Assets/Prefabs/UI/WorldMap/WorldMapEditor.prefab b/Assets/Prefabs/UI/WorldMap/WorldMapEditor.prefab index 7cddc16..f1eb088 100644 --- a/Assets/Prefabs/UI/WorldMap/WorldMapEditor.prefab +++ b/Assets/Prefabs/UI/WorldMap/WorldMapEditor.prefab @@ -44,3 +44,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 551b5e1cdf881454091dab91f3b468e8, type: 3} m_Name: m_EditorClassIdentifier: + buttonList: [] + _unlockedIcon: {fileID: 21300000, guid: e8fd4cf19b7d3fa46a0f3d04d7653832, type: 3} + _lockedIcon: {fileID: 21300000, guid: 21a4590b4c1723f48be7dd9cdcf7bca5, type: 3} + _savedIcon: {fileID: 21300000, guid: f293941fc69e7f34995120515f6133da, type: 3} diff --git a/Assets/Scenes/LevelSelect.unity b/Assets/Scenes/LevelSelect.unity index c19eb8a..2440c32 100644 --- a/Assets/Scenes/LevelSelect.unity +++ b/Assets/Scenes/LevelSelect.unity @@ -236,6 +236,10 @@ PrefabInstance: propertyPath: m_text value: 1-5 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -248,17 +252,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 20 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -294,11 +302,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -330,11 +338,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -37.6 + value: -87.576 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 67.289 + value: 165.271 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -375,6 +383,10 @@ PrefabInstance: propertyPath: m_text value: 1-8 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -387,17 +399,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 4 + value: 5.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 9 + value: 18.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -433,11 +449,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -469,11 +485,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 123.1 + value: 298.45 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 112.5 + value: 287.13 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -514,6 +530,10 @@ PrefabInstance: propertyPath: m_text value: 1-11 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -526,17 +546,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 7 + value: 8.999985 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 19.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -572,11 +596,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -608,11 +632,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 294.26 + value: 678.4152 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 32.1 + value: 70.42493 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -878,8 +902,8 @@ RectTransform: 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: 376.59, y: 165.93} - m_SizeDelta: {x: 46.8163, y: 36.9283} + m_AnchoredPosition: {x: 846.12, y: 744.87} + m_SizeDelta: {x: 227.75, y: 187.408} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1168605379 MonoBehaviour: @@ -974,6 +998,10 @@ PrefabInstance: propertyPath: m_text value: 1-9 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -986,17 +1014,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 6.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 19.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -1032,11 +1064,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -1068,11 +1100,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 188.5 + value: 438 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 103.9 + value: 268 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1189,6 +1221,10 @@ PrefabInstance: propertyPath: m_text value: 1-4 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -1201,17 +1237,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 6.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 8 + value: 17.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -1247,11 +1287,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -1283,11 +1323,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -83.94 + value: -194.53792 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 115.29 + value: 294.649 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1328,6 +1368,10 @@ PrefabInstance: propertyPath: m_text value: 1-6 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -1340,17 +1384,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 4 + value: 5.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 8 + value: 17.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -1386,11 +1434,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -1422,11 +1470,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.86 + value: 44 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 94.5 + value: 238.613 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1617,6 +1665,10 @@ PrefabInstance: propertyPath: m_text value: 1-10 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -1629,17 +1681,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 7 + value: 8.999985 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 10 + value: 19.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -1675,11 +1731,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -1711,11 +1767,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 233.8 + value: 558 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 62.8 + value: 155 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1756,6 +1812,10 @@ PrefabInstance: propertyPath: m_text value: 1-2 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -1768,17 +1828,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 4 + value: 5.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 7 + value: 16.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -1814,11 +1878,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -1850,11 +1914,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -200.84 + value: -475 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 83.5 + value: 226 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1967,7 +2031,7 @@ MonoBehaviour: m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 1080} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -2012,6 +2076,10 @@ PrefabInstance: propertyPath: m_text value: 1-3 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -2024,17 +2092,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 4 + value: 5.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 9 + value: 18.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -2070,11 +2142,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -2106,11 +2178,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -144.4 + value: -344 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 112.5 + value: 294.65 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2151,6 +2223,10 @@ PrefabInstance: propertyPath: m_text value: 1-7 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -2163,17 +2239,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 4 + value: 5.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 8 + value: 17.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -2209,11 +2289,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -2245,11 +2325,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 68.5 + value: 157.321 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 124.1 + value: 318.39572 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2286,6 +2366,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1602376024} m_Modifications: + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor.b value: 1 @@ -2298,17 +2382,21 @@ PrefabInstance: propertyPath: m_fontColor.r value: 0.9698553 objectReference: {fileID: 0} + - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} + propertyPath: m_fontSizeBase + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1893888152474992911, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_fontColor32.rgba value: 4294902007 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: 5 + value: 6.9999847 objectReference: {fileID: 0} - target: {fileID: 1893888152474992944, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 7 + value: 16.999992 objectReference: {fileID: 0} - target: {fileID: 1893888152770301338, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_IntArgument @@ -2344,11 +2432,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.x - value: 60.4602 + value: 139.553 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_SizeDelta.y - value: 45.2115 + value: 121.861 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_LocalPosition.x @@ -2380,11 +2468,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.x - value: -261.3 + value: -639 objectReference: {fileID: 0} - target: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} propertyPath: m_AnchoredPosition.y - value: 70.078 + value: 172.79 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 b6b57c3..0ddb836 100644 --- a/Assets/Scripts/LevelEditor/WorldEditor.cs +++ b/Assets/Scripts/LevelEditor/WorldEditor.cs @@ -10,6 +10,12 @@ public class WorldEditor : MonoBehaviour { [SerializeField] GameObject[] buttonList; + [SerializeField] + private Sprite _unlockedIcon; + [SerializeField] + private Sprite _lockedIcon; + [SerializeField] + private Sprite _savedIcon; // Start is called before the first frame update void Start() @@ -51,16 +57,16 @@ public class WorldEditor : MonoBehaviour private void ShowLockedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_locked.png", typeof(Sprite)); + currentLevelButton.GetComponent().sprite = _lockedIcon; } private void ShowUnlockedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_playable.png", typeof(Sprite)); + currentLevelButton.GetComponent().sprite = _unlockedIcon; } private void ShowSavedIcon(GameObject currentLevelButton) { - currentLevelButton.GetComponent().sprite = (Sprite)AssetDatabase.LoadAssetAtPath("Assets/Art/Materials/worldmap_level_playable.png", typeof(Sprite)); + currentLevelButton.GetComponent().sprite = _savedIcon; } public void CallLevelWorld1(int levelToCall)