From 510b4f23a9958a16cfd8c3b9ee8a6272d25ca5c3 Mon Sep 17 00:00:00 2001
From: MaZiFAU <63099053+MaZiFAU@users.noreply.github.com>
Date: Sun, 2 Jul 2023 23:53:49 +0200
Subject: [PATCH] Refactoring Hint Animation;
Refactoring:
-Eventbased Hint animation extended to sprites
+->Added FactObjectUI
+->Moved FactWrapper tree in own folder
+->Used RectMask (does not work with normal one)
---
Assets/Materials/SpriteDefault.mat | 88 ++++++++++++
Assets/Materials/SpriteDefault.mat.meta | 8 ++
Assets/Materials/SpriteHint.mat | 88 ++++++++++++
Assets/Materials/SpriteHint.mat.meta | 8 ++
Assets/Materials/SpriteSelected.mat | 88 ++++++++++++
Assets/Materials/SpriteSelected.mat.meta | 8 ++
Assets/Materials/SpriteSolution.mat | 88 ++++++++++++
Assets/Materials/SpriteSolution.mat.meta | 8 ++
Assets/Resources/Prefabs/Facts/Circle.prefab | 16 +--
Assets/Resources/Prefabs/Facts/Point.prefab | 73 +---------
Assets/Resources/Prefabs/Facts/Ring.prefab | 6 +-
Assets/Resources/Prefabs/GlobalObject.prefab | 2 +-
.../Prefabs/TestPrefabs/HidingCanvas.prefab | 55 ++++---
.../ScrollPrefabTestRendered.prefab | 41 +++++-
.../Prefabs/UI/Facts/Factscreen.prefab | 2 +-
.../UI/Icons/FactIcons/DisplayAngle.prefab | 66 ++++-----
.../FactIcons/DisplayAngleCircleLine.prefab | 58 +++-----
.../Icons/FactIcons/DisplayAreaCircle.prefab | 54 +++----
.../UI/Icons/FactIcons/DisplayCircle.prefab | 53 +++----
.../Icons/FactIcons/DisplayConeVolume.prefab | 54 +++----
.../FactIcons/DisplayCylinderVolume.prefab | 54 +++----
.../UI/Icons/FactIcons/DisplayDistance.prefab | 60 ++++----
.../FactIcons/DisplayEqualCircles.prefab | 58 +++-----
.../UI/Icons/FactIcons/DisplayLine.prefab | 54 +++----
.../UI/Icons/FactIcons/DisplayOnCircle.prefab | 54 +++----
.../UI/Icons/FactIcons/DisplayOnLine.prefab | 58 +++-----
.../DisplayOrthogonalCircleLine.prefab | 58 +++-----
.../FactIcons/DisplayParallelLine.prefab | 58 +++-----
.../UI/Icons/FactIcons/DisplayPoint.prefab | 54 +++----
.../UI/Icons/FactIcons/DisplayRadius.prefab | 54 +++----
.../FactIcons/DisplayRectangleFact.prefab | 66 ++++-----
.../Icons/FactIcons/DisplayRightAngle.prefab | 62 ++++----
.../UI/Icons/FactIcons/DisplayTestFact.prefab | 54 +++----
.../DisplayTruncatedConeVolume.prefab | 54 +++----
.../FactIcons/DisplayUnequalCircles.prefab | 58 +++-----
.../Prefabs/UI/Ingame/HidingCanvas.prefab | 55 +++----
.../Scrolls/ScrollParameterDisplay 1.prefab | 26 ++--
.../Prefabs/UI/Scrolls/ScrollPrefab.prefab | 136 +++++++++---------
.../InteractionEngine/CommunicationEvents.cs | 2 +-
.../FactHandling/FactManager.cs | 2 +-
.../FactHandling/FactSpawner.cs | 10 +-
.../FactHandling/FactWrapper.meta | 8 ++
.../AttachedPositionFunctionBehaviour.cs | 0
.../AttachedPositionFunctionBehaviour.cs.meta | 0
.../{ => FactWrapper}/FactObject.cs | 100 ++++++-------
.../FactWrapper/FactObject.cs.meta} | 2 +-
.../FactHandling/FactWrapper/FactObject3D.cs | 82 +++++++++++
.../FactObject3D.cs.meta} | 0
.../FactHandling/FactWrapper/FactObjectUI.cs | 44 ++++++
.../FactWrapper/FactObjectUI.cs.meta | 15 ++
.../{ => FactWrapper}/FactWrapper.cs | 20 ++-
.../{ => FactWrapper}/FactWrapper.cs.meta | 0
.../FactWrapper}/RenderedScrollFact.cs | 33 ++---
.../FactWrapper}/RenderedScrollFact.cs.meta | 0
.../FactHandling/Facts/Fact.cs | 2 +-
.../InteractionEngine/ImageHintAnimation.cs | 46 ------
.../Scripts/InteractionEngine/ShinyThings.cs | 20 +--
Assets/Scripts/InventoryStuff/DisplayFacts.cs | 27 ++--
.../Scripts/InventoryStuff/DisplayScrolls.cs | 2 +
.../Scripts/InventoryStuff/ScrollDetails.cs | 24 +---
Assets/Scripts/Loading/Stage.cs | 2 +-
.../UI/FactExplorer/FactFavorisation.cs | 4 +-
.../UI/FactExplorer/OpenFactExplorer.cs | 4 +-
Assets/Scripts/UI/InGame/PopupBehavior.cs | 24 +---
Assets/Scripts/UI/MainMenue/ListLoader.cs | 13 +-
.../Extensions/IEnumeratorExtensions.cs | 2 +-
66 files changed, 1294 insertions(+), 1131 deletions(-)
create mode 100644 Assets/Materials/SpriteDefault.mat
create mode 100644 Assets/Materials/SpriteDefault.mat.meta
create mode 100644 Assets/Materials/SpriteHint.mat
create mode 100644 Assets/Materials/SpriteHint.mat.meta
create mode 100644 Assets/Materials/SpriteSelected.mat
create mode 100644 Assets/Materials/SpriteSelected.mat.meta
create mode 100644 Assets/Materials/SpriteSolution.mat
create mode 100644 Assets/Materials/SpriteSolution.mat.meta
create mode 100644 Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.meta
rename Assets/Scripts/InteractionEngine/{TBD => FactHandling/FactWrapper}/AttachedPositionFunctionBehaviour.cs (100%)
rename Assets/Scripts/InteractionEngine/{TBD => FactHandling/FactWrapper}/AttachedPositionFunctionBehaviour.cs.meta (100%)
rename Assets/Scripts/InteractionEngine/FactHandling/{ => FactWrapper}/FactObject.cs (55%)
rename Assets/Scripts/InteractionEngine/{ImageHintAnimation.cs.meta => FactHandling/FactWrapper/FactObject.cs.meta} (83%)
create mode 100644 Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs
rename Assets/Scripts/InteractionEngine/FactHandling/{FactObject.cs.meta => FactWrapper/FactObject3D.cs.meta} (100%)
create mode 100644 Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs
create mode 100644 Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs.meta
rename Assets/Scripts/InteractionEngine/FactHandling/{ => FactWrapper}/FactWrapper.cs (82%)
rename Assets/Scripts/InteractionEngine/FactHandling/{ => FactWrapper}/FactWrapper.cs.meta (100%)
rename Assets/Scripts/{InventoryStuff => InteractionEngine/FactHandling/FactWrapper}/RenderedScrollFact.cs (75%)
rename Assets/Scripts/{InventoryStuff => InteractionEngine/FactHandling/FactWrapper}/RenderedScrollFact.cs.meta (100%)
delete mode 100644 Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
diff --git a/Assets/Materials/SpriteDefault.mat b/Assets/Materials/SpriteDefault.mat
new file mode 100644
index 00000000..3af469c5
--- /dev/null
+++ b/Assets/Materials/SpriteDefault.mat
@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpriteDefault
+ m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/SpriteDefault.mat.meta b/Assets/Materials/SpriteDefault.mat.meta
new file mode 100644
index 00000000..697a2068
--- /dev/null
+++ b/Assets/Materials/SpriteDefault.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3420edeac2b11384b9977bd98f565b24
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/SpriteHint.mat b/Assets/Materials/SpriteHint.mat
new file mode 100644
index 00000000..6700102e
--- /dev/null
+++ b/Assets/Materials/SpriteHint.mat
@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpriteHint
+ m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+ - _Color: {r: 0.93333334, g: 0.39215687, b: 0.03137255, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/SpriteHint.mat.meta b/Assets/Materials/SpriteHint.mat.meta
new file mode 100644
index 00000000..f0560747
--- /dev/null
+++ b/Assets/Materials/SpriteHint.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 923bc3e7bd8ae2745859a620359be2f8
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/SpriteSelected.mat b/Assets/Materials/SpriteSelected.mat
new file mode 100644
index 00000000..b19efca3
--- /dev/null
+++ b/Assets/Materials/SpriteSelected.mat
@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpriteSelected
+ m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+ - _Color: {r: 1, g: 1, b: 0, a: 0.11372549}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/SpriteSelected.mat.meta b/Assets/Materials/SpriteSelected.mat.meta
new file mode 100644
index 00000000..84a47de9
--- /dev/null
+++ b/Assets/Materials/SpriteSelected.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4a2ffc31b2faf446bf2a86047fbc9f8
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Materials/SpriteSolution.mat b/Assets/Materials/SpriteSolution.mat
new file mode 100644
index 00000000..fcded7af
--- /dev/null
+++ b/Assets/Materials/SpriteSolution.mat
@@ -0,0 +1,88 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: SpriteSolution
+ m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _ColorMask: 15
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
+ - _UVSec: 0
+ - _UseUIAlphaClip: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
+ - _Color: {r: 0.99215686, g: 1, b: 0, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Materials/SpriteSolution.mat.meta b/Assets/Materials/SpriteSolution.mat.meta
new file mode 100644
index 00000000..02001bff
--- /dev/null
+++ b/Assets/Materials/SpriteSolution.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 79cc7db91c9641d4aa8a1513d6ca85d1
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Facts/Circle.prefab b/Assets/Resources/Prefabs/Facts/Circle.prefab
index fbdbd506..e9b35213 100644
--- a/Assets/Resources/Prefabs/Facts/Circle.prefab
+++ b/Assets/Resources/Prefabs/Facts/Circle.prefab
@@ -115,13 +115,13 @@ MonoBehaviour:
_URI:
FactText: []
StringLabelFormats: []
- renderer:
- - {fileID: 5284903402926663935}
- - {fileID: 1078883255209641429}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ renderer:
+ - {fileID: 5284903402926663935}
+ - {fileID: 1078883255209641429}
--- !u!1 &4682201382595328041
GameObject:
m_ObjectHideFlags: 0
@@ -403,13 +403,13 @@ MonoBehaviour:
_URI:
FactText: []
StringLabelFormats: []
- renderer:
- - {fileID: 1078883255209641429}
- - {fileID: 5284903402926663935}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ renderer:
+ - {fileID: 1078883255209641429}
+ - {fileID: 5284903402926663935}
--- !u!1 &6839596689016440457
GameObject:
m_ObjectHideFlags: 0
@@ -479,9 +479,9 @@ MonoBehaviour:
_URI:
FactText: []
StringLabelFormats: []
- renderer:
- - {fileID: 1078883255209641429}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ renderer:
+ - {fileID: 1078883255209641429}
diff --git a/Assets/Resources/Prefabs/Facts/Point.prefab b/Assets/Resources/Prefabs/Facts/Point.prefab
index 8fb17b2d..8005fd50 100644
--- a/Assets/Resources/Prefabs/Facts/Point.prefab
+++ b/Assets/Resources/Prefabs/Facts/Point.prefab
@@ -36,7 +36,6 @@ Transform:
- {fileID: 338274751687282010}
- {fileID: 5939570736350582895}
- {fileID: 206589483256967431}
- - {fileID: 1897634834899172406}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -120,12 +119,12 @@ MonoBehaviour:
- {fileID: 4028707725789292921}
StringLabelFormats:
- '{0}'
- renderer:
- - {fileID: 1075046474335495899}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ renderer:
+ - {fileID: 1075046474335495899}
--- !u!114 &6183343481027254878
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -327,72 +326,6 @@ MonoBehaviour:
Cam1: {fileID: 0}
Cam2: {fileID: 0}
BackUPCam: {fileID: 0}
---- !u!1 &3501726312507320707
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1897634834899172406}
- - component: {fileID: 2282314938058693146}
- - component: {fileID: -1711701745619400267}
- m_Layer: 10
- m_Name: SnapSphere
- m_TagString: SnapZone
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &1897634834899172406
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3501726312507320707}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 7110486964728869325}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!135 &2282314938058693146
-SphereCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3501726312507320707}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Radius: 0.5
- m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &-1711701745619400267
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3501726312507320707}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _URI:
- FactText: []
- StringLabelFormats: []
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
--- !u!1 &7522635739010457072
GameObject:
m_ObjectHideFlags: 0
@@ -406,7 +339,7 @@ GameObject:
- component: {fileID: 8231516868387511546}
m_Layer: 10
m_Name: PointSphere
- m_TagString: Untagged
+ m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
diff --git a/Assets/Resources/Prefabs/Facts/Ring.prefab b/Assets/Resources/Prefabs/Facts/Ring.prefab
index 209d704c..982ebf81 100644
--- a/Assets/Resources/Prefabs/Facts/Ring.prefab
+++ b/Assets/Resources/Prefabs/Facts/Ring.prefab
@@ -291,12 +291,12 @@ MonoBehaviour:
_URI:
FactText: []
StringLabelFormats: []
- renderer:
- - {fileID: 4181090182545414655}
Default: {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2}
Selected: {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2}
Hint: {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2}
Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ renderer:
+ - {fileID: 4181090182545414655}
--- !u!64 &3274869260965504490
MeshCollider:
m_ObjectHideFlags: 0
@@ -501,11 +501,11 @@ MonoBehaviour:
- {fileID: 1254072669719294581}
StringLabelFormats:
- '{0}'
- renderer: []
Default: {fileID: 0}
Selected: {fileID: 0}
Hint: {fileID: 0}
Solution: {fileID: 0}
+ renderer: []
--- !u!1 &8117705180640636930
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/GlobalObject.prefab b/Assets/Resources/Prefabs/GlobalObject.prefab
index 88020dbe..6d9a0ec1 100644
--- a/Assets/Resources/Prefabs/GlobalObject.prefab
+++ b/Assets/Resources/Prefabs/GlobalObject.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_hintAnimationStartColor: {r: 0.9716981, g: 0.9266228, b: 0.1054201, a: 1}
_hintAnimationEndColor: {r: 0.972549, g: 0.6342677, b: 0.10588237, a: 0}
- _hintAnimationDuration: 3
+ _hintAnimationDuration: 4
_AnimationLerpDuration: 1
_StageAccomplished: {r: 0.029236369, g: 0.6886792, b: 0.041520078, a: 0.39215687}
_StageNotYetAccomplished: {r: 0.031372562, g: 0.4927269, b: 0.6901961, a: 0.39215687}
diff --git a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab
index 11d5e17d..edab7d4c 100644
--- a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab
@@ -644,7 +644,6 @@ GameObject:
- component: {fileID: 8004702056412215060}
- component: {fileID: 8004702056412215064}
- component: {fileID: 8004702056412215065}
- - component: {fileID: 8004702056412215062}
- component: {fileID: 8004702056412215063}
m_Layer: 5
m_Name: Scroll View
@@ -713,19 +712,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!114 &8004702056412215062
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8004702056412215061}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
--- !u!114 &8004702056412215063
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -901,8 +887,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8004702056544321748}
- - component: {fileID: 8004702056544321753}
- component: {fileID: 8004702056544321750}
+ - component: {fileID: 2000459927344004486}
+ - component: {fileID: 8004702056544321753}
- component: {fileID: 8004702056544321751}
m_Layer: 5
m_Name: Viewport
@@ -932,7 +919,15 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
---- !u!114 &8004702056544321753
+--- !u!222 &8004702056544321750
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8004702056544321749}
+ m_CullTransparentMesh: 0
+--- !u!114 &2000459927344004486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -941,18 +936,24 @@ MonoBehaviour:
m_GameObject: {fileID: 8004702056544321749}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ShowMaskGraphic: 0
---- !u!222 &8004702056544321750
-CanvasRenderer:
+ m_Padding: {x: 1, y: 0, z: 1, w: 0}
+ m_Softness: {x: 0, y: 0}
+--- !u!114 &8004702056544321753
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8004702056544321749}
- m_CullTransparentMesh: 0
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
--- !u!114 &8004702056544321751
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -960,7 +961,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8004702056544321749}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -2388,8 +2389,8 @@ MonoBehaviour:
type: 3}
mmtAnswerPopUp: {fileID: 6618856106128302243}
currentMmtAnswer:
- dynamicScrollDescriptionsActive: 1
- automaticHintGenerationActive: 1
+ DynamicScrollDescriptionsActive: 1
+ AutomaticHintGenerationActive: 1
--- !u!114 &8004702057798297409
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2937,17 +2938,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
preferredStartScrollName: OppositeLen
- tryScrollListTimes: 2
ScrollButtons: []
ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261,
type: 3}
DetailScreen: {fileID: 8004702057798297436}
scrollscreenContent: {fileID: 0}
- x_Start: -240
- y_Start: 200
- X_Pacece_Between_Items: 105
- y_Pacece_Between_Items: 105
- number_of_Column: 3
--- !u!1 &8004702058047913763
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab b/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab
index 1c9e0f7b..70689d8d 100644
--- a/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab
+++ b/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab
@@ -357,6 +357,7 @@ GameObject:
m_Component:
- component: {fileID: 2345328632624463996}
- component: {fileID: 2345328632624463993}
+ - component: {fileID: 656794626516865029}
- component: {fileID: 2345328632624463994}
- component: {fileID: 2345328632624463995}
- component: {fileID: 2345328632624463992}
@@ -395,12 +396,26 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2345328632624463997}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
+--- !u!114 &656794626516865029
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2345328632624463997}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
--- !u!222 &2345328632624463994
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -920,6 +935,7 @@ GameObject:
m_Component:
- component: {fileID: 2345328633255984844}
- component: {fileID: 2345328633255984841}
+ - component: {fileID: 2056174191413670760}
- component: {fileID: 2345328633255984842}
- component: {fileID: 2345328633255984843}
m_Layer: 5
@@ -957,12 +973,26 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2345328633255984845}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 0
+--- !u!114 &2056174191413670760
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2345328633255984845}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
--- !u!222 &2345328633255984842
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -978,7 +1008,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2345328633255984845}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -2150,9 +2180,10 @@ MonoBehaviour:
cursor: {fileID: 0}
parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93,
type: 3}
+ mmtAnswerPopUp: {fileID: 0}
currentMmtAnswer:
- dynamicScrollDescriptionsActive: 1
- automaticHintGenerationActive: 1
+ DynamicScrollDescriptionsActive: 1
+ AutomaticHintGenerationActive: 1
--- !u!1 &7146941621249359137
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab
index 83d0aba4..416b7d84 100644
--- a/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab
+++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen.prefab
@@ -493,7 +493,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -41183.812}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8823539307371861913
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab
index c6c82ac3..4f2b10c3 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngle.prefab
@@ -417,11 +417,10 @@ GameObject:
- component: {fileID: 6643637775379894487}
- component: {fileID: 6643637775379894486}
- component: {fileID: -3161002223909736641}
- - component: {fileID: 5040239873163969181}
- component: {fileID: 114522817932931646}
- - component: {fileID: 3011926265969909947}
- component: {fileID: 3573135846559875297}
- component: {fileID: -6877371120973083636}
+ - component: {fileID: 1315392727980462043}
m_Layer: 5
m_Name: DisplayAngle
m_TagString: Untagged
@@ -472,7 +471,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -502,20 +501,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &5040239873163969181
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6643637775379894484}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 6643637775379894486}
- imageToChangeDefaultColor: {r: 0, g: 0, b: 0, a: 0}
--- !u!114 &114522817932931646
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -529,7 +514,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &3011926265969909947
+--- !u!114 &3573135846559875297
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -538,24 +523,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6643637775379894484}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- _URI:
- FactText:
- - {fileID: 6643637774878492040}
- - {fileID: 6643637774014364123}
- - {fileID: 6643637775318367258}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- - '{3}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &3573135846559875297
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-6877371120973083636
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -564,12 +537,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6643637775379894484}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-6877371120973083636
+--- !u!114 &1315392727980462043
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -578,8 +551,21 @@ MonoBehaviour:
m_GameObject: {fileID: 6643637775379894484}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 6643637774878492040}
+ - {fileID: 6643637774014364123}
+ - {fileID: 6643637775318367258}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ - '{3}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 6643637775379894486}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab
index 37a8d3f1..764f5e82 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAngleCircleLine.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 4197087563868549049}
- component: {fileID: 2609551024752603468}
- component: {fileID: 5452397979381543940}
- - component: {fileID: 4177212962186602924}
- component: {fileID: 7571158064837864710}
- - component: {fileID: 5437783688132341522}
- component: {fileID: 7217286308176857857}
- component: {fileID: -1727938665847958892}
+ - component: {fileID: 7947066179341937669}
m_Layer: 5
m_Name: DisplayAngleCircleLine
m_TagString: Untagged
@@ -231,19 +230,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &4177212962186602924
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4902928549420802332}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 2609551024752603468}
--- !u!114 &7571158064837864710
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -257,7 +243,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &5437783688132341522
+--- !u!114 &7217286308176857857
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -266,21 +252,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4902928549420802332}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 2655091029813954744}
- - {fileID: 4452291738773295751}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &7217286308176857857
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-1727938665847958892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -289,12 +266,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4902928549420802332}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-1727938665847958892
+--- !u!114 &7947066179341937669
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -303,11 +280,22 @@ MonoBehaviour:
m_GameObject: {fileID: 4902928549420802332}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 2655091029813954744}
+ - {fileID: 4452291738773295751}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 2609551024752603468}
--- !u!1 &7854085605173747270
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab
index b4a33da9..81636fcb 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayAreaCircle.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 7075624231482420700}
- component: {fileID: 4086712909713098893}
- component: {fileID: -5329652376929928150}
- - component: {fileID: 4474082756159207727}
- component: {fileID: 6928182635216917115}
- - component: {fileID: 6811931286641226162}
- component: {fileID: 4444078412922319222}
- component: {fileID: 3337022138894200663}
+ - component: {fileID: 1943862004099041974}
m_Layer: 5
m_Name: DisplayAreaCircle
m_TagString: Untagged
@@ -230,19 +229,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &4474082756159207727
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7016901710118546043}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 4086712909713098893}
--- !u!114 &6928182635216917115
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -256,7 +242,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &6811931286641226162
+--- !u!114 &4444078412922319222
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,19 +251,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7016901710118546043}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 2759995560716152988}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &4444078412922319222
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &3337022138894200663
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -286,12 +265,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7016901710118546043}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &3337022138894200663
+--- !u!114 &1943862004099041974
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -300,8 +279,17 @@ MonoBehaviour:
m_GameObject: {fileID: 7016901710118546043}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 2759995560716152988}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 4086712909713098893}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab
index 80386fcd..b8544892 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCircle.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 6436200217209768079}
- component: {fileID: 1894013120851118185}
- component: {fileID: 2562591540153244817}
- - component: {fileID: 5132214578572184594}
- component: {fileID: 3896398116007953758}
- - component: {fileID: 1602337205070616824}
- component: {fileID: -8545268462245846538}
- component: {fileID: 9193188298529412557}
+ - component: {fileID: 8785484605073047058}
m_Layer: 5
m_Name: DisplayCircle
m_TagString: Untagged
@@ -230,19 +229,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &5132214578572184594
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6636443472981757786}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 1894013120851118185}
--- !u!114 &3896398116007953758
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -256,7 +242,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &1602337205070616824
+--- !u!114 &-8545268462245846538
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,18 +251,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6636443472981757786}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 363367878266426999}
- StringLabelFormats: []
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-8545268462245846538
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &9193188298529412557
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -285,12 +265,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6636443472981757786}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &9193188298529412557
+--- !u!114 &8785484605073047058
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -299,8 +279,17 @@ MonoBehaviour:
m_GameObject: {fileID: 6636443472981757786}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 363367878266426999}
+ StringLabelFormats:
+ - '{1}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 1894013120851118185}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab
index 7fa01487..72e78ad0 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayConeVolume.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 7028084461172378176}
- component: {fileID: 3047192119255630295}
- component: {fileID: 6900707867866902161}
- - component: {fileID: 4076526528120032799}
- component: {fileID: 4263320076605886561}
- - component: {fileID: 2650353447837694094}
- component: {fileID: -1328819392998620038}
- component: {fileID: -6663813448318375771}
+ - component: {fileID: 4694177023041959187}
m_Layer: 5
m_Name: DisplayConeVolume
m_TagString: Untagged
@@ -230,19 +229,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &4076526528120032799
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2523593828849809055}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 3047192119255630295}
--- !u!114 &4263320076605886561
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -256,7 +242,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &2650353447837694094
+--- !u!114 &-1328819392998620038
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,19 +251,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2523593828849809055}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 4325610265215697195}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-1328819392998620038
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-6663813448318375771
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -286,12 +265,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2523593828849809055}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-6663813448318375771
+--- !u!114 &4694177023041959187
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -300,8 +279,17 @@ MonoBehaviour:
m_GameObject: {fileID: 2523593828849809055}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 4325610265215697195}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 3047192119255630295}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab
index c347cdd8..89cc733c 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayCylinderVolume.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 4650902899377139768}
- component: {fileID: 8448132399530171869}
- component: {fileID: -5483544856802568736}
- - component: {fileID: 4549857745383475350}
- component: {fileID: -7338472263132780475}
- - component: {fileID: 2130710490396271644}
- component: {fileID: 8056345640559627384}
- component: {fileID: 4871256835944773533}
+ - component: {fileID: 2858309948457313103}
m_Layer: 5
m_Name: DisplayCylinderVolume
m_TagString: Untagged
@@ -230,19 +229,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &4549857745383475350
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5287418535931939099}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 8448132399530171869}
--- !u!114 &-7338472263132780475
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -256,7 +242,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &2130710490396271644
+--- !u!114 &8056345640559627384
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,19 +251,12 @@ MonoBehaviour:
m_GameObject: {fileID: 5287418535931939099}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 6630856054862537504}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &8056345640559627384
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &4871256835944773533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -286,12 +265,12 @@ MonoBehaviour:
m_GameObject: {fileID: 5287418535931939099}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &4871256835944773533
+--- !u!114 &2858309948457313103
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -300,8 +279,17 @@ MonoBehaviour:
m_GameObject: {fileID: 5287418535931939099}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 6630856054862537504}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 8448132399530171869}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab
index 1ac052b1..3784d2f9 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayDistance.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 2318968178306689515}
- component: {fileID: 1241458608524046696}
- component: {fileID: -321840373872169248}
- - component: {fileID: 506299453989990893}
- component: {fileID: 2785940634305866798}
- - component: {fileID: 114476148939060428}
- component: {fileID: 6775995842619458444}
- component: {fileID: 6595881491766313357}
+ - component: {fileID: 1114745063382028607}
m_Layer: 5
m_Name: DisplayDistance
m_TagString: Untagged
@@ -66,7 +65,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -96,19 +95,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &506299453989990893
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4221381813544557775}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 1241458608524046696}
--- !u!114 &2785940634305866798
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -122,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &114476148939060428
+--- !u!114 &6775995842619458444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -131,21 +117,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4221381813544557775}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 3246237648589042601}
- - {fileID: 469060305737786517}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &6775995842619458444
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &6595881491766313357
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -154,12 +131,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4221381813544557775}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &6595881491766313357
+--- !u!114 &1114745063382028607
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -168,11 +145,22 @@ MonoBehaviour:
m_GameObject: {fileID: 4221381813544557775}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 3246237648589042601}
+ - {fileID: 469060305737786517}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 1241458608524046696}
--- !u!1 &6379254425133528592
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab
index 7575377f..c13c2105 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayEqualCircles.prefab
@@ -282,11 +282,10 @@ GameObject:
- component: {fileID: 7719973282818826063}
- component: {fileID: 2180110340788369784}
- component: {fileID: -6361459908606634220}
- - component: {fileID: 1285080900581311433}
- component: {fileID: 6805943141472748426}
- - component: {fileID: 4430445033801091530}
- component: {fileID: -8548468547709009186}
- component: {fileID: -6007190389148885436}
+ - component: {fileID: 4125206351637125013}
m_Layer: 5
m_Name: DisplayEqualCircles
m_TagString: Untagged
@@ -366,19 +365,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &1285080900581311433
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7523305359074541435}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 2180110340788369784}
--- !u!114 &6805943141472748426
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -392,7 +378,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &4430445033801091530
+--- !u!114 &-8548468547709009186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -401,21 +387,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7523305359074541435}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 2948658129975585178}
- - {fileID: 4670384714962435475}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-8548468547709009186
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-6007190389148885436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -424,12 +401,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7523305359074541435}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-6007190389148885436
+--- !u!114 &4125206351637125013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -438,8 +415,19 @@ MonoBehaviour:
m_GameObject: {fileID: 7523305359074541435}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 2948658129975585178}
+ - {fileID: 4670384714962435475}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 2180110340788369784}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab
index c5a7b4fb..f6991826 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayLine.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 4856785638153472691}
- component: {fileID: 6811289727063397518}
- component: {fileID: -8616053750771812173}
- - component: {fileID: 6586968856821406842}
- component: {fileID: 3914868910838030883}
- - component: {fileID: 7215917396402112958}
- component: {fileID: 7981125183230312854}
- component: {fileID: -4205691289957159684}
+ - component: {fileID: 6858680159555245295}
m_Layer: 5
m_Name: DisplayLine
m_TagString: Untagged
@@ -230,19 +229,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &6586968856821406842
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7510387096843212865}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 6811289727063397518}
--- !u!114 &3914868910838030883
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -256,7 +242,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &7215917396402112958
+--- !u!114 &7981125183230312854
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,19 +251,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 5696377050731032053}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &7981125183230312854
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-4205691289957159684
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -286,12 +265,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-4205691289957159684
+--- !u!114 &6858680159555245295
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -300,8 +279,17 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 5696377050731032053}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 6811289727063397518}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab
index 71962557..4a5aa93b 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnCircle.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 6773971219611625873}
- component: {fileID: 2122753052771730408}
- component: {fileID: -3993157698965855989}
- - component: {fileID: 639140626255626101}
- component: {fileID: 6441113378387087702}
- - component: {fileID: 9073127243885313005}
- component: {fileID: -5954085419867829670}
- component: {fileID: 5980699288881757793}
+ - component: {fileID: 1329070721132338136}
m_Layer: 5
m_Name: DisplayOnCircle
m_TagString: Untagged
@@ -96,19 +95,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &639140626255626101
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2115817999818309900}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 2122753052771730408}
--- !u!114 &6441113378387087702
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -122,7 +108,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &9073127243885313005
+--- !u!114 &-5954085419867829670
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -131,19 +117,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2115817999818309900}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 7373443337760040373}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-5954085419867829670
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &5980699288881757793
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -152,12 +131,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2115817999818309900}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &5980699288881757793
+--- !u!114 &1329070721132338136
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -166,11 +145,20 @@ MonoBehaviour:
m_GameObject: {fileID: 2115817999818309900}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 7373443337760040373}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 2122753052771730408}
--- !u!1 &5265014618439724607
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab
index 8f2cb679..56938753 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOnLine.prefab
@@ -282,11 +282,10 @@ GameObject:
- component: {fileID: 8693547975586513996}
- component: {fileID: 7297490523703237233}
- component: {fileID: -8795514373464730087}
- - component: {fileID: 96998878642029046}
- component: {fileID: 979255380955983068}
- - component: {fileID: 6910630412647778113}
- component: {fileID: -4875952770271437981}
- component: {fileID: 3281836877418813895}
+ - component: {fileID: 5070753639330069539}
m_Layer: 5
m_Name: DisplayOnLine
m_TagString: Untagged
@@ -366,19 +365,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &96998878642029046
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6050914136827205310}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 7297490523703237233}
--- !u!114 &979255380955983068
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -392,7 +378,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &6910630412647778113
+--- !u!114 &-4875952770271437981
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -401,21 +387,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6050914136827205310}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 8416932638320714506}
- - {fileID: 3599574990072972372}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-4875952770271437981
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &3281836877418813895
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -424,12 +401,12 @@ MonoBehaviour:
m_GameObject: {fileID: 6050914136827205310}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &3281836877418813895
+--- !u!114 &5070753639330069539
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -438,8 +415,19 @@ MonoBehaviour:
m_GameObject: {fileID: 6050914136827205310}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 8416932638320714506}
+ - {fileID: 3599574990072972372}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 7297490523703237233}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab
index 3aef116a..28b0a457 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayOrthogonalCircleLine.prefab
@@ -282,11 +282,10 @@ GameObject:
- component: {fileID: 7453695026461963725}
- component: {fileID: 3070659305120604608}
- component: {fileID: 6700141036727457433}
- - component: {fileID: 7705752672375263960}
- component: {fileID: 8593937097866258120}
- - component: {fileID: 930378118197085978}
- component: {fileID: -4766878545130701298}
- component: {fileID: 4466550412761522739}
+ - component: {fileID: 5093861188272994017}
m_Layer: 5
m_Name: DisplayOrthogonalCircleLine
m_TagString: Untagged
@@ -366,19 +365,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &7705752672375263960
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8554350198830106250}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 3070659305120604608}
--- !u!114 &8593937097866258120
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -392,7 +378,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &930378118197085978
+--- !u!114 &-4766878545130701298
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -401,21 +387,12 @@ MonoBehaviour:
m_GameObject: {fileID: 8554350198830106250}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 5217577174673142595}
- - {fileID: 8384968683200090543}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-4766878545130701298
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &4466550412761522739
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -424,12 +401,12 @@ MonoBehaviour:
m_GameObject: {fileID: 8554350198830106250}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &4466550412761522739
+--- !u!114 &5093861188272994017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -438,8 +415,19 @@ MonoBehaviour:
m_GameObject: {fileID: 8554350198830106250}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 5217577174673142595}
+ - {fileID: 8384968683200090543}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 3070659305120604608}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab
index 46c4b322..db73658d 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayParallelLine.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 4856785638153472691}
- component: {fileID: 6811289727063397518}
- component: {fileID: -5306579992832972806}
- - component: {fileID: 6586968856821406842}
- component: {fileID: 3914868910838030883}
- - component: {fileID: 7215917396402112958}
- component: {fileID: 41121149337675280}
- component: {fileID: -8573552533908309515}
+ - component: {fileID: 1452031804458360360}
m_Layer: 5
m_Name: DisplayParallelLine
m_TagString: Untagged
@@ -231,19 +230,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &6586968856821406842
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7510387096843212865}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 6811289727063397518}
--- !u!114 &3914868910838030883
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -257,7 +243,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &7215917396402112958
+--- !u!114 &41121149337675280
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -266,21 +252,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 5696377050731032053}
- - {fileID: 2874878903173316411}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &41121149337675280
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-8573552533908309515
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -289,12 +266,12 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-8573552533908309515
+--- !u!114 &1452031804458360360
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -303,11 +280,22 @@ MonoBehaviour:
m_GameObject: {fileID: 7510387096843212865}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 5696377050731032053}
+ - {fileID: 2874878903173316411}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 6811289727063397518}
--- !u!1 &7693994637337906468
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab
index a0f3261f..843503c0 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayPoint.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 858001163752551616}
- component: {fileID: 858001163752551617}
- component: {fileID: 6453378001758524415}
- - component: {fileID: 8408536798623030161}
- component: {fileID: 114132791164475416}
- - component: {fileID: 114984628052382182}
- component: {fileID: -6287292158833946431}
- component: {fileID: -7957010930568868188}
+ - component: {fileID: 9212101867518340572}
m_Layer: 5
m_Name: DisplayPoint
m_TagString: Untagged
@@ -95,19 +94,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &8408536798623030161
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 858001163752551619}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 858001163752551617}
--- !u!114 &114132791164475416
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -121,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &114984628052382182
+--- !u!114 &-6287292158833946431
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -130,19 +116,12 @@ MonoBehaviour:
m_GameObject: {fileID: 858001163752551619}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 858001164857725563}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-6287292158833946431
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-7957010930568868188
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -151,12 +130,12 @@ MonoBehaviour:
m_GameObject: {fileID: 858001163752551619}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-7957010930568868188
+--- !u!114 &9212101867518340572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -165,11 +144,20 @@ MonoBehaviour:
m_GameObject: {fileID: 858001163752551619}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 858001164857725563}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 858001163752551617}
--- !u!1 &858001164857725565
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab
index b7073517..e125c5b6 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRadius.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 9014721336959090042}
- component: {fileID: 6545787433352254111}
- component: {fileID: -3951124718391435523}
- - component: {fileID: 7450556920702625537}
- component: {fileID: 173279308733449335}
- - component: {fileID: 3955180868949107883}
- component: {fileID: -497146227597533108}
- component: {fileID: -2247250977338064909}
+ - component: {fileID: 73377962631990444}
m_Layer: 5
m_Name: DisplayRadius
m_TagString: Untagged
@@ -95,19 +94,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &7450556920702625537
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2513701074329712390}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 6545787433352254111}
--- !u!114 &173279308733449335
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -121,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &3955180868949107883
+--- !u!114 &-497146227597533108
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -130,19 +116,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2513701074329712390}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 811399006990138641}
- StringLabelFormats:
- - 'r: {1}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-497146227597533108
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-2247250977338064909
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -151,12 +130,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2513701074329712390}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-2247250977338064909
+--- !u!114 &73377962631990444
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -165,11 +144,20 @@ MonoBehaviour:
m_GameObject: {fileID: 2513701074329712390}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 811399006990138641}
+ StringLabelFormats:
+ - 'r: {1}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 6545787433352254111}
--- !u!1 &8185219527703794732
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab
index cea3cf5c..af610311 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRectangleFact.prefab
@@ -552,11 +552,10 @@ GameObject:
- component: {fileID: 7822135884913080422}
- component: {fileID: 3266031038391391049}
- component: {fileID: -3856313481121579632}
- - component: {fileID: 7956205528156386179}
- component: {fileID: 2163234623969663275}
- - component: {fileID: 4558040300745642744}
- component: {fileID: -1221418573146676442}
- component: {fileID: -4240360816424112390}
+ - component: {fileID: 6067258621717584966}
m_Layer: 5
m_Name: DisplayRectangleFact
m_TagString: Untagged
@@ -638,19 +637,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &7956205528156386179
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8156936215466465834}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 3266031038391391049}
--- !u!114 &2163234623969663275
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -664,7 +650,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &4558040300745642744
+--- !u!114 &-1221418573146676442
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -673,25 +659,12 @@ MonoBehaviour:
m_GameObject: {fileID: 8156936215466465834}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 236017584527233354}
- - {fileID: 1785697637619353122}
- - {fileID: 7959791220384863301}
- - {fileID: 6402563570144907913}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- - '{3}'
- - '{4}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-1221418573146676442
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-4240360816424112390
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -700,12 +673,12 @@ MonoBehaviour:
m_GameObject: {fileID: 8156936215466465834}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-4240360816424112390
+--- !u!114 &6067258621717584966
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -714,8 +687,23 @@ MonoBehaviour:
m_GameObject: {fileID: 8156936215466465834}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 236017584527233354}
+ - {fileID: 1785697637619353122}
+ - {fileID: 7959791220384863301}
+ - {fileID: 6402563570144907913}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ - '{3}'
+ - '{4}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 3266031038391391049}
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab
index a88dc456..fa105f3f 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayRightAngle.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 661520793940439990}
- component: {fileID: 5767345106027831726}
- component: {fileID: -579110386671252163}
- - component: {fileID: 5822687220706391381}
- component: {fileID: 3794236076833855767}
- - component: {fileID: 8661743446683420805}
- component: {fileID: 4176151758276728228}
- component: {fileID: 493413251982980403}
+ - component: {fileID: 2691125249937586042}
m_Layer: 5
m_Name: DisplayRightAngle
m_TagString: Untagged
@@ -232,19 +231,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &5822687220706391381
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3080888058940174091}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 5767345106027831726}
--- !u!114 &3794236076833855767
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -258,7 +244,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &8661743446683420805
+--- !u!114 &4176151758276728228
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -267,23 +253,12 @@ MonoBehaviour:
m_GameObject: {fileID: 3080888058940174091}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 7526375183334386681}
- - {fileID: 7111589452609809811}
- - {fileID: 786183127531855823}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- - '{3}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &4176151758276728228
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &493413251982980403
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -292,12 +267,12 @@ MonoBehaviour:
m_GameObject: {fileID: 3080888058940174091}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &493413251982980403
+--- !u!114 &2691125249937586042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -306,11 +281,24 @@ MonoBehaviour:
m_GameObject: {fileID: 3080888058940174091}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 7526375183334386681}
+ - {fileID: 7111589452609809811}
+ - {fileID: 786183127531855823}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ - '{3}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 5767345106027831726}
--- !u!1 &7613847065484003782
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab
index 3a97fdcb..3ce62cd0 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTestFact.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 3779590155575851460}
- component: {fileID: 5078315713010028456}
- component: {fileID: 6592776107266831046}
- - component: {fileID: -5313503588223420466}
- component: {fileID: 2785454548719711828}
- - component: {fileID: 1224931104090066081}
- component: {fileID: 7299521122061085080}
- component: {fileID: -7305694658926121836}
+ - component: {fileID: 5587532179049804535}
m_Layer: 5
m_Name: DisplayTestFact
m_TagString: Untagged
@@ -95,19 +94,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &-5313503588223420466
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2846439484187545958}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 5078315713010028456}
--- !u!114 &2785454548719711828
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -121,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &1224931104090066081
+--- !u!114 &7299521122061085080
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -130,19 +116,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2846439484187545958}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 6086025492030478819}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &7299521122061085080
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &-7305694658926121836
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -151,12 +130,12 @@ MonoBehaviour:
m_GameObject: {fileID: 2846439484187545958}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &-7305694658926121836
+--- !u!114 &5587532179049804535
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -165,11 +144,20 @@ MonoBehaviour:
m_GameObject: {fileID: 2846439484187545958}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 6086025492030478819}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 5078315713010028456}
--- !u!1 &6391605716120646375
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab
index 8d1ba7a8..4f830d9b 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayTruncatedConeVolume.prefab
@@ -12,11 +12,10 @@ GameObject:
- component: {fileID: 1286697532791835095}
- component: {fileID: 2999154800373574638}
- component: {fileID: -7731941237985852692}
- - component: {fileID: 5477813449890952819}
- component: {fileID: 6431159876548220859}
- - component: {fileID: 4468595272332714251}
- component: {fileID: 3888340986020047728}
- component: {fileID: 4076898894668230875}
+ - component: {fileID: 8772692175793184233}
m_Layer: 5
m_Name: DisplayTruncatedConeVolume
m_TagString: Untagged
@@ -95,19 +94,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &5477813449890952819
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4123133807278660472}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 2999154800373574638}
--- !u!114 &6431159876548220859
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -121,7 +107,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &4468595272332714251
+--- !u!114 &3888340986020047728
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -130,19 +116,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4123133807278660472}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 789128519229516834}
- StringLabelFormats:
- - '{0}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &3888340986020047728
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &4076898894668230875
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -151,12 +130,12 @@ MonoBehaviour:
m_GameObject: {fileID: 4123133807278660472}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &4076898894668230875
+--- !u!114 &8772692175793184233
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -165,11 +144,20 @@ MonoBehaviour:
m_GameObject: {fileID: 4123133807278660472}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 789128519229516834}
+ StringLabelFormats:
+ - '{0}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 2999154800373574638}
--- !u!1 &6234169056530260467
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab
index 0689918f..210f9b5c 100644
--- a/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab
+++ b/Assets/Resources/Prefabs/UI/Icons/FactIcons/DisplayUnequalCircles.prefab
@@ -147,11 +147,10 @@ GameObject:
- component: {fileID: 8848431339215720241}
- component: {fileID: 7403282225673375912}
- component: {fileID: -6208543061779266716}
- - component: {fileID: 3225367128346546047}
- component: {fileID: 4056140006323214235}
- - component: {fileID: -6417425987847613228}
- component: {fileID: -6842305447839815895}
- component: {fileID: 638044177452029688}
+ - component: {fileID: 5347186181612710032}
m_Layer: 5
m_Name: DisplayUnequalCircles
m_TagString: Untagged
@@ -231,19 +230,6 @@ CanvasGroup:
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
---- !u!114 &3225367128346546047
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5769925203401971992}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 7403282225673375912}
--- !u!114 &4056140006323214235
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -257,7 +243,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragged: 0
---- !u!114 &-6417425987847613228
+--- !u!114 &-6842305447839815895
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -266,21 +252,12 @@ MonoBehaviour:
m_GameObject: {fileID: 5769925203401971992}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3}
+ m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
m_Name:
m_EditorClassIdentifier:
- FactText:
- - {fileID: 6694126399850149665}
- - {fileID: 5654613262439864818}
- StringLabelFormats:
- - '{1}'
- - '{2}'
- renderer: []
- Default: {fileID: 0}
- Selected: {fileID: 0}
- Hint: {fileID: 0}
- Solution: {fileID: 0}
---- !u!114 &-6842305447839815895
+ factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ type: 3}
+--- !u!114 &638044177452029688
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -289,12 +266,12 @@ MonoBehaviour:
m_GameObject: {fileID: 5769925203401971992}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a1ed516d861fa2c45a2b1767d1217acb, type: 3}
+ m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
m_Name:
m_EditorClassIdentifier:
- factExplorerPrefab: {fileID: 5592893003942163674, guid: ff7415df1aac19c41a7855516a108a8a,
+ favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
type: 3}
---- !u!114 &638044177452029688
+--- !u!114 &5347186181612710032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -303,11 +280,22 @@ MonoBehaviour:
m_GameObject: {fileID: 5769925203401971992}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 88f8f222eb0a4a246908bde097a8726e, type: 3}
+ m_Script: {fileID: 11500000, guid: f1ce2973f9bfc68479d5f3e2065ca729, type: 3}
m_Name:
m_EditorClassIdentifier:
- favoriteDisplayPrefab: {fileID: 2810062559722195091, guid: 0b34469213856774980670de85a7d4a0,
- type: 3}
+ _URI:
+ FactText:
+ - {fileID: 6694126399850149665}
+ - {fileID: 5654613262439864818}
+ StringLabelFormats:
+ - '{1}'
+ - '{2}'
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ Images:
+ - {fileID: 7403282225673375912}
--- !u!1 &5984757243279669606
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
index 91f203c0..511a33c2 100644
--- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
+++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab
@@ -35,7 +35,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 9720}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &6592514254180342026
@@ -720,7 +720,6 @@ GameObject:
- component: {fileID: 8004702056412215060}
- component: {fileID: 8004702056412215064}
- component: {fileID: 8004702056412215065}
- - component: {fileID: 8004702056412215062}
- component: {fileID: 8004702056412215063}
m_Layer: 5
m_Name: Scroll View
@@ -789,19 +788,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!114 &8004702056412215062
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8004702056412215061}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
--- !u!114 &8004702056412215063
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -977,8 +963,9 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8004702056544321748}
- - component: {fileID: 8004702056544321753}
- component: {fileID: 8004702056544321750}
+ - component: {fileID: 1476364976868405206}
+ - component: {fileID: 8004702056544321753}
- component: {fileID: 8004702056544321751}
m_Layer: 5
m_Name: Viewport
@@ -1008,7 +995,15 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
---- !u!114 &8004702056544321753
+--- !u!222 &8004702056544321750
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8004702056544321749}
+ m_CullTransparentMesh: 0
+--- !u!114 &1476364976868405206
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1017,18 +1012,24 @@ MonoBehaviour:
m_GameObject: {fileID: 8004702056544321749}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ShowMaskGraphic: 0
---- !u!222 &8004702056544321750
-CanvasRenderer:
+ m_Padding: {x: 1, y: 0, z: 1, w: 0}
+ m_Softness: {x: 0, y: 0}
+--- !u!114 &8004702056544321753
+MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8004702056544321749}
- m_CullTransparentMesh: 0
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ShowMaskGraphic: 0
--- !u!114 &8004702056544321751
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -1036,7 +1037,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8004702056544321749}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -1241,7 +1242,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 3639.5742, y: 0.000030517578}
+ m_AnchoredPosition: {x: -0.00024414062, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &8004702056565720367
@@ -1617,7 +1618,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 8004702056618112982}
m_Direction: 0
m_Value: 1
- m_Size: 0.4705884
+ m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -2905,7 +2906,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 1
+ m_PresetInfoIsWorld: 0
--- !u!114 &8004702057932254676
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3537,7 +3538,7 @@ PrefabInstance:
- target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -540
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3}
diff --git a/Assets/Resources/Prefabs/UI/Scrolls/ScrollParameterDisplay 1.prefab b/Assets/Resources/Prefabs/UI/Scrolls/ScrollParameterDisplay 1.prefab
index 360e87bd..0ce1d959 100644
--- a/Assets/Resources/Prefabs/UI/Scrolls/ScrollParameterDisplay 1.prefab
+++ b/Assets/Resources/Prefabs/UI/Scrolls/ScrollParameterDisplay 1.prefab
@@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 45775000557492123}
- component: {fileID: 45775000557492116}
- component: {fileID: 3165625469853059737}
- - component: {fileID: 1262334361908787796}
m_Layer: 5
m_Name: ScrollParameterDisplay 1
m_TagString: Untagged
@@ -63,7 +62,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 0}
+ m_Material: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
m_Color: {r: 0.9056604, g: 0.8992144, b: 0.004271993, a: 0.21568628}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
@@ -101,20 +100,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &1262334361908787796
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 45775000557492118}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 77b75bbb0b640664db62cf8acb69994e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- imageToChange: {fileID: 45775000557492116}
- imageToChangeDefaultColor: {r: 0, g: 0, b: 0, a: 0}
--- !u!1 &5738028260646118123
GameObject:
m_ObjectHideFlags: 0
@@ -603,9 +588,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_URI:
+ FactText: []
+ StringLabelFormats: []
+ Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ Solution: {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2}
+ Images:
+ - {fileID: 45775000557492116}
LabelMesh: {fileID: 1686984722580339795}
HintButton: {fileID: 5738028260646118123}
- ImageHintObject: {fileID: 1262334361908787796}
--- !u!224 &8395591737078336061 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7249550241351237421, guid: 1a3d2b3a09e7aa64ab57b0867d3b2307,
diff --git a/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab b/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab
index 84e924c5..c898f56e 100644
--- a/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab
+++ b/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab
@@ -304,9 +304,10 @@ MonoBehaviour:
cursor: {fileID: 0}
parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93,
type: 3}
+ mmtAnswerPopUp: {fileID: 0}
currentMmtAnswer:
- dynamicScrollDescriptionsActive: 1
- automaticHintGenerationActive: 1
+ DynamicScrollDescriptionsActive: 1
+ AutomaticHintGenerationActive: 1
--- !u!1 &4092972423489379446
GameObject:
m_ObjectHideFlags: 0
@@ -693,7 +694,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8894159311577423771}
- - component: {fileID: 8894159311577423774}
+ - component: {fileID: 2057384520264239422}
- component: {fileID: 8894159311577423773}
- component: {fileID: 8894159311577423772}
m_Layer: 5
@@ -724,7 +725,7 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: -17, y: 0}
m_Pivot: {x: 0, y: 1}
---- !u!114 &8894159311577423774
+--- !u!114 &2057384520264239422
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -733,10 +734,11 @@ MonoBehaviour:
m_GameObject: {fileID: 8894159311577423770}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+ m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_ShowMaskGraphic: 0
+ m_Padding: {x: 0, y: 0, z: 0, w: 0}
+ m_Softness: {x: 0, y: 0}
--- !u!222 &8894159311577423773
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -752,7 +754,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8894159311577423770}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -840,53 +842,65 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
factscreenContent: {fileID: 0}
- prefab_Point: {fileID: 858001163752551619, guid: f019e9f67e8dab947bc60028223b6cec,
- type: 3}
- prefab_Distance: {fileID: 4221381813544557775, guid: 8106c748f1aeb084d87fdc71dd009b67,
- type: 3}
- prefab_Angle: {fileID: 6643637775379894484, guid: 30fcd362f34a9844fba66065924c6143,
- type: 3}
- prefab_Default: {fileID: 3623208097461608675, guid: f8cb4e8bb9c09724c925b25c660fb2cd,
- type: 3}
- prefab_OnLine: {fileID: 6050914136827205310, guid: 496d04605465c7f4dba7638cc6e2dc6e,
- type: 3}
- prefab_Line: {fileID: 7510387096843212865, guid: d6ee990520a44954fb494468665d19e9,
- type: 3}
- prefab_ParallelLineFact: {fileID: 7510387096843212865, guid: 9f086cfbfeb0dfd46af67395aa17aafa,
- type: 3}
- prefab_RectangleFact: {fileID: 8156936215466465834, guid: b6f35afcaff5d8a40bf8f792eb3299e6,
- type: 3}
- prefab_RadiusFact: {fileID: 2513701074329712390, guid: 5b54aca5b2f2bfa48968656ed3bea181,
- type: 3}
- prefab_AreaCircle: {fileID: 7016901710118546043, guid: 210f1e1acf16abf40a39587074c4d25a,
- type: 3}
- prefab_ConeVolume: {fileID: 2523593828849809055, guid: 992edeb4264d0fa49b0f9b35b9ab85ce,
- type: 3}
- prefab_OrthogonalCircleLine: {fileID: 8554350198830106250, guid: 9ce7444f588cd054989126eaff75c5f3,
- type: 3}
- prefab_TruncatedConeVolume: {fileID: 4123133807278660472, guid: 9d0019fa4b5725a49bdfc78c4d67661e,
- type: 3}
- prefab_RightAngle: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4,
- type: 3}
- prefab_CylinderVolume: {fileID: 5287418535931939099, guid: 30d09e8685950994893b3b6388a8906c,
- type: 3}
- prefab_EqualFact: {fileID: 7523305359074541435, guid: 5f461930be2eb074193dc12eb60e10b2,
- type: 3}
- prefab_UnEqualFact: {fileID: 5769925203401971992, guid: 047cd3a517f781846a1f983394b4bb7b,
- type: 3}
- prefab_TestFact: {fileID: 2846439484187545958, guid: 5dc76e187eae4214697491bfb42773e8,
- type: 3}
- prefab_CircleFact: {fileID: 6636443472981757786, guid: 9d08fd45bc83c7c42a9be42f5309c6c2,
- type: 3}
- prefab_OnCircleFact: {fileID: 2115817999818309900, guid: df93bd4d977e4ab42a626f7bd06596d6,
- type: 3}
- prefab_AngleCircleLineFact: {fileID: 4902928549420802332, guid: 62cec72d28de59d4c8ae782957cc10a1,
- type: 3}
- x_Start: 0
- y_Start: 0
- X_Pacece_Between_Items: 0
- y_Pacece_Between_Items: 0
- number_of_Column: 0
+ factSpotPrefab: {fileID: 0}
+ PrefabtTypeReadonly:
+ - AbstractAngleFact
+ - AbstractAngleFactWrappedCRTP`1[T]
+ - AbstractLineFact
+ - AbstractLineFactWrappedCRTP`1[T]
+ - AngleCircleLineFact
+ - AngleFact
+ - AreaCircleFact
+ - AttachedPositionFunction
+ - CircleFact
+ - ConeVolumeFact
+ - CylinderVolumeFact
+ - EqualCirclesFact
+ - Fact
+ - FactWrappedCRTP`1[T]
+ - FunctionCallFact
+ - FunctionFact
+ - LineFact
+ - OnCircleFact
+ - OnLineFact
+ - OrthogonalCircleLineFact
+ - ParallelLineFact
+ - PointFact
+ - RadiusFact
+ - RayFact
+ - RightAngleFact
+ - TestFact
+ - TruncatedConeVolumeFact
+ - UnEqualCirclesFact
+ PrefabDataConfig:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
--- !u!1 &8894159312286264417
GameObject:
m_ObjectHideFlags: 0
@@ -1033,7 +1047,6 @@ GameObject:
- component: {fileID: 8894159312509398409}
- component: {fileID: 8894159312509398412}
- component: {fileID: 8894159312509398411}
- - component: {fileID: 8894159312509398410}
- component: {fileID: 8894159312509398413}
m_Layer: 5
m_Name: Scroll View
@@ -1102,19 +1115,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!114 &8894159312509398410
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8894159312509398408}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ShowMaskGraphic: 1
--- !u!114 &8894159312509398413
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
index 22c55f0a..53045b79 100644
--- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
+++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs
@@ -21,7 +21,7 @@ public static class CommunicationEvents
public static UnityEvent NewAssignmentEvent = new();
public static UnityEvent StartT0Event = new();
- public static UnityEvent<ImageHintAnimation, string> ScrollFactHintEvent = new();
+ public static UnityEvent<string> ScrollFactHintEvent = new();
public static UnityEvent<string, FactWrapper.FactMaterials> AnimateExistingFactEvent = new();
public static UnityEvent<Fact, FactWrapper.FactMaterials> AnimateExistingAsSolutionEvent = new();
public static UnityEvent<Fact> AnimateNonExistingFactEvent = new();
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
index df998731..6392f79e 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactManager.cs
@@ -115,7 +115,7 @@ void AddHitIfOnLine(RaycastHit hit)
if (Math3d.IsPointApproximatelyOnLine(rayP1.Point, rayFact.Dir, hit.transform.position))
{
AddOnLineFact(
- hit.transform.gameObject.GetComponent<FactObject>().URI, rayFact.Id, true, gadget, scroll_label, true);
+ hit.transform.gameObject.GetComponent<FactObject3D>().URI, rayFact.Id, true, gadget, scroll_label, true);
}
}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
index 80563e96..2ede0e55 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
@@ -53,7 +53,7 @@ public void SpawnAttachedPositionFunction(AttachedPositionFunction fact)
public void SpawnPoint(PointFact fact)
{
GameObject point = GameObject.Instantiate(Sphere);
- fact.WorldRepresentation = point.GetComponent<FactObject>();
+ fact.WorldRepresentation = point.GetComponent<FactObject3D>();
fact.WorldRepresentation.Fact = fact;
point.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
@@ -63,7 +63,7 @@ public void SpawnLine(LineFact fact)
{
//Change FactRepresentation to Line
GameObject line = GameObject.Instantiate(Line);
- fact.WorldRepresentation = line.GetComponentInChildren<FactObject>();
+ fact.WorldRepresentation = line.GetComponentInChildren<FactObject3D>();
fact.WorldRepresentation.Fact = fact;
//Place the Line in the centre of the two points
@@ -82,7 +82,7 @@ public void SpawnRay(RayFact fact)
{
//Change FactRepresentation to Line
GameObject line = GameObject.Instantiate(Ray);
- fact.WorldRepresentation = line.GetComponentInChildren<FactObject>();
+ fact.WorldRepresentation = line.GetComponentInChildren<FactObject3D>();
fact.WorldRepresentation.Fact = fact;
//Place the Line in the centre of the two points
@@ -99,7 +99,7 @@ public void SpawnAngle(AbstractAngleFact fact)
{
//Change FactRepresentation to Angle
GameObject angle = GameObject.Instantiate(Angle);
- fact.WorldRepresentation = angle.GetComponentInChildren<FactObject>();
+ fact.WorldRepresentation = angle.GetComponentInChildren<FactObject3D>();
fact.WorldRepresentation.Fact = fact;
angle.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
@@ -125,7 +125,7 @@ public void SpawnRingAndCircle(CircleFact fact)
SpawnCircle(fact, ringAndCircleGO.transform);
ringAndCircleGO.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
- fact.WorldRepresentation = ringAndCircleGO.AddComponent<FactObject>();
+ fact.WorldRepresentation = ringAndCircleGO.AddComponent<FactObject3D>();
fact.WorldRepresentation.Fact = fact;
}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.meta
new file mode 100644
index 00000000..9221132a
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e90e945d9f7ac8c44be4c8d93b3972e6
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/InteractionEngine/TBD/AttachedPositionFunctionBehaviour.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/AttachedPositionFunctionBehaviour.cs
similarity index 100%
rename from Assets/Scripts/InteractionEngine/TBD/AttachedPositionFunctionBehaviour.cs
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/AttachedPositionFunctionBehaviour.cs
diff --git a/Assets/Scripts/InteractionEngine/TBD/AttachedPositionFunctionBehaviour.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/AttachedPositionFunctionBehaviour.cs.meta
similarity index 100%
rename from Assets/Scripts/InteractionEngine/TBD/AttachedPositionFunctionBehaviour.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/AttachedPositionFunctionBehaviour.cs.meta
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs
similarity index 55%
rename from Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs
index c3cb432a..79908ec3 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Linq;
using System.Collections.Generic;
using UnityEngine;
@@ -10,15 +10,15 @@
/// <summary>
/// <see cref="Fact.Id"/>/ <c>MonoBehaviour</c> wrapper to be attached to <see cref="Fact.WorldRepresentation"/>
/// </summary>
-[DisallowMultipleComponent]
-public class FactObject : FactWrapper, ISerializationCallbackReceiver
+//[DisallowMultipleComponent]
+public abstract class FactObject : FactWrapper, ISerializationCallbackReceiver
{
[SerializeField] protected List<TMP_Text> FactText;
[SerializeField] protected List<string> StringLabelFormats;
[NonSerialized]
- public Material[] materials;
- public new Renderer[] renderer;
+ public Material[] Materials;
+ protected Material[] MaterialsToChange;
[NonSerialized]
protected List<FactObject> AllChildren;
@@ -37,8 +37,9 @@ void ISerializationCallbackReceiver.OnBeforeSerialize()
.ToList();
}
+ if (StringLabelFormats == null)
{
- StringLabelFormats ??= new();
+ StringLabelFormats = new();
int i = StringLabelFormats.Count();
int end = FactText.Count();
@@ -47,44 +48,37 @@ void ISerializationCallbackReceiver.OnBeforeSerialize()
StringLabelFormats.Add("{" + (i + 1) + "}");
}
- if (materials != null)
+ if (Materials != null)
{
- Default = materials[(int)FactMaterials.Default];
- Selected = materials[(int)FactMaterials.Selected];
- Hint = materials[(int)FactMaterials.Hint];
- Solution = materials[(int)FactMaterials.Solution];
+ Default = Materials[(int)FactMaterials.Default];
+ Selected = Materials[(int)FactMaterials.Selected];
+ Hint = Materials[(int)FactMaterials.Hint];
+ Solution = Materials[(int)FactMaterials.Solution];
}
-#if UNITY_EDITOR // not working
- if (EditorApplication.isPlaying)
- return;
-
- foreach (Collider collider in transform.GetComponentsInChildren<Collider>(includeInactive: true))
- {
- if (!collider.gameObject.GetComponent<FactObject>())
- try
- {
- collider.gameObject.AddComponent<FactObject>();
- }
- catch (Exception) { }
- }
-#endif
+ _OnBeforeSerialize();
}
+ protected abstract void _OnBeforeSerialize();
void ISerializationCallbackReceiver.OnAfterDeserialize()
{
{
- materials = new Material[4];
- materials[(int)FactMaterials.Default] = Default;
- materials[(int)FactMaterials.Selected] = Selected;
- materials[(int)FactMaterials.Hint] = Hint;
- materials[(int)FactMaterials.Solution] = Solution;
+ Materials = new Material[4];
+ Materials[(int)FactMaterials.Default] = Default;
+ Materials[(int)FactMaterials.Selected] = Selected;
+ Materials[(int)FactMaterials.Hint] = Hint;
+ Materials[(int)FactMaterials.Solution] = Solution;
}
+
+ _OnAfterDeserialize();
}
+ protected abstract void _OnAfterDeserialize();
#endregion
- private void Awake()
+ protected override void _Awake()
{
+ base._Awake();
+
AllChildren = transform.GetComponentsInChildren<FactObject>(includeInactive: true).ToList();
AllChildren.Remove(this);
@@ -94,22 +88,26 @@ private void Awake()
public override void HighlightAs(FactMaterials tmpState)
{
- CoroutineCascadeForMeAndChildrenAllRenderer(
- (fact_obj, renderer) => _Animation(fact_obj, renderer)
+ CoroutineCascadeForMeAndChildrenAllMaterials(
+ (fact_obj, material) => _Animation(fact_obj, material)
);
- IEnumerator _Animation(FactObject fact_obj, Renderer renderer)
+ IEnumerator _Animation(FactObject fact_obj, Material material)
{
- for (IEnumerator clock = IEnumeratorExtensions.WaitForSeconds(HintAnimationDuration)
+ for (IEnumerator<float> clock = IEnumeratorExtensions.ClockForSeconds(HintAnimationDuration)
; clock.MoveNext();)
{
- renderer.material.Lerp(fact_obj.materials[(int)tmpState],
- fact_obj.Default,
- Mathf.PingPong(Time.time, AnimationLerpDuration));
+ material.Lerp(fact_obj.Default,
+ fact_obj.Materials[(int)tmpState],
+ Mathf.PingPong(clock.Current, AnimationLerpDuration));
+
yield return null;
}
- renderer.material = fact_obj.Default;
+ // clean fix for UI: "material = fact_obj.Default" not working
+ material.Lerp(fact_obj.Default,
+ fact_obj.Materials[(int)tmpState],
+ 0);
}
}
@@ -127,7 +125,7 @@ protected override void FactUpdated()
}
}
- public void ReLabel()
+ private void ReLabel()
{
string[] mother_child_labels =
new[] { URI }.ShallowCloneAppend(Fact.DependentFactIds)
@@ -150,15 +148,9 @@ public void ReLabel()
}
}
- switch (Fact) // for highly customized labels
- {
- case TestFact testFact:
- //FactText[0].text = testFact.Label;
- break;
- default:
- break;
- }
+ _CustomReLabel();
}
+ protected virtual void _CustomReLabel() { }
public void CascadeForMeAndChildren(Action<FactObject> func)
{
@@ -167,19 +159,19 @@ public void CascadeForMeAndChildren(Action<FactObject> func)
func(fo);
}
- public void ForAllRenderer(Action<Renderer> func)
+ public void ForAllMaterials(Action<Material> func)
{
- foreach (Renderer ren in renderer)
- func(ren);
+ foreach (Material mat in MaterialsToChange)
+ func(mat);
}
- public void CoroutineCascadeForMeAndChildrenAllRenderer(Func<FactObject, Renderer, IEnumerator> func)
+ public void CoroutineCascadeForMeAndChildrenAllMaterials(Func<FactObject, Material, IEnumerator> func)
{
this.StopAllCoroutines();
CascadeForMeAndChildren((FactObject fo) =>
- fo.ForAllRenderer((Renderer ren) =>
- this.StartCoroutine(func(fo, ren))
+ fo.ForAllMaterials((Material mat) =>
+ this.StartCoroutine(func(fo, mat))
));
}
}
diff --git a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs.meta
similarity index 83%
rename from Assets/Scripts/InteractionEngine/ImageHintAnimation.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs.meta
index fe808440..29a0e3b5 100644
--- a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs.meta
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 77b75bbb0b640664db62cf8acb69994e
+guid: c4034b835e07eae4c9c4239031f30737
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs
new file mode 100644
index 00000000..027670dd
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Linq;
+using UnityEngine;
+using System.Collections;
+using UnityEditor;
+using static GlobalBehaviour;
+
+/// <summary>
+/// <see cref="Fact.Id"/>/ <c>MonoBehaviour</c> wrapper to be attached to <see cref="Fact.WorldRepresentation"/>
+/// </summary>
+public class FactObject3D : FactObject
+{
+ public new Renderer[] renderer;
+
+ #region Unity Serialization
+ protected override void _OnBeforeSerialize()
+ {
+#if UNITY_EDITOR // not working
+ if (EditorApplication.isPlaying)
+ return;
+
+ foreach (Collider collider in transform.GetComponentsInChildren<Collider>(includeInactive: true))
+ {
+ if (!collider.gameObject.GetComponent<FactObject>())
+ Debug.LogWarningFormat(
+ "{0}: {1} under {2} {3} has missing {2}!\n" +
+ "This is needed to select a {2}!",
+ nameof(Collider), collider, nameof(FactObject3D), this);
+ //try
+ //{
+ // collider.gameObject.AddComponent<FactObject3D>();
+ //}
+ //catch (Exception) { }
+ }
+#endif
+ }
+
+ protected override void _OnAfterDeserialize() { }
+ #endregion Unity Serialization
+
+ protected override void _Awake()
+ {
+ base._Awake();
+
+ MaterialsToChange ??= renderer.SelectMany(r => r.materials).ToArray();
+ }
+
+ protected override void _CustomReLabel()
+ {
+ switch (Fact) // for highly customized labels
+ {
+ case TestFact testFact:
+ //FactText[0].text = testFact.Label;
+ break;
+ default:
+ break;
+ }
+ }
+
+ public void CascadeForMeAndChildren(Action<FactObject3D> func)
+ {
+ func(this);
+ foreach (FactObject3D fo in AllChildren.OfType<FactObject3D>())
+ func(fo);
+ }
+
+ public void ForAllRenderer(Action<Renderer> func)
+ {
+ foreach (Renderer ren in renderer)
+ func(ren);
+ }
+
+ public void CoroutineCascadeForMeAndChildrenAllRenderer(Func<FactObject3D, Renderer, IEnumerator> func)
+ {
+ this.StopAllCoroutines();
+
+ CascadeForMeAndChildren((FactObject3D fo) =>
+ fo.ForAllRenderer((Renderer ren) =>
+ this.StartCoroutine(func(fo, ren))
+ ));
+ }
+}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs.meta
similarity index 100%
rename from Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObject3D.cs.meta
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs
new file mode 100644
index 00000000..592a3a52
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs
@@ -0,0 +1,44 @@
+using MoreLinq;
+using System.Linq;
+using UnityEngine.UI;
+
+public class FactObjectUI : FactObject
+{
+ public Image[] Images;
+
+ #region Unity Serialization
+ protected override void _OnBeforeSerialize() {
+ if(Images == null)
+ Images = GetComponents<Image>().ToArray();
+ }
+
+ protected override void _OnAfterDeserialize() { }
+ #endregion Unity Serialization
+
+ protected override void _Awake()
+ {
+ base._Awake();
+
+ if(MaterialsToChange == null)
+ {
+ MaterialsToChange = new UnityEngine.Material[Images.Length];
+ for (int i = 0; i < Images.Length; i++)
+ {
+ Images[i].material = new UnityEngine.Material(Images[i].material);
+ MaterialsToChange[i] = Images[i].material;
+ }
+ }
+ }
+
+ protected override void _CustomReLabel()
+ {
+ switch (Fact) // for highly customized labels
+ {
+ case TestFact testFact:
+ //FactText[0].text = testFact.Label;
+ break;
+ default:
+ break;
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs.meta
new file mode 100644
index 00000000..ca5b09d7
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactObjectUI.cs.meta
@@ -0,0 +1,15 @@
+fileFormatVersion: 2
+guid: f1ce2973f9bfc68479d5f3e2065ca729
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences:
+ - Default: {fileID: 2100000, guid: 3420edeac2b11384b9977bd98f565b24, type: 2}
+ - Selected: {fileID: 2100000, guid: f4a2ffc31b2faf446bf2a86047fbc9f8, type: 2}
+ - Hint: {fileID: 2100000, guid: 923bc3e7bd8ae2745859a620359be2f8, type: 2}
+ - Solution: {fileID: 2100000, guid: 79cc7db91c9641d4aa8a1513d6ca85d1, type: 2}
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactWrapper.cs
similarity index 82%
rename from Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.cs
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactWrapper.cs
index 65ef5c09..e3fe4d16 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactWrapper.cs
@@ -26,7 +26,7 @@ public string URI
FactUpdated();
}
}
- [HideInInspector, SerializeField] // So cloning takes over
+ [SerializeField] // So cloning takes over HideInInspector,
protected string _URI;
/// <summary>
@@ -49,27 +49,39 @@ public Fact Fact
}
protected Fact _Fact;
- private void Awake()
+ #region UnityMethods
+ // region UnityMethods:
+ // protected not private: Note to Derived to not implement
+
+ protected void Awake()
{
_Awake();
}
protected virtual void _Awake() { }
- private void OnEnable()
+ protected void Start()
+ {
+ _Start();
+ }
+ protected virtual void _Start() { }
+
+ protected void OnEnable()
{
+ //CommunicationEvents.AnimateExistingFactEvent.RemoveAllListeners();
CommunicationEvents.AnimateExistingFactEvent.AddListener(HiglightFactEvent);
CommunicationEvents.RemoveFactEvent.AddListener(DeleteFactEvent);
_OnEnable();
}
protected virtual void _OnEnable() { }
- private void OnDisable()
+ protected void OnDisable()
{
CommunicationEvents.AnimateExistingFactEvent.RemoveListener(HiglightFactEvent);
CommunicationEvents.RemoveFactEvent.RemoveListener(DeleteFactEvent);
_OnDisable();
}
protected virtual void _OnDisable() { }
+ #endregion UnityMethods
public void HiglightFactEvent(string fid, FactMaterials tmpState)
{
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactWrapper.cs.meta
similarity index 100%
rename from Assets/Scripts/InteractionEngine/FactHandling/FactWrapper.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/FactWrapper.cs.meta
diff --git a/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs
similarity index 75%
rename from Assets/Scripts/InventoryStuff/RenderedScrollFact.cs
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs
index e744a1c2..be4926cb 100644
--- a/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs
@@ -4,12 +4,11 @@
using UnityEngine.EventSystems;
using static CommunicationEvents;
-public class RenderedScrollFact : FactWrapper, IDropHandler, IPointerClickHandler
+public class RenderedScrollFact : FactObjectUI, IDropHandler, IPointerClickHandler
{
#region Serializable
public TextMeshProUGUI LabelMesh;
public GameObject HintButton;
- public ImageHintAnimation ImageHintObject;
#endregion Serializable
#region Properties
@@ -42,17 +41,11 @@ public string ScrollFactLabel
=> LabelMesh.text;
#endregion Properties
- public override void HighlightAs(FactMaterials tmpState)
- {
- ImageHintObject.AnimationTrigger();
- }
-
protected override void FactUpdated()
{
- if (RenderedFactObject != null)
- Destroy(RenderedFactObject.gameObject);
+ Destroy(RenderedFactObject);
- CommunicationEvents.NewAssignmentEvent.Invoke();
+ NewAssignmentEvent.Invoke();
_URI ??= ScrollFactURI;
@@ -63,11 +56,6 @@ protected override void FactUpdated()
protected override void _DeleteFactEvent(Fact fact)
=> Fact = null;
- protected override void _Awake()
- {
- _URI ??= ScrollFactURI;
- }
-
protected override void _OnEnable()
{
HintAvailableEvent.AddListener(OnHintAvailable);
@@ -82,6 +70,7 @@ public void Populate(Scroll scroll, int Nr)
{
Scroll = scroll;
ID = Nr;
+ _URI = ScrollFactURI;
}
private void SetLabel(string label)
@@ -91,17 +80,16 @@ private void SetLabel(string label)
public void OnClickHintButton()
{
- ScrollFactHintEvent.Invoke(ImageHintObject, URI);
+ ScrollFactHintEvent.Invoke(URI);
}
public void OnHintAvailable(List<string> uris)
{
- HintButton.SetActive(true);// uris.Contains(ScrollFactURI));
+ HintButton.SetActive(uris.Contains(ScrollFactURI));
}
#region DropHandling
-
- private FactObject RenderedFactObject;
+ private GameObject RenderedFactObject;
public void OnDrop(PointerEventData eventData)
{
@@ -113,15 +101,12 @@ public void OnDrop(PointerEventData eventData)
ScrollDetails.ParameterDisplays.Count + " label: " + ScrollFactLabel);
RenderedFactObject = // has to be: ..., Vector3.zero, Quaternion.identity => SetParent
- Instantiate(eventData.pointerDrag, Vector3.zero, Quaternion.identity)
- .GetComponent<FactObject>();
- RenderedFactObject.transform.SetParent(gameObject.transform, worldPositionStays: false);
+ Instantiate(eventData.pointerDrag, Vector3.zero, Quaternion.identity);
- RenderedFactObject.GetComponent<ImageHintAnimation>().ResetAnimation();
+ RenderedFactObject.transform.SetParent(gameObject.transform, worldPositionStays: false);
}
public void OnPointerClick(PointerEventData eventData)
=> _DeleteFactEvent(null);
-
#endregion DropHandling
}
diff --git a/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs.meta
similarity index 100%
rename from Assets/Scripts/InventoryStuff/RenderedScrollFact.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/FactWrapper/RenderedScrollFact.cs.meta
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
index 2f775ff1..03139734 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
@@ -97,7 +97,7 @@ public abstract class Fact
/// <summary>
/// Reference to <c>GameObject</c> that represents this Fact in the GameWorld.
/// </summary>
- /// <seealso cref="FactObject"/>
+ /// <seealso cref="FactObject3D"/>
[JsonIgnore]
public FactWrapper WorldRepresentation;
diff --git a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs b/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
deleted file mode 100644
index 173ce4db..00000000
--- a/Assets/Scripts/InteractionEngine/ImageHintAnimation.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Collections;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class ImageHintAnimation : MonoBehaviour
-{
- public Image imageToChange;
-
- [HideInInspector, SerializeField] // So cloning takes over
- private Color imageToChangeDefaultColor;
- private IEnumerator AnimationRoutine;
-
-
- void Awake()
- {
- if (imageToChange != null)
- imageToChangeDefaultColor = imageToChange.color;
- }
-
- public void AnimationTrigger()
- {
- StartCoroutine(AnimationRoutine = _Animation());
-
- IEnumerator _Animation()
- {
- for (IEnumerator clock = IEnumeratorExtensions.WaitForSeconds(GlobalBehaviour.HintAnimationDuration)
- ; clock.MoveNext();)
-
- yield return imageToChange.color =
- Color.Lerp
- ( GlobalBehaviour.HintAnimationStartColor
- , GlobalBehaviour.HintAnimationEndColor
- , Mathf.PingPong(Time.time, GlobalBehaviour.AnimationLerpDuration));
-
- imageToChange.color = imageToChangeDefaultColor;
- }
- }
-
- public void ResetAnimation()
- {
- if (AnimationRoutine != null)
- StopCoroutine(AnimationRoutine);
-
- imageToChange.color = imageToChangeDefaultColor;
- }
-}
diff --git a/Assets/Scripts/InteractionEngine/ShinyThings.cs b/Assets/Scripts/InteractionEngine/ShinyThings.cs
index 91b5e164..5933e36d 100644
--- a/Assets/Scripts/InteractionEngine/ShinyThings.cs
+++ b/Assets/Scripts/InteractionEngine/ShinyThings.cs
@@ -8,7 +8,7 @@ public class ShinyThings : MonoBehaviour
{
public WorldCursor Cursor;
//Attributes for Highlighting of Facts when Mouse-Over
- private List<FactObject> LastFactSelection = new();
+ private List<FactObject3D> LastFactSelection = new();
//Variables for Pushout-Highlighting
private static float timerDuration = 2.5f;
@@ -60,8 +60,8 @@ public void Update()
private void HighlightCurserHit(RaycastHit[] hits)
{
- List<FactObject> selected_fact_objs = hits
- .Select(h => h.transform?.GetComponentInChildren<FactObject>())
+ List<FactObject3D> selected_fact_objs = hits
+ .Select(h => h.transform?.GetComponentInChildren<FactObject3D>())
.Where(f => f != null)
.ToList();
@@ -79,7 +79,7 @@ private void HighlightCurserHit(RaycastHit[] hits)
LastFactSelection = selected_fact_objs;
return;
- void _ApplyMaterial(FactObject root, Material new_mat) =>
+ void _ApplyMaterial(FactObject3D root, Material new_mat) =>
root.CoroutineCascadeForMeAndChildrenAllRenderer(
(_, renderer) =>
renderer.ProgrammMaterialChange(new[] {
@@ -88,22 +88,12 @@ void _ApplyMaterial(FactObject root, Material new_mat) =>
);
}
- public static void HighlightFact(Fact startFact, FactMaterials tmp_mat)
- {
- if (startFact.WorldRepresentation == null)
- return;
-
- startFact.WorldRepresentation
- .GetComponentInChildren<FactObject>()
- ?.HighlightAs(tmp_mat);
- }
-
public void HighlightWithFireworks(Fact fact, FactMaterials mat)
{
rain_wait = IEnumeratorExtensions.yield_break; //stop rain
StartCoroutine(_BlossomAndDie());
- HighlightFact(fact, mat);
+ CommunicationEvents.AnimateExistingFactEvent.Invoke(fact.Id, mat);
IEnumerator _BlossomAndDie()
{
diff --git a/Assets/Scripts/InventoryStuff/DisplayFacts.cs b/Assets/Scripts/InventoryStuff/DisplayFacts.cs
index 81e51b08..fc54a78a 100644
--- a/Assets/Scripts/InventoryStuff/DisplayFacts.cs
+++ b/Assets/Scripts/InventoryStuff/DisplayFacts.cs
@@ -17,6 +17,9 @@ public static DisplayFacts Instance
private set { _instance ??= value; }
}
+ public static Transform FactscreenContent => Instance.factscreenContent;
+ public static GameObject FactSpotPrefab => Instance.factSpotPrefab;
+
//cannot populate static dict while serialization => "singelton"
public static Dictionary<Type, GameObject> PrefabDictionary { get => Instance._PrefabDictionary; }
private Dictionary<Type, GameObject> _PrefabDictionary = new();
@@ -115,22 +118,26 @@ public void AddFact(Fact fact)
}
// create display
- var display = CreateDisplay(transform, fact);
+ var display = CreateDisplay(fact, factscreenContent);
display.transform.localPosition = Vector3.zero;
displayedFacts.TryAdd(fact.Id, display);
- // disable if showOnlyFavorites is true and fact is no favorite
- display.transform.parent.gameObject.SetActive(!(showOnlyFavorites && !display.GetComponent<FactFavorisation>().IsFavorite));
+ display.transform.parent.gameObject.SetActive(
+ !showOnlyFavorites
+ || display.GetComponent<FactFavorisation>().IsFavorite
+ );
display.transform.parent.transform.SetSiblingIndex(siblingIdx);
- }
- private GameObject CreateDisplay(Transform transform, Fact fact)
- {
- var spot = Instantiate(factSpotPrefab, factscreenContent);
- spot.GetComponent<FactWrapper>().Fact = fact;
+ return;
- return InstantiateDisplay(fact, spot.transform);
+ GameObject CreateDisplay(Fact fact, Transform transform)
+ {
+ var spot = Instantiate(FactSpotPrefab, transform);
+ spot.GetComponent<FactWrapper>().Fact = fact;
+
+ return InstantiateDisplay(fact, spot.transform);
+ }
}
public static GameObject InstantiateDisplay(Fact fact, Transform transform)
@@ -207,7 +214,7 @@ public void FavoritesFilterChanged(Toggle t)
else
{ // hide not favorites
displayedFacts.Values
- .Where(go => !go.GetComponent<FactFavorisation>().IsFavorite)
+ .Where(gO => gO != null && !gO.GetComponent<FactFavorisation>().IsFavorite)
.ForEach(nFav => nFav.transform.parent.gameObject.SetActive(false));
}
}
diff --git a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
index e283d271..0ed09055 100644
--- a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
+++ b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs
@@ -21,6 +21,8 @@ void Start()
void BuildScrollGUI()
{
+ while (GlobalBehaviour.AvailableScrolls == null) ; // active wait for server, should be rare
+
AllowedScrolls = GlobalBehaviour.AvailableScrolls
.Where(s => StageStatic.stage.AllowedScrolls?.Contains(s.@ref) ?? true)
.ToList();
diff --git a/Assets/Scripts/InventoryStuff/ScrollDetails.cs b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
index ca2d328e..22e20cc7 100644
--- a/Assets/Scripts/InventoryStuff/ScrollDetails.cs
+++ b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
@@ -7,6 +7,7 @@
using System.Linq;
using static CommunicationEvents;
using static SOMDocManager;
+using static GlobalBehaviour;
public class ScrollDetails : MonoBehaviour
{
@@ -39,14 +40,12 @@ private void OnEnable()
{
ScrollFactHintEvent.AddListener(animateHint);
NewAssignmentEvent.AddListener(NewAssignmentTrigger);
- RemoveFactEvent.AddListener(removeFactFromAssignment);
}
private void OnDisable()
{
ScrollFactHintEvent.RemoveListener(animateHint);
NewAssignmentEvent.RemoveListener(NewAssignmentTrigger);
- RemoveFactEvent.RemoveListener(removeFactFromAssignment);
}
public void SetScroll(Scroll scroll_to_set)
@@ -81,8 +80,8 @@ public void SetScroll(Scroll scroll_to_set)
ParameterDisplays[i].gameObject.SetActive(false);
//set active scroll for ErrorMessagePopup
- Popup.setScroll(ActiveScroll);
- Popup.setParameterDisplays(ParameterDisplays.Select(RSF => RSF.gameObject).ToList());
+ Popup.ActiveScroll = ActiveScroll;
+ Popup.ParameterDisplays = ParameterDisplays;
}
/// <summary>
@@ -273,7 +272,7 @@ void _processRenderedScroll(Scroll rendered, List<string> hintUris)
}
}
- public void animateHint(ImageHintAnimation scrollHintImage, string scrollParameterUri)
+ public void animateHint(string scrollParameterUri)
{
if (FactOrganizer.AllFacts.ContainsKey(scrollParameterUri))
AnimateExistingFactEvent.Invoke(
@@ -316,19 +315,4 @@ public void animateHint(ImageHintAnimation scrollHintImage, string scrollParamet
}
}
}
-
- //this is called whenever a Fact is Deleted in the world, to make sure it is removed from the scroll
- public void removeFactFromAssignment(Fact fact)
- {
- Transform originalScroll = gameObject.transform.GetChild(1).transform;
- Transform originalScrollView = originalScroll.GetChild(1);
- Transform originalViewport = originalScrollView.GetChild(0);
-
- for (int i = 0; i < originalViewport.GetChild(0).childCount; i++)
- {
- RenderedScrollFact scrollFact = originalViewport.GetChild(0).transform.GetChild(i).GetChild(0).gameObject.GetComponent<RenderedScrollFact>();
- if (scrollFact.ScrollFactLabel == fact.Label)
- scrollFact.OnPointerClick(null);
- }
- }
}
diff --git a/Assets/Scripts/Loading/Stage.cs b/Assets/Scripts/Loading/Stage.cs
index 5ed72ba7..33af000e 100644
--- a/Assets/Scripts/Loading/Stage.cs
+++ b/Assets/Scripts/Loading/Stage.cs
@@ -462,7 +462,7 @@ public bool CheckSolved()
{
foreach (var hitlist in hits)
foreach (var hit in hitlist)
- AnimateExistingAsSolutionEvent.Invoke(factState[hit], FactObject.FactMaterials.Solution);
+ AnimateExistingAsSolutionEvent.Invoke(factState[hit], FactWrapper.FactMaterials.Solution);
player_record.solved = true;
push_record(time_s);
diff --git a/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs
index d756607a..ed49702a 100644
--- a/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs
+++ b/Assets/Scripts/UI/FactExplorer/FactFavorisation.cs
@@ -4,7 +4,7 @@
using UnityEngine.Events;
using UnityEngine.EventSystems;
-[RequireComponent(typeof(FactObject), typeof(RectTransform))]
+[RequireComponent(typeof(FactWrapper), typeof(RectTransform))]
public class FactFavorisation : MonoBehaviour, IPointerClickHandler
{
#region InspectorVariables
@@ -50,7 +50,7 @@ private void Update()
private void Start()
{
- fact = transform.GetComponent<FactObject>().Fact;
+ fact = transform.GetComponent<FactWrapper>().Fact;
ChangeFavoriteEvent.AddListener(OnFavoriteChange);
// if there already was a favoriteDisplayPrefab child (e.g. due to cloning) remove it
diff --git a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs
index 30b1db9a..9d9bd45e 100644
--- a/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs
+++ b/Assets/Scripts/UI/FactExplorer/OpenFactExplorer.cs
@@ -4,7 +4,7 @@
using UnityEngine;
using UnityEngine.EventSystems;
-[RequireComponent(typeof(FactObject), typeof(RectTransform), typeof(DragHandling))]
+[RequireComponent(typeof(FactWrapper), typeof(RectTransform), typeof(DragHandling))]
public class OpenFactExplorer : MonoBehaviour, IPointerClickHandler
{
#region Variables
@@ -77,7 +77,7 @@ private void DoOpenFactExplorer()
Destroy(factExplorer != null ? factExplorer.gameObject : null);
var parent = transform.GetComponentInParent<Canvas>().transform;
- var fact = transform.GetComponent<FactObject>().Fact;
+ var fact = transform.GetComponent<FactWrapper>().Fact;
factExplorer = Instantiate(factExplorerPrefab.transform, Input.mousePosition, Quaternion.identity, parent);
factExplorer.GetComponent<FactExplorer>().Initialize(fact, transform.position);
diff --git a/Assets/Scripts/UI/InGame/PopupBehavior.cs b/Assets/Scripts/UI/InGame/PopupBehavior.cs
index 174df6f0..72288093 100644
--- a/Assets/Scripts/UI/InGame/PopupBehavior.cs
+++ b/Assets/Scripts/UI/InGame/PopupBehavior.cs
@@ -13,8 +13,8 @@ public class PopupBehavior : MonoBehaviour
[SerializeField] Button CloseButton;
[SerializeField] TMP_Text message;
- private Scroll activeScroll;
- private List<GameObject> parameterDisplays;
+ public Scroll ActiveScroll { private get; set; }
+ public List<RenderedScrollFact> ParameterDisplays { private get; set; }
public string ServerErrorMessage = "unknown server error";
public string NonTotalMessage = "Scroll application not complete";
@@ -36,15 +36,6 @@ public void setMessage(string errorMessage)
this.message.text = errorMessage;
}
- public void setScroll(Scroll scroll)
- {
- this.activeScroll = scroll;
- }
- public void setParameterDisplays(List<GameObject> parameters)
- {
- this.parameterDisplays = parameters;
- }
-
public void showPopUp()
{
canvas.SetActive(true);
@@ -96,14 +87,11 @@ private string generateHelpfulMessageAndAnimateScrollParam(Scroll.ScrollApplicat
MMTDeclaration fact = parseFactFromError(error);
//animate all invalidly assigned facts
- if (parameterDisplays != null && fact != null)
+ if (ParameterDisplays != null && fact != null)
{
- foreach (GameObject g in parameterDisplays)
- {
- RenderedScrollFact scrollfact = g.transform.GetChild(0).GetComponent<RenderedScrollFact>();
+ foreach (RenderedScrollFact scrollfact in ParameterDisplays)
if (scrollfact.ScrollFactURI == fact.@ref.uri)
- scrollfact.ImageHintObject.GetComponentInChildren<ImageHintAnimation>().AnimationTrigger();
- }
+ scrollfact.HighlightAs(FactWrapper.FactMaterials.Hint);
}
else
{
@@ -156,7 +144,7 @@ private MMTDeclaration parseFactFromError(Scroll.ScrollApplicationCheckingError
factUri += "?" + factLabel;
//find the required fact in the active scroll thats invalidly assigned
- return activeScroll?.requiredFacts
+ return ActiveScroll?.requiredFacts
.FirstOrDefault(decl => decl.@ref.uri.Equals(factUri));
}
}
diff --git a/Assets/Scripts/UI/MainMenue/ListLoader.cs b/Assets/Scripts/UI/MainMenue/ListLoader.cs
index e03835a4..a43a6161 100644
--- a/Assets/Scripts/UI/MainMenue/ListLoader.cs
+++ b/Assets/Scripts/UI/MainMenue/ListLoader.cs
@@ -1,6 +1,4 @@
-using System.Collections;
using System.Collections.Generic;
-using System.Linq;
using UnityEngine;
/// <summary>
@@ -17,8 +15,15 @@ public abstract class ListLoader<T> : MenueLoader
protected void OnEnable()
{
- Clear();
- Init();
+
+ StartCoroutine(_Init());
+
+ System.Collections.IEnumerator _Init()
+ {
+ yield return new WaitForEndOfFrame();
+ Clear();
+ Init();
+ }
}
protected void OnDisable()
diff --git a/Assets/Scripts/Utility/Extensions/IEnumeratorExtensions.cs b/Assets/Scripts/Utility/Extensions/IEnumeratorExtensions.cs
index 6ad5425c..8ed78a4f 100644
--- a/Assets/Scripts/Utility/Extensions/IEnumeratorExtensions.cs
+++ b/Assets/Scripts/Utility/Extensions/IEnumeratorExtensions.cs
@@ -16,7 +16,7 @@ public static IEnumerator YieldBreak()
yield break;
}
- public static IEnumerator<float> WaitForSeconds(float time)
+ public static IEnumerator<float> ClockForSeconds(float time)
{
if (time < 0)
yield break;
--
GitLab