From 54e8a3677654bf8af9e493df8965a1586101160f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com> Date: Thu, 12 Jan 2023 21:13:57 +0100 Subject: [PATCH] refactor: unify and move factIcons --- .../Resources/Prefabs/UI/Icons/FactIcons.meta | 8 +++++ .../{ => FactIcons}/AngleCircleLine.prefab | 19 ++-------- .../AngleCircleLine.prefab.meta | 0 .../Icons/{ => FactIcons}/AngleDisplay.prefab | 13 ------- .../{ => FactIcons}/AngleDisplay.prefab.meta | 0 .../{ => FactIcons}/AreaCircle_perfab.prefab | 21 +++-------- .../AreaCircle_perfab.prefab.meta | 0 .../Icons/{ => FactIcons}/CircleFact.prefab | 17 ++------- .../{ => FactIcons}/CircleFact.prefab.meta | 0 .../{ => FactIcons}/ConeVolume_prefab.prefab | 21 +++-------- .../ConeVolume_prefab.prefab.meta | 0 .../{ => FactIcons}/CylinderVolume.prefab | 21 +++-------- .../CylinderVolume.prefab.meta | 0 .../Icons/{ => FactIcons}/DisplayLine.prefab | 13 ------- .../{ => FactIcons}/DisplayLine.prefab.meta | 0 .../{ => FactIcons}/DisplayOnLine.prefab | 13 ------- .../{ => FactIcons}/DisplayOnLine.prefab.meta | 0 .../Icons/{ => FactIcons}/DisplayPoint.prefab | 13 ------- .../{ => FactIcons}/DisplayPoint.prefab.meta | 0 .../{ => FactIcons}/DistanceDisplay.prefab | 15 +------- .../DistanceDisplay.prefab.meta | 0 .../{ => FactIcons}/EqualCirclesPrefab.prefab | 21 +++-------- .../EqualCirclesPrefab.prefab.meta | 0 .../{ => FactIcons}/OnCirclePreFab.prefab | 17 ++------- .../OnCirclePreFab.prefab.meta | 0 .../OrthogonalCircleAnglePrefab.prefab | 21 +++-------- .../OrthogonalCircleAnglePrefab.prefab.meta | 0 .../{ => FactIcons}/ParallelLinePrefab.prefab | 13 ------- .../ParallelLinePrefab.prefab.meta | 0 .../Icons/{ => FactIcons}/RadiusPrefab.prefab | 21 +++-------- .../{ => FactIcons}/RadiusPrefab.prefab.meta | 0 .../RectangleFactPrefab.prefab | 17 ++------- .../RectangleFactPrefab.prefab.meta | 0 .../{ => FactIcons}/RightAnglePrefab.prefab | 21 +++-------- .../RightAnglePrefab.prefab.meta | 0 .../{ => FactIcons}/TestFactPrefab.prefab | 35 ++++++------------- .../TestFactPrefab.prefab.meta | 0 .../TruncatedConeVolumePrefab.prefab | 21 +++-------- .../TruncatedConeVolumePrefab.prefab.meta | 0 .../UnequalCirclesPrefab.prefab | 21 +++-------- .../UnequalCirclesPrefab.prefab.meta | 0 .../UI/FactExplorer/OpenFactExplorer.cs.meta | 4 ++- 42 files changed, 68 insertions(+), 318 deletions(-) create mode 100644 Assets/Resources/Prefabs/UI/Icons/FactIcons.meta rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AngleCircleLine.prefab (96%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AngleCircleLine.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AngleDisplay.prefab (97%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AngleDisplay.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AreaCircle_perfab.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/AreaCircle_perfab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/CircleFact.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/CircleFact.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/ConeVolume_prefab.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/ConeVolume_prefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/CylinderVolume.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/CylinderVolume.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayLine.prefab (95%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayLine.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayOnLine.prefab (97%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayOnLine.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayPoint.prefab (95%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DisplayPoint.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DistanceDisplay.prefab (96%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/DistanceDisplay.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/EqualCirclesPrefab.prefab (96%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/EqualCirclesPrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/OnCirclePreFab.prefab (95%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/OnCirclePreFab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/OrthogonalCircleAnglePrefab.prefab (96%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/OrthogonalCircleAnglePrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/ParallelLinePrefab.prefab (97%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/ParallelLinePrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RadiusPrefab.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RadiusPrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RectangleFactPrefab.prefab (97%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RectangleFactPrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RightAnglePrefab.prefab (97%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/RightAnglePrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/TestFactPrefab.prefab (90%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/TestFactPrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/TruncatedConeVolumePrefab.prefab (94%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/TruncatedConeVolumePrefab.prefab.meta (100%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/UnequalCirclesPrefab.prefab (96%) rename Assets/Resources/Prefabs/UI/Icons/{ => FactIcons}/UnequalCirclesPrefab.prefab.meta (100%) diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta new file mode 100644 index 00000000..f6f9d382 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27c5ee9b1ba023643ad2fa6b2ed311b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleCircleLine.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleCircleLine.prefab index bcc50610..4678bcd7 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleCircleLine.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 2609551024752603468} - component: {fileID: 4177212962186602924} - component: {fileID: 7571158064837864710} - - component: {fileID: 5331562473041691776} - component: {fileID: 5437783688132341522} - component: {fileID: 7217286308176857857} - m_Layer: 0 + m_Layer: 5 m_Name: AngleCircleLine m_TagString: Untagged m_Icon: {fileID: 0} @@ -187,7 +186,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4902928549420802332} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2609551024752603468 MonoBehaviour: m_ObjectHideFlags: 0 @@ -230,7 +229,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2609551024752603468} --- !u!114 &7571158064837864710 MonoBehaviour: m_ObjectHideFlags: 0 @@ -244,18 +243,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &5331562473041691776 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4902928549420802332} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &5437783688132341522 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleCircleLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AngleCircleLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleCircleLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleDisplay.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleDisplay.prefab index e0572bca..abcbbbd5 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleDisplay.prefab @@ -417,7 +417,6 @@ GameObject: - component: {fileID: 6643637775379894487} - component: {fileID: 6643637775379894486} - component: {fileID: 5040239873163969181} - - component: {fileID: 225831940989964384} - component: {fileID: 114522817932931646} - component: {fileID: 3011926265969909947} - component: {fileID: 3573135846559875297} @@ -502,18 +501,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: imageToChange: {fileID: 6643637775379894486} ---- !u!225 &225831940989964384 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6643637775379894484} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &114522817932931646 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleDisplay.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AngleDisplay.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AngleDisplay.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AreaCircle_perfab.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AreaCircle_perfab.prefab index 9391cebc..1d129ae4 100644 --- a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AreaCircle_perfab.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 4086712909713098893} - component: {fileID: 4474082756159207727} - component: {fileID: 6928182635216917115} - - component: {fileID: 8310254113192487485} - component: {fileID: 6811931286641226162} - component: {fileID: 4444078412922319222} - m_Layer: 0 + m_Layer: 5 m_Name: AreaCircle_perfab m_TagString: Untagged m_Icon: {fileID: 0} @@ -186,7 +185,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7016901710118546043} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &4086712909713098893 MonoBehaviour: m_ObjectHideFlags: 0 @@ -208,7 +207,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: d03f90cb79e6fba4fb25edaf74ffeadd, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -229,7 +228,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 4086712909713098893} --- !u!114 &6928182635216917115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,18 +242,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &8310254113192487485 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7016901710118546043} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &6811931286641226162 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/AreaCircle_perfab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/AreaCircle_perfab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/AreaCircle_perfab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CircleFact.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/CircleFact.prefab index a50b0f60..f9979605 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CircleFact.prefab @@ -148,7 +148,6 @@ GameObject: - component: {fileID: 1894013120851118185} - component: {fileID: 5132214578572184594} - component: {fileID: 3896398116007953758} - - component: {fileID: 6482343618895123747} - component: {fileID: 1602337205070616824} - component: {fileID: -8545268462245846538} m_Layer: 5 @@ -176,7 +175,7 @@ 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: 4.4, y: 4.6} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6436200217209768079 @@ -186,7 +185,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6636443472981757786} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &1894013120851118185 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,18 +242,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &6482343618895123747 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6636443472981757786} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &1602337205070616824 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CircleFact.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/CircleFact.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/CircleFact.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ConeVolume_prefab.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/ConeVolume_prefab.prefab index 41d2ed33..9d3da734 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ConeVolume_prefab.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 3047192119255630295} - component: {fileID: 4076526528120032799} - component: {fileID: 4263320076605886561} - - component: {fileID: 3829202662460982349} - component: {fileID: 2650353447837694094} - component: {fileID: -1328819392998620038} - m_Layer: 0 + m_Layer: 5 m_Name: ConeVolume_prefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -186,7 +185,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2523593828849809055} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3047192119255630295 MonoBehaviour: m_ObjectHideFlags: 0 @@ -208,7 +207,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f580ba9d4e3825d49a5a7907d2a3f0c1, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -229,7 +228,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3047192119255630295} --- !u!114 &4263320076605886561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,18 +242,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &3829202662460982349 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2523593828849809055} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &2650353447837694094 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ConeVolume_prefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/ConeVolume_prefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/ConeVolume_prefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CylinderVolume.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/CylinderVolume.prefab index 6770dcb8..655c3ef0 100644 --- a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CylinderVolume.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 8448132399530171869} - component: {fileID: 4549857745383475350} - component: {fileID: -7338472263132780475} - - component: {fileID: 7240967210820331247} - component: {fileID: 2130710490396271644} - component: {fileID: 8056345640559627384} - m_Layer: 0 + m_Layer: 5 m_Name: CylinderVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -186,7 +185,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5287418535931939099} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &8448132399530171869 MonoBehaviour: m_ObjectHideFlags: 0 @@ -208,7 +207,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 352d7dd2edb65f542aba25be27d20d98, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -229,7 +228,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 8448132399530171869} --- !u!114 &-7338472263132780475 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,18 +242,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &7240967210820331247 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5287418535931939099} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &2130710490396271644 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/CylinderVolume.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/CylinderVolume.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/CylinderVolume.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab similarity index 95% rename from Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab index 2387c591..85aeaec6 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab @@ -148,7 +148,6 @@ GameObject: - component: {fileID: 6811289727063397518} - component: {fileID: 6586968856821406842} - component: {fileID: 3914868910838030883} - - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} - component: {fileID: 7981125183230312854} m_Layer: 5 @@ -243,18 +242,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &4479822174921760807 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7510387096843212865} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &7215917396402112958 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab index 76fa0389..330c9820 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab @@ -283,7 +283,6 @@ GameObject: - component: {fileID: 7297490523703237233} - component: {fileID: 96998878642029046} - component: {fileID: 979255380955983068} - - component: {fileID: 425851386909748952} - component: {fileID: 6910630412647778113} - component: {fileID: -4875952770271437981} m_Layer: 5 @@ -379,18 +378,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &425851386909748952 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6050914136827205310} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &6910630412647778113 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayOnLine.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab similarity index 95% rename from Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab index 61637d51..a3b84809 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 858001163752551617} - component: {fileID: 8408536798623030161} - component: {fileID: 114132791164475416} - - component: {fileID: 225408562469983378} - component: {fileID: 114984628052382182} - component: {fileID: -6287292158833946431} m_Layer: 5 @@ -108,18 +107,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &225408562469983378 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 858001163752551619} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &114984628052382182 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DisplayPoint.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DistanceDisplay.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DistanceDisplay.prefab index f2273b0f..a53eb4d3 100644 --- a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DistanceDisplay.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 1241458608524046696} - component: {fileID: 506299453989990893} - component: {fileID: 2785940634305866798} - - component: {fileID: 9035428711241438515} - component: {fileID: 114476148939060428} - component: {fileID: 6775995842619458444} m_Layer: 5 @@ -42,7 +41,7 @@ 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: -10.1, y: 94.9} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2318968178306689515 @@ -109,18 +108,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &9035428711241438515 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4221381813544557775} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &114476148939060428 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DistanceDisplay.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/DistanceDisplay.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/DistanceDisplay.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/EqualCirclesPrefab.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/EqualCirclesPrefab.prefab index a49c4d99..3fd0b1f8 100644 --- a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/EqualCirclesPrefab.prefab @@ -283,10 +283,9 @@ GameObject: - component: {fileID: 2180110340788369784} - component: {fileID: 1285080900581311433} - component: {fileID: 6805943141472748426} - - component: {fileID: 3549802384644774303} - component: {fileID: 4430445033801091530} - component: {fileID: -8548468547709009186} - m_Layer: 0 + m_Layer: 5 m_Name: EqualCirclesPrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -322,7 +321,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7523305359074541435} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2180110340788369784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -344,7 +343,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ad920a8c90fd4c74ba95809d3e14e6b7, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -365,7 +364,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2180110340788369784} --- !u!114 &6805943141472748426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -379,18 +378,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &3549802384644774303 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7523305359074541435} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &4430445033801091530 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/EqualCirclesPrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/EqualCirclesPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/EqualCirclesPrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OnCirclePreFab.prefab similarity index 95% rename from Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/OnCirclePreFab.prefab index 7fb3de69..30d1c19d 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OnCirclePreFab.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 2122753052771730408} - component: {fileID: 639140626255626101} - component: {fileID: 6441113378387087702} - - component: {fileID: -8964638906401905625} - component: {fileID: 9073127243885313005} - component: {fileID: -5954085419867829670} m_Layer: 5 @@ -51,7 +50,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2115817999818309900} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2122753052771730408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -95,7 +94,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2122753052771730408} --- !u!114 &6441113378387087702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,18 +108,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &-8964638906401905625 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2115817999818309900} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &9073127243885313005 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OnCirclePreFab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/OnCirclePreFab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/OnCirclePreFab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OrthogonalCircleAnglePrefab.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/OrthogonalCircleAnglePrefab.prefab index c3b6dd16..84931044 100644 --- a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OrthogonalCircleAnglePrefab.prefab @@ -283,10 +283,9 @@ GameObject: - component: {fileID: 3070659305120604608} - component: {fileID: 7705752672375263960} - component: {fileID: 8593937097866258120} - - component: {fileID: 8996773866579933820} - component: {fileID: 930378118197085978} - component: {fileID: -4766878545130701298} - m_Layer: 0 + m_Layer: 5 m_Name: OrthogonalCircleAnglePrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -322,7 +321,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8554350198830106250} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3070659305120604608 MonoBehaviour: m_ObjectHideFlags: 0 @@ -344,7 +343,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 66ba1c16426bcaf49baab37f47c67b47, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -365,7 +364,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3070659305120604608} --- !u!114 &8593937097866258120 MonoBehaviour: m_ObjectHideFlags: 0 @@ -379,18 +378,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &8996773866579933820 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8554350198830106250} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &930378118197085978 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/OrthogonalCircleAnglePrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/OrthogonalCircleAnglePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/OrthogonalCircleAnglePrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ParallelLinePrefab.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/ParallelLinePrefab.prefab index 41541468..bb78a05e 100644 --- a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ParallelLinePrefab.prefab @@ -148,7 +148,6 @@ GameObject: - component: {fileID: 6811289727063397518} - component: {fileID: 6586968856821406842} - component: {fileID: 3914868910838030883} - - component: {fileID: 4479822174921760807} - component: {fileID: 7215917396402112958} - component: {fileID: 41121149337675280} m_Layer: 5 @@ -244,18 +243,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &4479822174921760807 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7510387096843212865} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &7215917396402112958 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/ParallelLinePrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/ParallelLinePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/ParallelLinePrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RadiusPrefab.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RadiusPrefab.prefab index adc98aea..426ce190 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RadiusPrefab.prefab @@ -13,10 +13,9 @@ GameObject: - component: {fileID: 6545787433352254111} - component: {fileID: 7450556920702625537} - component: {fileID: 173279308733449335} - - component: {fileID: 6544775749910269078} - component: {fileID: 3955180868949107883} - component: {fileID: -497146227597533108} - m_Layer: 0 + m_Layer: 5 m_Name: RadiusPrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -51,7 +50,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2513701074329712390} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &6545787433352254111 MonoBehaviour: m_ObjectHideFlags: 0 @@ -73,7 +72,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: b85e914ced337ad4bbc40ad74c37da14, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -94,7 +93,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 6545787433352254111} --- !u!114 &173279308733449335 MonoBehaviour: m_ObjectHideFlags: 0 @@ -108,18 +107,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &6544775749910269078 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2513701074329712390} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &3955180868949107883 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RadiusPrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RadiusPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RadiusPrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RectangleFactPrefab.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RectangleFactPrefab.prefab index 7c45a425..5b49877c 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RectangleFactPrefab.prefab @@ -553,7 +553,6 @@ GameObject: - component: {fileID: 3266031038391391049} - component: {fileID: 7956205528156386179} - component: {fileID: 2163234623969663275} - - component: {fileID: 8026609014010234375} - component: {fileID: 4558040300745642744} - component: {fileID: -1221418573146676442} m_Layer: 5 @@ -594,7 +593,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8156936215466465834} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &3266031038391391049 MonoBehaviour: m_ObjectHideFlags: 0 @@ -637,7 +636,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 3266031038391391049} --- !u!114 &2163234623969663275 MonoBehaviour: m_ObjectHideFlags: 0 @@ -651,18 +650,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &8026609014010234375 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8156936215466465834} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &4558040300745642744 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RectangleFactPrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RectangleFactPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RectangleFactPrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RightAnglePrefab.prefab similarity index 97% rename from Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RightAnglePrefab.prefab index 6834abf7..0982d6bd 100644 --- a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RightAnglePrefab.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 5767345106027831726} - component: {fileID: 5822687220706391381} - component: {fileID: 3794236076833855767} - - component: {fileID: 8245241791380942728} - component: {fileID: 8661743446683420805} - component: {fileID: 4176151758276728228} - m_Layer: 0 + m_Layer: 5 m_Name: RightAnglePrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -188,7 +187,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3080888058940174091} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &5767345106027831726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -210,7 +209,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 2f972a9b017f79a43a7e95eeddebd66b, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -231,7 +230,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 5767345106027831726} --- !u!114 &3794236076833855767 MonoBehaviour: m_ObjectHideFlags: 0 @@ -245,18 +244,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &8245241791380942728 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3080888058940174091} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &8661743446683420805 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/RightAnglePrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/RightAnglePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/RightAnglePrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TestFactPrefab.prefab similarity index 90% rename from Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/TestFactPrefab.prefab index ca649742..f9715116 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TestFactPrefab.prefab @@ -11,12 +11,11 @@ GameObject: - component: {fileID: 6755804354927699367} - component: {fileID: 3779590155575851460} - component: {fileID: 5078315713010028456} + - component: {fileID: -5313503588223420466} - component: {fileID: 2785454548719711828} - - component: {fileID: 156028697059819196} - component: {fileID: 1224931104090066081} - - component: {fileID: -5313503588223420466} - component: {fileID: 7299521122061085080} - m_Layer: 0 + m_Layer: 5 m_Name: TestFactPrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -50,7 +49,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2846439484187545958} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &5078315713010028456 MonoBehaviour: m_ObjectHideFlags: 0 @@ -81,7 +80,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2785454548719711828 +--- !u!114 &-5313503588223420466 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -90,23 +89,11 @@ MonoBehaviour: m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} + m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - dragged: 0 ---- !u!225 &156028697059819196 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2846439484187545958} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1224931104090066081 + imageToChange: {fileID: 5078315713010028456} +--- !u!114 &2785454548719711828 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -115,10 +102,11 @@ MonoBehaviour: m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} + m_Script: {fileID: 11500000, guid: a091cb23127eb7347955cb7f747af431, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &-5313503588223420466 + dragged: 0 +--- !u!114 &1224931104090066081 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -127,10 +115,9 @@ MonoBehaviour: m_GameObject: {fileID: 2846439484187545958} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} + m_Script: {fileID: 11500000, guid: ed0bcd3d8d9996d4f86c0a2b8b71c6bf, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} --- !u!114 &7299521122061085080 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TestFactPrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/TestFactPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/TestFactPrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TruncatedConeVolumePrefab.prefab similarity index 94% rename from Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/TruncatedConeVolumePrefab.prefab index 6b933ce8..6e83d02b 100644 --- a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TruncatedConeVolumePrefab.prefab @@ -13,10 +13,9 @@ GameObject: - component: {fileID: 2999154800373574638} - component: {fileID: 5477813449890952819} - component: {fileID: 6431159876548220859} - - component: {fileID: 5268227492380838391} - component: {fileID: 4468595272332714251} - component: {fileID: 3888340986020047728} - m_Layer: 0 + m_Layer: 5 m_Name: TruncatedConeVolumePrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -51,7 +50,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4123133807278660472} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &2999154800373574638 MonoBehaviour: m_ObjectHideFlags: 0 @@ -73,7 +72,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: fde0a14086151274a9d464a3d51c5e0f, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -94,7 +93,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 2999154800373574638} --- !u!114 &6431159876548220859 MonoBehaviour: m_ObjectHideFlags: 0 @@ -108,18 +107,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &5268227492380838391 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4123133807278660472} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &4468595272332714251 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/TruncatedConeVolumePrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/TruncatedConeVolumePrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/TruncatedConeVolumePrefab.prefab.meta diff --git a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/UnequalCirclesPrefab.prefab similarity index 96% rename from Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/UnequalCirclesPrefab.prefab index f4bed286..86766154 100644 --- a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/UnequalCirclesPrefab.prefab @@ -148,10 +148,9 @@ GameObject: - component: {fileID: 7403282225673375912} - component: {fileID: 3225367128346546047} - component: {fileID: 4056140006323214235} - - component: {fileID: 8957209247582476496} - component: {fileID: -6417425987847613228} - component: {fileID: -6842305447839815895} - m_Layer: 0 + m_Layer: 5 m_Name: UnequalCirclesPrefab m_TagString: Untagged m_Icon: {fileID: 0} @@ -187,7 +186,7 @@ CanvasRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5769925203401971992} - m_CullTransparentMesh: 1 + m_CullTransparentMesh: 0 --- !u!114 &7403282225673375912 MonoBehaviour: m_ObjectHideFlags: 0 @@ -209,7 +208,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 269651011d5ec79458964edbef59ae70, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -230,7 +229,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3} m_Name: m_EditorClassIdentifier: - imageToChange: {fileID: 0} + imageToChange: {fileID: 7403282225673375912} --- !u!114 &4056140006323214235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -244,18 +243,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: dragged: 0 ---- !u!225 &8957209247582476496 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5769925203401971992} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 --- !u!114 &-6417425987847613228 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab.meta b/Assets/Resources/Prefabs/UI/Icons/FactIcons/UnequalCirclesPrefab.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/UI/Icons/UnequalCirclesPrefab.prefab.meta rename to Assets/Resources/Prefabs/UI/Icons/FactIcons/UnequalCirclesPrefab.prefab.meta diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta index 74e8ec14..13ca88be 100644 --- a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta +++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs.meta @@ -3,7 +3,9 @@ guid: a1ed516d861fa2c45a2b1767d1217acb MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a, + type: 3} executionOrder: 0 icon: {instanceID: 0} userData: -- GitLab