From 4c24aa2b0391d58dc925e400667a7820e2ba28f6 Mon Sep 17 00:00:00 2001 From: FrisoBooij Date: Wed, 12 Feb 2025 10:41:59 +0100 Subject: [PATCH 1/3] UI_Openen_Opslaan_Icon_Fix I updated the UI icons for the rest of the save and open flow. I also fixed the Legend hover resizing. --- .../NL3D_Bestand_Openen.prefab | 10 ++++---- .../NL3D_Bestand_Opslaan.prefab | 6 ++--- Assets/Scenes/Main.unity | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Openen.prefab b/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Openen.prefab index c35556265..ca9431ccf 100644 --- a/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Openen.prefab +++ b/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Openen.prefab @@ -173,7 +173,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 21.599976, y: -18.599998} - m_SizeDelta: {x: 23.683, y: 23.683} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2463638415607897966 CanvasRenderer: @@ -196,14 +196,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.22352941, b: 0.33333334, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6620555d66ffb44c4a6bc948ec61c651, type: 3} + m_Sprite: {fileID: 21300000, guid: 33def34093c7d9e4f9a19152219293ad, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1723,7 +1723,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 21.599976, y: -23.2} - m_SizeDelta: {x: 23.683, y: 23.683} + m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6366153017307710236 CanvasRenderer: @@ -1753,7 +1753,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0eecd28f16d32a24d977b7b4212c5bd8, type: 3} + m_Sprite: {fileID: 21300000, guid: 33def34093c7d9e4f9a19152219293ad, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Opslaan.prefab b/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Opslaan.prefab index e66c7999f..6a7550f0f 100644 --- a/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Opslaan.prefab +++ b/Assets/Prefabs/UI/InspectorPanels/Openen_en_opslaan/NL3D_Bestand_Opslaan.prefab @@ -196,14 +196,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.19607843, g: 0.22352941, b: 0.33333334, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: aadb41dcd355964479dc7a822c35bac3, type: 3} + m_Sprite: {fileID: 21300000, guid: 3eda58e0626822a439d2b045f2162e53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2030,7 +2030,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 17563d36062282240a2df9b8cfb62a36, type: 3} + m_Sprite: {fileID: 21300000, guid: 3eda58e0626822a439d2b045f2162e53, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a584235d4..03f692901 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -9412,6 +9412,16 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 9055551517361465053, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: hoverSize.x + value: 288 + objectReference: {fileID: 0} + - target: {fileID: 9055551517361465053, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: hoverSize.y + value: 288 + objectReference: {fileID: 0} - target: {fileID: 9062254053285077316, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMax.y @@ -9467,6 +9477,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9102015529819190753, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9102015529819190753, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9102015529819190753, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9139313303826141759, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMax.y From 074939edf0520b3700bfbb799ad0180621687651 Mon Sep 17 00:00:00 2001 From: FrisoBooij Date: Wed, 12 Feb 2025 13:29:41 +0100 Subject: [PATCH 2/3] UI_Fix Ook hier de Transform handle knopjes weer aangezet --- Assets/Scenes/Main.unity | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 03f692901..347962843 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2935,32 +2935,32 @@ PrefabInstance: - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 329410704487536662, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 391263080623726495, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -3286,22 +3286,22 @@ PrefabInstance: - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -3326,12 +3326,12 @@ PrefabInstance: - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.y - value: -75 + value: 0 objectReference: {fileID: 0} - target: {fileID: 973213398189763235, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -7767,7 +7767,7 @@ PrefabInstance: - target: {fileID: 6145256048111018074, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6155497104461542838, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -8490,32 +8490,32 @@ PrefabInstance: - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.x - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: 25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7645729648555987820, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.y - value: -125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7658382538514721410, guid: 9963fec33e379324db2affcb3f83332f, type: 3} From 25fc5330ee15db9f102c21a05cd94609ea1ab356 Mon Sep 17 00:00:00 2001 From: FrisoBooij Date: Wed, 12 Feb 2025 13:53:45 +0100 Subject: [PATCH 3/3] Updated UI Sprite_Atlas and Minimap Placement --- Assets/Scenes/Main.unity | 28 +++++++++++++------ .../UI/Icons/UI_Icons.spriteatlasv2.meta | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 347962843..8ea0bab68 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1090,7 +1090,7 @@ PrefabInstance: - target: {fileID: 7421446867431096731, guid: fa341848ec16ef84e8f7d63ae9682064, type: 3} propertyPath: m_SizeDelta.y - value: -459.99994 + value: -519.99994 objectReference: {fileID: 0} - target: {fileID: 7421446867431096731, guid: fa341848ec16ef84e8f7d63ae9682064, type: 3} @@ -1135,7 +1135,7 @@ PrefabInstance: - target: {fileID: 7421446867431096731, guid: fa341848ec16ef84e8f7d63ae9682064, type: 3} propertyPath: m_AnchoredPosition.y - value: -70.00003 + value: -39.99997 objectReference: {fileID: 0} - target: {fileID: 7421446867431096731, guid: fa341848ec16ef84e8f7d63ae9682064, type: 3} @@ -1297,7 +1297,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0.000017047} - m_SizeDelta: {x: 408, y: 110.86} + m_SizeDelta: {x: 408, y: 148.5587} m_Pivot: {x: 0, y: 0} --- !u!114 &1908448999 MonoBehaviour: @@ -7977,12 +7977,12 @@ PrefabInstance: - target: {fileID: 6562926540597506001, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: -359.70007 + value: -363.50006 objectReference: {fileID: 0} - target: {fileID: 6562926540597506001, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.199951 + value: -22 objectReference: {fileID: 0} - target: {fileID: 6570558613266753385, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -8012,7 +8012,7 @@ PrefabInstance: - target: {fileID: 6623383021047389338, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_SizeDelta.x - value: -407.5679 + value: -411.4762 objectReference: {fileID: 0} - target: {fileID: 6623383021047389338, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -8022,7 +8022,7 @@ PrefabInstance: - target: {fileID: 6623383021047389338, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: -203.78397 + value: -205.73813 objectReference: {fileID: 0} - target: {fileID: 6641636986311977719, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -8239,12 +8239,12 @@ PrefabInstance: - target: {fileID: 7359357530136689016, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.x - value: -304.40002 + value: -308.2 objectReference: {fileID: 0} - target: {fileID: 7359357530136689016, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: m_AnchoredPosition.y - value: -16.199951 + value: -22 objectReference: {fileID: 0} - target: {fileID: 7376892113393236158, guid: 9963fec33e379324db2affcb3f83332f, type: 3} @@ -9412,6 +9412,16 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 9055551517361465025, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -300 + objectReference: {fileID: 0} + - target: {fileID: 9055551517361465025, guid: 9963fec33e379324db2affcb3f83332f, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -22 + objectReference: {fileID: 0} - target: {fileID: 9055551517361465053, guid: 9963fec33e379324db2affcb3f83332f, type: 3} propertyPath: hoverSize.x diff --git a/Assets/Sprites/UI/Icons/UI_Icons.spriteatlasv2.meta b/Assets/Sprites/UI/Icons/UI_Icons.spriteatlasv2.meta index bb579bf18..f4a4f46b9 100644 --- a/Assets/Sprites/UI/Icons/UI_Icons.spriteatlasv2.meta +++ b/Assets/Sprites/UI/Icons/UI_Icons.spriteatlasv2.meta @@ -29,7 +29,7 @@ SpriteAtlasImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 packingSettings: serializedVersion: 2 - padding: 4 + padding: 8 blockOffset: 1 allowAlphaSplitting: 0 enableRotation: 0