From fbf2233af6adb86e8fd170938944168ea6b96cb6 Mon Sep 17 00:00:00 2001 From: MaZiFAU <marco.alexander.zimmer@fau.de> Date: Mon, 5 Sep 2022 03:53:36 +0200 Subject: [PATCH] + Refactored Hint/highlight Animation (x1); --- .editorconfig | 4 + Assets/Materials/HintMaterial.mat | 86 ++++ Assets/Materials/HintMaterial.mat.meta | 8 + Assets/Materials/SeeThrough.mat | 8 +- Assets/Materials/SeeThrough_Selected.mat | 88 ++++ Assets/Materials/SeeThrough_Selected.mat.meta | 8 + Assets/Materials/SolutionMaterial.mat | 86 ++++ Assets/Materials/SolutionMaterial.mat.meta | 8 + Assets/Resources/Prefabs/Facts/Angle.prefab | 48 +- Assets/Resources/Prefabs/Facts/Line.prefab | 109 +++-- .../Facts/{Sphere.prefab => Point.prefab} | 56 ++- .../{Sphere.prefab.meta => Point.prefab.meta} | 0 Assets/Resources/Prefabs/Facts/Ray.prefab | 51 ++- Assets/Resources/Prefabs/GlobalObject.prefab | 12 +- .../Prefabs/TestPrefabs/HidingCanvas.prefab | 45 +- .../ScrollPrefabTestRendered.prefab | 209 ++++----- Assets/Resources/Prefabs/UI/FrameITUI.prefab | 11 +- .../Prefabs/UI/Ingame/FrameITUI_mobile.prefab | 5 +- .../Prefabs/UI/Ingame/HidingCanvas.prefab | 23 +- .../Prefabs/UI/Ingame/MainPlayer.prefab | 415 +++++++++--------- .../Prefabs/UI/Scrolls/ScrollPrefab.prefab | 102 ++--- Assets/Scenes/Menues/MainMenue.unity | 111 +---- Assets/Scenes/Worlds/RiverWorld.unity | 5 - Assets/Scripts/GlobalBehaviour.cs | 57 +-- .../InteractionEngine/CommunicationEvents.cs | 48 +- .../FactHandling/FactObject.cs | 70 ++- .../FactHandling/FactSpawner.cs | 51 +-- .../Gadgets/GadgetBehaviour.cs | 2 + .../MeshRendererHintAnimation.cs | 65 --- .../MeshRendererHintAnimation.cs.meta | 11 - .../InteractionEngine/RendererExtensions.cs | 32 ++ .../RendererExtensions.cs.meta} | 2 +- .../Scripts/InteractionEngine/ShinyThings.cs | 357 +++------------ .../Scripts/InteractionEngine/WorldCursor.cs | 29 +- .../Scripts/InventoryStuff/DisplayScrolls.cs | 5 +- .../InventoryStuff/RenderedScrollFact.cs | 13 +- Assets/Scripts/InventoryStuff/Scroll.cs | 19 +- .../Scripts/InventoryStuff/ScrollDetails.cs | 28 +- Assets/Scripts/Loading/Stage.cs | 2 +- Assets/Scripts/TestScripts/ScrollUIManager.cs | 29 -- .../Scripts/UI/InGame/MainPlayerMode_Ctrl.cs | 18 +- Assets/Stages/TechDemo A.JSON | 2 +- Assets/Stages/TechDemo B.JSON | 2 +- 43 files changed, 1120 insertions(+), 1220 deletions(-) create mode 100644 .editorconfig create mode 100644 Assets/Materials/HintMaterial.mat create mode 100644 Assets/Materials/HintMaterial.mat.meta create mode 100644 Assets/Materials/SeeThrough_Selected.mat create mode 100644 Assets/Materials/SeeThrough_Selected.mat.meta create mode 100644 Assets/Materials/SolutionMaterial.mat create mode 100644 Assets/Materials/SolutionMaterial.mat.meta rename Assets/Resources/Prefabs/Facts/{Sphere.prefab => Point.prefab} (92%) rename Assets/Resources/Prefabs/Facts/{Sphere.prefab.meta => Point.prefab.meta} (100%) delete mode 100644 Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs delete mode 100644 Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs.meta create mode 100644 Assets/Scripts/InteractionEngine/RendererExtensions.cs rename Assets/Scripts/{TestScripts/ScrollUIManager.cs.meta => InteractionEngine/RendererExtensions.cs.meta} (83%) delete mode 100644 Assets/Scripts/TestScripts/ScrollUIManager.cs diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..2d2db2e4 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# IDE0018: Inline variable declaration +dotnet_diagnostic.IDE0018.severity = warning diff --git a/Assets/Materials/HintMaterial.mat b/Assets/Materials/HintMaterial.mat new file mode 100644 index 00000000..63fc1e0a --- /dev/null +++ b/Assets/Materials/HintMaterial.mat @@ -0,0 +1,86 @@ +%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: HintMaterial + m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, 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 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.9339623, g: 0.39152342, b: 0.030838395, a: 0.3882353} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/HintMaterial.mat.meta b/Assets/Materials/HintMaterial.mat.meta new file mode 100644 index 00000000..9fa61dc6 --- /dev/null +++ b/Assets/Materials/HintMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8621b710d7d1d5041bc6bfd0cc37cdff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/SeeThrough.mat b/Assets/Materials/SeeThrough.mat index 2225cb80..89cfa9b8 100644 --- a/Assets/Materials/SeeThrough.mat +++ b/Assets/Materials/SeeThrough.mat @@ -2,14 +2,16 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SeeThrough m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHAPREMULTIPLY_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -55,6 +57,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _ColorMask: 15 @@ -82,3 +85,4 @@ Material: m_Colors: - _Color: {r: 0, g: 0.23494856, b: 0.9716981, a: 0.11372549} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/SeeThrough_Selected.mat b/Assets/Materials/SeeThrough_Selected.mat new file mode 100644 index 00000000..8c6d0223 --- /dev/null +++ b/Assets/Materials/SeeThrough_Selected.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: SeeThrough_Selected + m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHAPREMULTIPLY_ON + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _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: 0 + m_Colors: + - _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/SeeThrough_Selected.mat.meta b/Assets/Materials/SeeThrough_Selected.mat.meta new file mode 100644 index 00000000..6fa86bb8 --- /dev/null +++ b/Assets/Materials/SeeThrough_Selected.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34a95baef388bb8458c97a626b732f9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/SolutionMaterial.mat b/Assets/Materials/SolutionMaterial.mat new file mode 100644 index 00000000..fa7820a7 --- /dev/null +++ b/Assets/Materials/SolutionMaterial.mat @@ -0,0 +1,86 @@ +%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: SolutionMaterial + m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, 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 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.18332769, g: 0.6415094, b: 0.021181926, a: 0.9843137} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/SolutionMaterial.mat.meta b/Assets/Materials/SolutionMaterial.mat.meta new file mode 100644 index 00000000..5c58d2ac --- /dev/null +++ b/Assets/Materials/SolutionMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a003f0807acc1142965bb21bdc824f6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Facts/Angle.prefab b/Assets/Resources/Prefabs/Facts/Angle.prefab index 201b2d09..0ab4ab38 100644 --- a/Assets/Resources/Prefabs/Facts/Angle.prefab +++ b/Assets/Resources/Prefabs/Facts/Angle.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 0.95, z: 0.0025} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3394522496185282011} m_RootOrder: 1 @@ -48,6 +49,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -164,12 +166,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 7699224541667766671} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 7699224541667766671} + m_maskType: 0 --- !u!1 &3394522495515098197 GameObject: m_ObjectHideFlags: 0 @@ -201,6 +203,7 @@ Transform: 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: - {fileID: 3394522496185282011} m_Father: {fileID: 5781467132517744785} @@ -225,6 +228,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -295,7 +299,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} m_Name: m_EditorClassIdentifier: - Id: 0 + URI: + materials: + - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} + - {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} + - {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} + - {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} + renderer: + - {fileID: 3394522495515098202} + cascade: [] + 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} --- !u!1 &3394522496185282000 GameObject: m_ObjectHideFlags: 0 @@ -309,7 +325,6 @@ GameObject: - component: {fileID: 3394522496185282005} - component: {fileID: 3394522496185282006} - component: {fileID: 3394522496185282007} - - component: {fileID: 2270583313952035853} m_Layer: 12 m_Name: AngleInner m_TagString: Untagged @@ -327,6 +342,7 @@ Transform: 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: - {fileID: 6114879545313836302} - {fileID: 5828814633827486385} @@ -352,6 +368,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -410,18 +427,6 @@ MonoBehaviour: m_EditorClassIdentifier: radius: 0.95 height: 0.01 ---- !u!114 &2270583313952035853 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3394522496185282000} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &7144232170300037021 GameObject: m_ObjectHideFlags: 0 @@ -448,6 +453,7 @@ Transform: 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: - {fileID: 3394522495515098200} m_Father: {fileID: 0} @@ -481,6 +487,7 @@ RectTransform: m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 0.95, z: 0.0025} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3394522496185282011} m_RootOrder: 0 @@ -501,6 +508,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -617,9 +625,9 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2846497428082229918} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2846497428082229918} + m_maskType: 0 diff --git a/Assets/Resources/Prefabs/Facts/Line.prefab b/Assets/Resources/Prefabs/Facts/Line.prefab index 57ed1b80..95f3833b 100644 --- a/Assets/Resources/Prefabs/Facts/Line.prefab +++ b/Assets/Resources/Prefabs/Facts/Line.prefab @@ -26,8 +26,9 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.329, y: 2.805062, z: -4.33} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3517099398133763913} + - {fileID: 3655214872469710227} - {fileID: 7972877566157790116} m_Father: {fileID: 0} m_RootOrder: 0 @@ -61,6 +62,7 @@ RectTransform: 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: 5818562496562931847} m_RootOrder: 1 @@ -81,6 +83,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -197,12 +200,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2096909858734684758} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2096909858734684758} + m_maskType: 0 --- !u!114 &1586728893263614116 MonoBehaviour: m_ObjectHideFlags: 0 @@ -215,7 +218,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 0} + Cam1: {fileID: 0} + Cam2: {fileID: 0} + BackUPCam: {fileID: 0} --- !u!1 &6247621022589904505 GameObject: m_ObjectHideFlags: 0 @@ -227,7 +232,6 @@ GameObject: - component: {fileID: 4678806186037624479} - component: {fileID: 2701943617241909663} - component: {fileID: 4008433908760336842} - - component: {fileID: 2544799164941842642} m_Layer: 11 m_Name: LineHighlight m_TagString: Untagged @@ -242,12 +246,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6247621022589904505} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.51, z: 0.51} + m_LocalScale: {x: 0.96, y: 0.102, z: 0.102} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3517099398133763913} - m_RootOrder: 1 + m_Father: {fileID: 3655214872469710227} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2701943617241909663 MeshFilter: @@ -268,6 +273,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -298,18 +304,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &2544799164941842642 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6247621022589904505} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6378548342073962023 GameObject: m_ObjectHideFlags: 0 @@ -325,7 +319,7 @@ GameObject: - component: {fileID: 6179051021116985022} - component: {fileID: 9072308735336053453} m_Layer: 11 - m_Name: Line + m_Name: LineOuter m_TagString: SnapZone m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -340,12 +334,11 @@ Transform: m_GameObject: {fileID: 6378548342073962023} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.02, z: 0.02} - m_Children: - - {fileID: 2374130608748553515} - - {fileID: 4678806186037624479} - m_Father: {fileID: 5818562496562931847} - m_RootOrder: 0 + m_LocalScale: {x: 1, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3655214872469710227} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6398251481098695290 MeshFilter: @@ -366,6 +359,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -408,7 +402,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} m_Name: m_EditorClassIdentifier: - Id: 0 + URI: + materials: + - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} + - {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} + - {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} + - {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} + renderer: + - {fileID: 6015977261426572496} + cascade: [] + 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} --- !u!65 &6179051021116985022 BoxCollider: m_ObjectHideFlags: 0 @@ -424,7 +430,7 @@ BoxCollider: m_Center: {x: 0, y: 0, z: 0} --- !u!95 &9072308735336053453 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -437,10 +443,45 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6754103560634016048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3655214872469710227} + m_Layer: 11 + m_Name: RealLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3655214872469710227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6754103560634016048} + 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: + - {fileID: 2374130608748553515} + - {fileID: 3517099398133763913} + - {fileID: 4678806186037624479} + m_Father: {fileID: 5818562496562931847} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8536634090652517107 GameObject: m_ObjectHideFlags: 0 @@ -468,9 +509,10 @@ Transform: m_GameObject: {fileID: 8536634090652517107} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.95, y: 0.5, z: 0.5} + m_LocalScale: {x: 0.95, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3517099398133763913} + m_Father: {fileID: 3655214872469710227} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8620665629189134186 @@ -492,6 +534,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/Facts/Sphere.prefab b/Assets/Resources/Prefabs/Facts/Point.prefab similarity index 92% rename from Assets/Resources/Prefabs/Facts/Sphere.prefab rename to Assets/Resources/Prefabs/Facts/Point.prefab index 6748d114..faf981c3 100644 --- a/Assets/Resources/Prefabs/Facts/Sphere.prefab +++ b/Assets/Resources/Prefabs/Facts/Point.prefab @@ -13,9 +13,8 @@ GameObject: - component: {fileID: 1075046474335495899} - component: {fileID: 8087426936968725520} - component: {fileID: 114239372808020652} - - component: {fileID: 6183343481027254878} m_Layer: 10 - m_Name: Sphere + m_Name: Point m_TagString: Selectable m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -31,6 +30,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.012604177, y: 0.8909064, z: -0.31583664} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 338274751687282010} - {fileID: 5939570736350582895} @@ -58,6 +58,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -113,19 +114,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} m_Name: m_EditorClassIdentifier: - Id: 0 ---- !u!114 &6183343481027254878 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537518992981541273} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3} - m_Name: - m_EditorClassIdentifier: + URI: + materials: + - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} + - {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} + - {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} + - {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} + renderer: + - {fileID: 1075046474335495899} + cascade: [] + 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} --- !u!1 &942938646191423391 GameObject: m_ObjectHideFlags: 0 @@ -139,7 +140,7 @@ GameObject: - component: {fileID: 4028707725789292921} - component: {fileID: 2878035603844960510} m_Layer: 10 - m_Name: Text + m_Name: LabelText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -155,6 +156,7 @@ RectTransform: 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: 2 @@ -175,6 +177,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -291,12 +294,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 6333161707715706899} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 6333161707715706899} + m_maskType: 0 --- !u!114 &2878035603844960510 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,7 +312,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 0} + Cam1: {fileID: 0} + Cam2: {fileID: 0} + BackUPCam: {fileID: 0} --- !u!1 &3501726312507320707 GameObject: m_ObjectHideFlags: 0 @@ -321,7 +326,7 @@ GameObject: - component: {fileID: 1897634834899172406} - component: {fileID: 2282314938058693146} m_Layer: 10 - m_Name: Sphere_Snap + m_Name: SnapSphere m_TagString: SnapZone m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -337,6 +342,7 @@ Transform: 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 @@ -366,7 +372,7 @@ GameObject: - component: {fileID: 7801512564954744306} - component: {fileID: 8231516868387511546} m_Layer: 10 - m_Name: Sphere + m_Name: PointSphere m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -382,6 +388,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7110486964728869325} m_RootOrder: 0 @@ -405,6 +412,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -447,7 +455,7 @@ GameObject: - component: {fileID: 87526001619117826} - component: {fileID: 8470693708050556402} m_Layer: 10 - m_Name: Cylinder + m_Name: LabelStickCylinder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -463,6 +471,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.295, z: 0} m_LocalScale: {x: 0.02, y: 0.3, z: 0.02} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7110486964728869325} m_RootOrder: 1 @@ -486,6 +495,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/Facts/Sphere.prefab.meta b/Assets/Resources/Prefabs/Facts/Point.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/Facts/Sphere.prefab.meta rename to Assets/Resources/Prefabs/Facts/Point.prefab.meta diff --git a/Assets/Resources/Prefabs/Facts/Ray.prefab b/Assets/Resources/Prefabs/Facts/Ray.prefab index 308edcdf..fe50c539 100644 --- a/Assets/Resources/Prefabs/Facts/Ray.prefab +++ b/Assets/Resources/Prefabs/Facts/Ray.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.329, y: 2.805062, z: -4.33} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3517099398133763913} - {fileID: 7972877566157790116} @@ -43,7 +44,6 @@ GameObject: - component: {fileID: 2155667380501583430} - component: {fileID: 669189071706237370} - component: {fileID: 323004521892560777} - - component: {fileID: 6869391996213895011} m_Layer: 13 m_Name: LineHighlight m_TagString: Untagged @@ -61,6 +61,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.96, y: 0.56, z: 0.56} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3517099398133763913} m_RootOrder: 1 @@ -84,6 +85,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -114,18 +116,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &6869391996213895011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3751826764213783083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4853696702160906218 GameObject: m_ObjectHideFlags: 0 @@ -155,6 +145,7 @@ RectTransform: 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: 5818562496562931847} m_RootOrder: 1 @@ -175,6 +166,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -291,12 +283,12 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_renderer: {fileID: 2096909858734684758} - m_maskType: 0 _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 2096909858734684758} + m_maskType: 0 --- !u!114 &1586728893263614116 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,7 +301,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8cf5a358dacd3b54ab093ee289dd9ba2, type: 3} m_Name: m_EditorClassIdentifier: - Cam: {fileID: 0} + Cam1: {fileID: 0} + Cam2: {fileID: 0} + BackUPCam: {fileID: 0} --- !u!1 &6378548342073962023 GameObject: m_ObjectHideFlags: 0 @@ -340,7 +334,8 @@ Transform: m_GameObject: {fileID: 6378548342073962023} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.02, z: 0.02} + m_LocalScale: {x: 1, y: 0.15, z: 0.15} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2374130608748553515} - {fileID: 2155667380501583430} @@ -366,6 +361,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -408,7 +404,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 626c435b76e0d334f959ede8b54b07ac, type: 3} m_Name: m_EditorClassIdentifier: - Id: 0 + URI: + materials: + - {fileID: 2100000, guid: 8ae9adf4dc782964387385c1e8c0eb72, type: 2} + - {fileID: 2100000, guid: 34a95baef388bb8458c97a626b732f9f, type: 2} + - {fileID: 2100000, guid: 8621b710d7d1d5041bc6bfd0cc37cdff, type: 2} + - {fileID: 2100000, guid: 2a003f0807acc1142965bb21bdc824f6, type: 2} + renderer: + - {fileID: 6015977261426572496} + cascade: [] + 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} --- !u!65 &6179051021116985022 BoxCollider: m_ObjectHideFlags: 0 @@ -424,7 +432,7 @@ BoxCollider: m_Center: {x: 0, y: 0, z: 0} --- !u!95 &3083874998912248809 Animator: - serializedVersion: 3 + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -437,6 +445,7 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -469,6 +478,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.95, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3517099398133763913} m_RootOrder: 0 @@ -492,6 +502,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/GlobalObject.prefab b/Assets/Resources/Prefabs/GlobalObject.prefab index d5b1ad0e..52ff148b 100644 --- a/Assets/Resources/Prefabs/GlobalObject.prefab +++ b/Assets/Resources/Prefabs/GlobalObject.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 772.31323, y: 1024.1111, z: -0.2632141} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -43,6 +44,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b012182d8506771469478402aa91edbf, type: 3} m_Name: m_EditorClassIdentifier: - hintAnimationStartColor: {r: 0, g: 0, b: 0, a: 0} - hintAnimationEndColor: {r: 0, g: 0, b: 0, a: 0} - hintAnimationDuration: 0 + _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 + _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} + _StageError: {r: 1, g: 0, b: 1, a: 0.39215687} + _GadgetLaserDistance: 30 + _GadgetPhysicalDistance: 2.5 diff --git a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab index 9d263c4e..0494b2ea 100644 --- a/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/TestPrefabs/HidingCanvas.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 8004702057423300230} m_RootOrder: 2 @@ -165,6 +166,7 @@ RectTransform: 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: - {fileID: 8004702056544321748} - {fileID: 8004702056709666220} @@ -285,6 +287,7 @@ RectTransform: 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: 8004702057423300230} m_RootOrder: 1 @@ -421,6 +424,7 @@ RectTransform: 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: - {fileID: 8004702056565720365} m_Father: {fileID: 8004702056412215060} @@ -512,6 +516,7 @@ RectTransform: 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: - {fileID: 8004702056604812097} m_Father: {fileID: 8004702057932254677} @@ -656,6 +661,7 @@ RectTransform: 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: 8004702056544321748} m_RootOrder: 0 @@ -733,6 +739,7 @@ RectTransform: 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: 8004702056565337459} m_RootOrder: 0 @@ -867,6 +874,7 @@ RectTransform: 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: 8004702057674230243} m_RootOrder: 0 @@ -943,6 +951,7 @@ RectTransform: 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: - {fileID: 8004702057674230243} m_Father: {fileID: 8004702056412215060} @@ -1068,6 +1077,7 @@ RectTransform: 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: 8004702057423300230} m_RootOrder: 0 @@ -1202,6 +1212,7 @@ RectTransform: 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: 8004702057423300230} m_RootOrder: 4 @@ -1336,6 +1347,7 @@ RectTransform: 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: 8004702057932254677} m_RootOrder: 7 @@ -1411,6 +1423,7 @@ RectTransform: 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: 8004702057653070421} m_RootOrder: 0 @@ -1546,6 +1559,7 @@ RectTransform: 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: 8004702057932254677} m_RootOrder: 6 @@ -1648,6 +1662,7 @@ RectTransform: 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: - {fileID: 8004702056750528013} - {fileID: 8004702056426230570} @@ -1688,6 +1703,7 @@ RectTransform: 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: - {fileID: 8004702057798297439} m_Father: {fileID: 8004702057932254677} @@ -1725,6 +1741,7 @@ RectTransform: 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: 8004702057900097907} m_RootOrder: 0 @@ -1771,6 +1788,7 @@ RectTransform: 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: - {fileID: 8004702057226546989} m_Father: {fileID: 8004702057798297439} @@ -1901,6 +1919,7 @@ RectTransform: 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: - {fileID: 8004702056618112982} m_Father: {fileID: 8004702056709666220} @@ -1940,6 +1959,7 @@ RectTransform: 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: - {fileID: 8004702057653070421} - {fileID: 8004702058139290459} @@ -1974,9 +1994,6 @@ MonoBehaviour: cursor: {fileID: 0} parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, type: 3} - x_Start: 0 - y_Start: 65 - y_Paece_Between_Items: 120 currentMmtAnswer: dynamicScrollDescriptionsActive: 1 automaticHintGenerationActive: 1 @@ -2038,6 +2055,7 @@ RectTransform: 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: 8004702057423300230} m_RootOrder: 3 @@ -2171,6 +2189,7 @@ RectTransform: 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: 8004702057900097907} m_RootOrder: 1 @@ -2216,6 +2235,7 @@ RectTransform: 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: - {fileID: 8004702057577331636} - {fileID: 8004702057845709953} @@ -2355,6 +2375,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7849991043560027498} - {fileID: 8004702058047913762} @@ -2462,6 +2483,7 @@ RectTransform: 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: 8004702057932254677} m_RootOrder: 4 @@ -2562,6 +2584,7 @@ RectTransform: 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: - {fileID: 8004702058299818659} m_Father: {fileID: 8004702057932254677} @@ -2688,7 +2711,6 @@ GameObject: m_Component: - component: {fileID: 8004702058139290459} - component: {fileID: 8004702058139290461} - - component: {fileID: 8004702058139290458} m_Layer: 5 m_Name: Scroll m_TagString: Untagged @@ -2706,6 +2728,7 @@ RectTransform: 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: - {fileID: 8004702057900097907} - {fileID: 8004702056412215060} @@ -2729,19 +2752,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &8004702058139290458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8004702058139290456} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3515765f8985a24b9519ac4af6cfe5d, type: 3} - m_Name: - m_EditorClassIdentifier: - initialShow: 1 --- !u!1 &8004702058299818656 GameObject: m_ObjectHideFlags: 0 @@ -2770,6 +2780,7 @@ RectTransform: 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: 8004702058047913762} m_RootOrder: 0 diff --git a/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab b/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab index e852cd82..1c9e0f7b 100644 --- a/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab +++ b/Assets/Resources/Prefabs/TestPrefabs/ScrollPrefabTestRendered.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 2345328633255984844} m_RootOrder: 0 @@ -62,6 +63,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &2345328632144347145 MonoBehaviour: m_ObjectHideFlags: 0 @@ -106,6 +108,7 @@ RectTransform: 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: - {fileID: 2345328632624463996} - {fileID: 2345328632644776895} @@ -140,6 +143,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -226,6 +230,7 @@ RectTransform: 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: - {fileID: 2345328632677851513} m_Father: {fileID: 2345328633551264619} @@ -259,6 +264,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -287,6 +293,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -316,7 +323,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2345328633551264618} + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: Hide m_Mode: 4 m_Arguments: @@ -327,7 +335,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2345328633804591746} + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: Show m_Mode: 4 m_Arguments: @@ -368,6 +377,7 @@ RectTransform: 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: - {fileID: 2345328632685208785} m_Father: {fileID: 2345328632188159996} @@ -414,6 +424,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -487,6 +498,7 @@ RectTransform: 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: - {fileID: 2345328633667878148} m_Father: {fileID: 2345328632188159996} @@ -520,6 +532,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -548,6 +561,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 2 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -610,6 +624,7 @@ RectTransform: 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: 2345328632497582121} m_RootOrder: 0 @@ -642,6 +657,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -688,6 +704,7 @@ RectTransform: 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: 2345328632624463996} m_RootOrder: 0 @@ -722,6 +739,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &2345328632685208784 MonoBehaviour: m_ObjectHideFlags: 0 @@ -764,6 +782,7 @@ RectTransform: 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: 2345328634214175348} m_RootOrder: 0 @@ -796,6 +815,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -842,12 +862,13 @@ RectTransform: 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: 2345328633667878148} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -874,6 +895,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -917,6 +939,7 @@ RectTransform: 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: - {fileID: 2345328632144347146} m_Father: {fileID: 2345328634171133150} @@ -963,6 +986,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -987,14 +1011,13 @@ GameObject: m_Component: - component: {fileID: 2345328633551264619} - component: {fileID: 2345328633551264617} - - component: {fileID: 2345328633551264618} m_Layer: 5 m_Name: RenderedScroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2345328633551264619 RectTransform: m_ObjectHideFlags: 0 @@ -1005,6 +1028,7 @@ RectTransform: 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: - {fileID: 2345328633982211444} - {fileID: 2345328632188159996} @@ -1029,19 +1053,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &2345328633551264618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2345328633551264620} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3515765f8985a24b9519ac4af6cfe5d, type: 3} - m_Name: - m_EditorClassIdentifier: - initialShow: 0 --- !u!1 &2345328633667878149 GameObject: m_ObjectHideFlags: 0 @@ -1068,6 +1079,7 @@ RectTransform: 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: - {fileID: 2345328632983030752} m_Father: {fileID: 2345328632644776895} @@ -1088,7 +1100,6 @@ GameObject: m_Component: - component: {fileID: 2345328633804591747} - component: {fileID: 2345328633804591745} - - component: {fileID: 2345328633804591746} m_Layer: 5 m_Name: OriginalScroll m_TagString: Untagged @@ -1106,6 +1117,7 @@ RectTransform: 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: - {fileID: 2345328634082250037} - {fileID: 2345328634171133150} @@ -1130,19 +1142,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &2345328633804591746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2345328633804591748} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3515765f8985a24b9519ac4af6cfe5d, type: 3} - m_Name: - m_EditorClassIdentifier: - initialShow: 1 --- !u!1 &2345328633982211445 GameObject: m_ObjectHideFlags: 0 @@ -1171,6 +1170,7 @@ RectTransform: 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: 2345328633551264619} m_RootOrder: 0 @@ -1203,6 +1203,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1228,13 +1229,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 @@ -1242,7 +1242,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1252,10 +1254,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -1263,40 +1263,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 18, y: 24, z: 21.1, w: 12} - m_textInfo: - textComponent: {fileID: 2345328633982211443} - characterCount: 43 - spriteCount: 0 - spaceCount: 5 - wordCount: 6 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2345328633987313321 @@ -1328,6 +1306,7 @@ RectTransform: 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: - {fileID: 2345328634146379270} m_Father: {fileID: 2345328634171133150} @@ -1361,6 +1340,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1389,6 +1369,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 2 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1451,6 +1432,7 @@ RectTransform: 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: 2345328634146379270} m_RootOrder: 0 @@ -1483,6 +1465,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1525,6 +1508,7 @@ RectTransform: 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: 2345328633804591747} m_RootOrder: 0 @@ -1557,6 +1541,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1582,13 +1567,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 @@ -1596,7 +1580,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -1606,10 +1592,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -1617,40 +1601,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 18, y: 24, z: 21.1, w: 12} - m_textInfo: - textComponent: {fileID: 2345328634082250036} - characterCount: 43 - spriteCount: 0 - spaceCount: 5 - wordCount: 6 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2345328634146379271 @@ -1679,6 +1641,7 @@ RectTransform: 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: - {fileID: 2345328634055402797} m_Father: {fileID: 2345328633987313320} @@ -1719,6 +1682,7 @@ RectTransform: 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: - {fileID: 2345328633255984844} - {fileID: 2345328633987313320} @@ -1753,6 +1717,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1839,6 +1804,7 @@ RectTransform: 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: - {fileID: 2345328632908414861} m_Father: {fileID: 2345328633804591747} @@ -1872,6 +1838,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1900,6 +1867,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1929,7 +1897,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2345328633804591746} + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: Hide m_Mode: 4 m_Arguments: @@ -1940,7 +1909,8 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2345328633551264618} + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: Show m_Mode: 4 m_Arguments: @@ -1980,6 +1950,7 @@ RectTransform: 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: - {fileID: 7146941621249359136} m_Father: {fileID: 7146941621012461137} @@ -2013,6 +1984,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2041,6 +2013,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -2071,6 +2044,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 4192926863770697072} + m_TargetAssemblyTypeName: m_MethodName: magicButton m_Mode: 1 m_Arguments: @@ -2110,6 +2084,7 @@ RectTransform: 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: - {fileID: 7146941620227570723} - {fileID: 2345328633804591747} @@ -2145,6 +2120,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2174,9 +2150,9 @@ MonoBehaviour: cursor: {fileID: 0} parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, type: 3} - x_Start: 0 - y_Start: 65 - y_Paece_Between_Items: 120 + currentMmtAnswer: + dynamicScrollDescriptionsActive: 1 + automaticHintGenerationActive: 1 --- !u!1 &7146941621249359137 GameObject: m_ObjectHideFlags: 0 @@ -2205,6 +2181,7 @@ RectTransform: 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: 7146941620227570723} m_RootOrder: 0 @@ -2237,6 +2214,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2262,13 +2240,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 26.85 m_fontSizeBase: 36 m_fontWeight: 400 @@ -2276,7 +2253,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -2286,10 +2265,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -2297,39 +2274,17 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 7146941621249359151} - characterCount: 5 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Prefabs/UI/FrameITUI.prefab b/Assets/Resources/Prefabs/UI/FrameITUI.prefab index 017f8b09..3fd1eadf 100644 --- a/Assets/Resources/Prefabs/UI/FrameITUI.prefab +++ b/Assets/Resources/Prefabs/UI/FrameITUI.prefab @@ -406,12 +406,12 @@ PrefabInstance: - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8553388048532215990, guid: 884ac57de337c364391b247761071fb1, type: 3} @@ -651,7 +651,7 @@ PrefabInstance: - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_Size - value: 1 + value: 0.4705884 objectReference: {fileID: 0} - target: {fileID: 9207926681420349736, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} @@ -691,9 +691,10 @@ PrefabInstance: - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_AnchoredPosition.x - value: 2141.29 + value: 3903.3896 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 9207926679892754397, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} --- !u!224 &1063267681848407549 stripped RectTransform: diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab index 2dec5f67..ae7550b5 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab @@ -4157,9 +4157,10 @@ PrefabInstance: - target: {fileID: 9207926681532248490, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_AnchoredPosition.x - value: 20503.623 + value: 22783.914 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 9207926679892754397, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} --- !u!224 &6037608700817923016 stripped RectTransform: diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab index 38cff169..03298f27 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab @@ -476,7 +476,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &9207926679660501331 MonoBehaviour: m_ObjectHideFlags: 0 @@ -819,7 +819,6 @@ GameObject: m_Component: - component: {fileID: 9207926679892754396} - component: {fileID: 9207926679892754394} - - component: {fileID: 9207926679892754397} m_Layer: 5 m_Name: Scroll m_TagString: Untagged @@ -861,19 +860,6 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 ---- !u!114 &9207926679892754397 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9207926679892754399} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3515765f8985a24b9519ac4af6cfe5d, type: 3} - m_Name: - m_EditorClassIdentifier: - initialShow: 1 --- !u!1 &9207926680103916032 GameObject: m_ObjectHideFlags: 0 @@ -1085,9 +1071,6 @@ MonoBehaviour: cursor: {fileID: 0} parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, type: 3} - x_Start: 0 - y_Start: 65 - y_Paece_Between_Items: 120 currentMmtAnswer: dynamicScrollDescriptionsActive: 1 automaticHintGenerationActive: 1 @@ -2372,7 +2355,7 @@ MonoBehaviour: m_HandleRect: {fileID: 9207926681445974865} m_Direction: 0 m_Value: 0 - m_Size: 0.39999986 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2861,7 +2844,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: -35776.625, y: 0.000030517578} + m_AnchoredPosition: {x: 0, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &9207926681532248488 diff --git a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer.prefab b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer.prefab index 7832730f..4eca7b15 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/MainPlayer.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/MainPlayer.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 4 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -110,6 +112,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697} m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298} m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 8 @@ -133,6 +136,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -191,6 +195,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 4 @@ -214,6 +219,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -273,6 +279,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 6 @@ -296,6 +303,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -352,6 +360,7 @@ Transform: m_LocalRotation: {x: 0.663414, y: -0.38302216, z: -0.5566704, w: 0.3213938} m_LocalPosition: {x: 0.464, y: 0, z: 0.39499974} m_LocalScale: {x: 0.08, y: 0.10000001, z: 0.099999994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4526138700712709267} - {fileID: 5163559133830036312} @@ -367,7 +376,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7484227433324710635} - - component: {fileID: 561544836598694202} m_Layer: 9 m_Name: PoleTool m_TagString: Untagged @@ -385,38 +393,12 @@ Transform: 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: - {fileID: 1915547052053663838} m_Father: {fileID: 177187141883897122} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &561544836598694202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373845637764807775} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f173d1c5aec16f04893f07d8dd5de8b5, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 7 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: ea5873cfd9158664f89459f0c9e1d853, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 96768 - Cursor: {fileID: 7593098362214606413} - LayerPendulumHits: - serializedVersion: 2 - m_Bits: 32769 - lineRenderer: {fileID: 2563576905681239437} - linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} - poleHeight: 1.5 - maxHeight: 0 --- !u!1 &389305042387458208 GameObject: m_ObjectHideFlags: 0 @@ -443,6 +425,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1858405371435042011} - {fileID: 4588701482145059055} @@ -484,6 +467,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: 2.2088046, z: 0} m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 1 @@ -507,6 +491,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -566,6 +551,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 2.3046205, z: 0} m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 2 @@ -589,6 +575,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -647,6 +634,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 3 @@ -670,6 +658,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -728,6 +717,7 @@ Transform: 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: - {fileID: 2851029660975025721} - {fileID: 6323463624636478874} @@ -769,6 +759,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 6 @@ -792,6 +783,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -850,6 +842,7 @@ Transform: m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444} m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122} m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 3 @@ -873,6 +866,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -931,6 +925,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697} m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298} m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 8 @@ -954,6 +949,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1012,6 +1008,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 7 @@ -1035,6 +1032,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1074,7 +1072,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2536831576210367534} - - component: {fileID: 5214500428814042638} m_Layer: 9 m_Name: LotTool m_TagString: Untagged @@ -1092,33 +1089,12 @@ Transform: 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: - {fileID: 3408663957230946078} m_Father: {fileID: 177187141883897122} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5214500428814042638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1160915174659881813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92de1d7563c51184695029faaac9d01d, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 5 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: 0b5fd1ea5a3b1a74588f605621176b6a, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 86528 - Cursor: {fileID: 7593098362214606413} - lineRenderer: {fileID: 2563576905681239437} - linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} --- !u!1 &1228471852902103839 GameObject: m_ObjectHideFlags: 0 @@ -1147,6 +1123,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: 2.2088046, z: 0} m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 1 @@ -1170,6 +1147,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1229,6 +1207,7 @@ Transform: m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444} m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122} m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 3 @@ -1252,6 +1231,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1310,6 +1290,7 @@ Transform: 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: 8692300029762806592} m_RootOrder: 0 @@ -1333,6 +1314,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1389,6 +1371,7 @@ Transform: 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: - {fileID: 2042657099210439802} - {fileID: 9183271348452687845} @@ -1430,6 +1413,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 3 @@ -1453,6 +1437,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1513,6 +1498,7 @@ Transform: m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587} m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885} m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 6 @@ -1536,6 +1522,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1594,6 +1581,7 @@ Transform: m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212} m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401} m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 4 @@ -1617,6 +1605,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1675,6 +1664,7 @@ Transform: m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444} m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122} m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 3 @@ -1698,6 +1688,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1756,6 +1747,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: 2.2088046, z: 0} m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 1 @@ -1779,6 +1771,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1838,6 +1831,7 @@ Transform: m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816} m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848} m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 1 @@ -1861,6 +1855,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1919,6 +1914,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 3 @@ -1942,6 +1938,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2002,6 +1999,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.3663206, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 5 @@ -2025,6 +2023,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2083,6 +2082,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 7 @@ -2106,6 +2106,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2164,6 +2165,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 2 @@ -2187,6 +2189,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2245,6 +2248,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 4 @@ -2268,6 +2272,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2325,6 +2330,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6675813018195765306} - {fileID: 6211291410506496221} @@ -2366,6 +2372,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 6 @@ -2389,6 +2396,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2451,6 +2459,7 @@ Transform: m_LocalRotation: {x: -0, y: -0.9659258, z: -0, w: 0.2588191} m_LocalPosition: {x: -1.3759477, y: -1, z: 2.976788} m_LocalScale: {x: 0.2, y: 0.01, z: 0.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6753270535489224770} m_RootOrder: 1 @@ -2474,6 +2483,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2533,6 +2543,7 @@ LineRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -2665,7 +2676,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7322425230886007441} - - component: {fileID: 4950922762979237841} m_Layer: 9 m_Name: AngleTool m_TagString: Untagged @@ -2683,34 +2693,12 @@ Transform: 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: - {fileID: 8692300029762806592} m_Father: {fileID: 177187141883897122} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4950922762979237841 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2841712355696529410} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d10fd4395a48fea4bb8ac86ebabe002c, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 2 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: 644edf8b3fa05da418500a0e9dd10820, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 96768 - Cursor: {fileID: 7593098362214606413} - lineRenderer: {fileID: 2563576905681239437} - anglePreviewMaterial: {fileID: 2100000, guid: 8a28cccde2536794c97ec91954e34e90, - type: 2} --- !u!1 &3018937959154754626 GameObject: m_ObjectHideFlags: 0 @@ -2739,6 +2727,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.41454008, y: 0.20676178, z: -0.000000007685469} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5054092810243220108} m_RootOrder: 1 @@ -2762,6 +2751,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2823,6 +2813,7 @@ Transform: m_LocalRotation: {x: 0, y: 0.9659258, z: 0, w: 0.2588191} m_LocalPosition: {x: -2.68, y: 1, z: 1.89} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5018390247159723608} - {fileID: 1956156041126850260} @@ -3104,7 +3095,7 @@ MonoBehaviour: clampVerticalRotation: 1 MinimumX: -90 MaximumX: 90 - smooth: 0 + smoothCamMotion: 0 smoothTime: 5 lockCursor: 0 m_UseFovKick: 1 @@ -3203,6 +3194,9 @@ MonoBehaviour: - {fileID: 8300000, guid: 88314f6a92b2c0e4880c20c2d1d36cdd, type: 3} m_JumpSound: {fileID: 0} m_LandSound: {fileID: 0} + m_Camera: {fileID: 0} + Running_keyBind: + PositionOfActivePlayer_GObj: {fileID: 0} --- !u!1 &3053343927530874341 GameObject: m_ObjectHideFlags: 0 @@ -3231,6 +3225,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 7 @@ -3254,6 +3249,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3310,6 +3306,7 @@ Transform: 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: - {fileID: 5141688066578765964} - {fileID: 1490481603263373991} @@ -3351,6 +3348,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.1821377, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 0 @@ -3374,6 +3372,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3432,6 +3431,7 @@ Transform: m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212} m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401} m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 4 @@ -3455,6 +3455,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3513,6 +3514,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448} m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 5 @@ -3536,6 +3538,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3595,6 +3598,7 @@ Transform: m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587} m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885} m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 6 @@ -3618,6 +3622,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3676,6 +3681,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 7 @@ -3699,6 +3705,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3757,6 +3764,7 @@ Transform: m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444} m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122} m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 3 @@ -3780,6 +3788,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3838,6 +3847,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.1821377, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 0 @@ -3861,6 +3871,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3919,6 +3930,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.1821377, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 0 @@ -3942,6 +3954,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3998,6 +4011,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2200032780284494470} - {fileID: 8386895498466736373} @@ -4039,6 +4053,7 @@ Transform: 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: 3297529915763662679} m_RootOrder: 0 @@ -4062,6 +4077,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4101,7 +4117,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3234025345537968801} - - component: {fileID: 700838560610357294} m_Layer: 9 m_Name: Pendulum m_TagString: Untagged @@ -4119,36 +4134,12 @@ Transform: 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: - {fileID: 3702358158241763203} m_Father: {fileID: 177187141883897122} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &700838560610357294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4390972624424491028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4853ba424177d9b40a153f43df1496d9, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 6 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300026, guid: fd419bef7a36af8459a810bc72573105, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 96768 - Cursor: {fileID: 7593098362214606413} - LayerPendulumHits: - serializedVersion: 2 - m_Bits: 1 - lineRenderer: {fileID: 2563576905681239437} - linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} --- !u!1 &4546972694963265692 GameObject: m_ObjectHideFlags: 0 @@ -4177,6 +4168,7 @@ Transform: m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816} m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848} m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 1 @@ -4200,6 +4192,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4258,6 +4251,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.1821377, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 0 @@ -4281,6 +4275,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4339,6 +4334,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 3 @@ -4362,6 +4358,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4422,6 +4419,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.3663206, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 5 @@ -4445,6 +4443,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4503,6 +4502,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: 2.2088046, z: 0} m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 1 @@ -4526,6 +4526,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4584,6 +4585,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068} m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 7 @@ -4678,6 +4680,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.41454008, y: 0.20676178, z: -0.000000007685469} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8692300029762806592} m_RootOrder: 1 @@ -4701,6 +4704,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4759,6 +4763,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.3663206, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 5 @@ -4782,6 +4787,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4840,6 +4846,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 2.3046205, z: 0} m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 2 @@ -4863,6 +4870,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4921,6 +4929,7 @@ Transform: m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587} m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885} m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 6 @@ -4944,6 +4953,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5002,6 +5012,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 2.3046205, z: 0} m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 2 @@ -5025,6 +5036,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5083,6 +5095,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448} m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 5 @@ -5106,6 +5119,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5165,6 +5179,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697} m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298} m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 8 @@ -5188,6 +5203,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5246,6 +5262,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 8 @@ -5269,6 +5286,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5326,6 +5344,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068} m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 7 @@ -5401,7 +5420,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 177187141883897122} - - component: {fileID: 7317456229991865134} m_Layer: 9 m_Name: Gadgets m_TagString: Untagged @@ -5419,6 +5437,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.226, y: -0.158, z: 0.832} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2104685099892905041} - {fileID: 3422818465910340702} @@ -5431,21 +5450,6 @@ Transform: m_Father: {fileID: 5018390247159723608} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7317456229991865134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5515921961601460107} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6c56cda17d48fa47a0c06cea90accba, type: 3} - m_Name: - m_EditorClassIdentifier: - GadgetUI: {fileID: 0} - GadgetButton: {fileID: 5345241908758045532, guid: 4804ff343c7a9724abfb4587ac7da08a, - type: 3} --- !u!1 &5545836004611185444 GameObject: m_ObjectHideFlags: 0 @@ -5472,6 +5476,7 @@ Transform: m_LocalRotation: {x: 0.663414, y: -0.38302216, z: -0.5566704, w: 0.3213938} m_LocalPosition: {x: 0.464, y: 0, z: 0.39499974} m_LocalScale: {x: 0.08, y: 0.10000001, z: 0.099999994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7684455143956715431} - {fileID: 8353214056966752553} @@ -5506,6 +5511,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448} m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 5 @@ -5529,6 +5535,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5586,6 +5593,7 @@ Transform: 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: - {fileID: 5882025996355890838} - {fileID: 6030113533596740385} @@ -5627,6 +5635,7 @@ Transform: m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212} m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401} m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 4 @@ -5650,6 +5659,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5709,6 +5719,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 177187141883897122} m_Father: {fileID: 6753270535489224770} @@ -5801,6 +5812,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.3663206, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 5 @@ -5824,6 +5836,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5882,6 +5895,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 2 @@ -5905,6 +5919,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5963,6 +5978,7 @@ Transform: m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816} m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848} m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 1 @@ -5986,6 +6002,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6044,6 +6061,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 2.3046205, z: 0} m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 2 @@ -6067,6 +6085,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6125,6 +6144,7 @@ Transform: m_LocalRotation: {x: 0.6427877, y: -0, z: -0, w: 0.76604444} m_LocalPosition: {x: -0.0000419548, y: -2.3787, z: 0.3713122} m_LocalScale: {x: 0.4913462, y: 0.49134624, z: 0.36618823} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 3 @@ -6148,6 +6168,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6187,7 +6208,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2104685099892905041} - - component: {fileID: 7132802530618862395} m_Layer: 9 m_Name: Pointer m_TagString: Untagged @@ -6205,31 +6225,12 @@ Transform: 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: - {fileID: 7650240631987532191} m_Father: {fileID: 177187141883897122} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7132802530618862395 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6451574350543314454} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ef930b2605bc4484e99f580e3db751c9, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: 61c389e99e8388e4e93070d2f5e6275f, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 24064 - Cursor: {fileID: 7593098362214606413} --- !u!1 &6514918780467523717 GameObject: m_ObjectHideFlags: 0 @@ -6239,7 +6240,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5639660380882869284} - - component: {fileID: 7998417669177101955} m_Layer: 9 m_Name: Fact Deleter m_TagString: Untagged @@ -6257,31 +6257,12 @@ Transform: 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: - {fileID: 2993479576695229492} m_Father: {fileID: 177187141883897122} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7998417669177101955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6514918780467523717} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c2c50e559b6f2f438e1bb45ff8856da, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 8 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: d456617ba2282854d9570dcebcc2b279, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 115217 - Cursor: {fileID: 7593098362214606413} --- !u!1 &6538023868683449154 GameObject: m_ObjectHideFlags: 0 @@ -6310,6 +6291,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.2920719, z: -6.279079} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 7 @@ -6333,6 +6315,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6389,6 +6372,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4794400065242884274} - {fileID: 1751194418822142881} @@ -6430,6 +6414,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: 2.2088046, z: 0} m_LocalScale: {x: 1.0110741, y: 1.0110741, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2042657099210439802} m_RootOrder: 1 @@ -6453,6 +6438,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6512,6 +6498,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 4 @@ -6535,6 +6522,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6592,6 +6580,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.395, y: -0.143, z: 0.253} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1815112987223313739} - {fileID: 6741944067046371680} @@ -6633,6 +6622,7 @@ Transform: m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816} m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848} m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 1 @@ -6656,6 +6646,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6714,6 +6705,7 @@ Transform: m_LocalRotation: {x: 0.00000009163111, y: 0.72558, z: 0.68813795, w: -0.000000096616816} m_LocalPosition: {x: -0.18697172, y: 1.9200721, z: 5.56848} m_LocalScale: {x: 2.3788898, y: 0.99535114, z: 2.3788908} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 1 @@ -6737,6 +6729,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6795,6 +6788,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 8 @@ -6818,6 +6812,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6876,6 +6871,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 6 @@ -6899,6 +6895,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -6956,6 +6953,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068} m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 7 @@ -7050,6 +7048,7 @@ Transform: 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: 5054092810243220108} m_RootOrder: 0 @@ -7073,6 +7072,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7131,6 +7131,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7650240631987532191} m_RootOrder: 2 @@ -7154,6 +7155,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7212,6 +7214,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 2.3046205, z: 0} m_LocalScale: {x: 0.9365708, y: 0.39187068, z: 0.9365708} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 2 @@ -7235,6 +7238,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7293,6 +7297,7 @@ Transform: m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587} m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885} m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 6 @@ -7316,6 +7321,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7372,6 +7378,7 @@ Transform: m_LocalRotation: {x: 0.663414, y: -0.38302216, z: -0.5566704, w: 0.3213938} m_LocalPosition: {x: 0.464, y: 0, z: 0.39499974} m_LocalScale: {x: 0.08, y: 0.10000001, z: 0.099999994} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3729374979815603264} - {fileID: 4525424527899886588} @@ -7406,6 +7413,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.1821377, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 0 @@ -7429,6 +7437,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7487,6 +7496,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448} m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 5 @@ -7510,6 +7520,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7569,6 +7580,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697172, y: 1.9071897, z: 5.325448} m_LocalScale: {x: 2.5681279, y: 2.5681279, z: 2.5400007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 5 @@ -7592,6 +7604,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7651,6 +7664,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 6 @@ -7674,6 +7688,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7732,6 +7747,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697} m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298} m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5141688066578765964} m_RootOrder: 8 @@ -7755,6 +7771,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7813,6 +7830,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0.00000009415696, z: -0.7071067, w: 0.00000009415697} m_LocalPosition: {x: -0, y: -2.359513, z: 0.40296298} m_LocalScale: {x: 1.0640908, y: 1, z: 0.45152956} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 8 @@ -7836,6 +7854,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7894,6 +7913,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 8 @@ -7917,6 +7937,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -7975,6 +7996,7 @@ Transform: m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212} m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401} m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3702358158241763203} m_RootOrder: 4 @@ -7998,6 +8020,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8056,6 +8079,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0, y: -2.3663206, z: 0} m_LocalScale: {x: 1.2156034, y: 1.2156034, z: 1.6505318} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8563185104150229175} m_RootOrder: 5 @@ -8079,6 +8103,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8137,6 +8162,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 8 @@ -8160,6 +8186,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8199,7 +8226,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3422818465910340702} - - component: {fileID: 5299456209545632090} m_Layer: 9 m_Name: Tape m_TagString: Untagged @@ -8217,34 +8243,12 @@ Transform: 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: - {fileID: 3297529915763662679} m_Father: {fileID: 177187141883897122} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5299456209545632090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7742990957960867310} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c2ceb662e0e745419670767c370af26, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 1 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: 23ef0c9f8111e14439483be733da29eb, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 96768 - Cursor: {fileID: 7593098362214606413} - maxHeight: 2.5 - lineRenderer: {fileID: 2563576905681239437} - linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} --- !u!1 &7756212156643835486 GameObject: m_ObjectHideFlags: 0 @@ -8273,6 +8277,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408663957230946078} m_RootOrder: 2 @@ -8296,6 +8301,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8354,6 +8360,7 @@ Transform: m_LocalRotation: {x: -0.0000000035254462, y: 0.99964947, z: -0.026475651, w: -0.00000013311137} m_LocalPosition: {x: -0.18697327, y: 1.3168347, z: -5.8119106} m_LocalScale: {x: 3.0876324, y: 3.0876336, z: 4.1923523} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 2 @@ -8377,6 +8384,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8435,6 +8443,7 @@ Transform: m_LocalRotation: {x: 0.51306266, y: -0.48658693, z: 0.5130625, w: -0.486587} m_LocalPosition: {x: -0.18697327, y: 2.315078, z: -6.3159885} m_LocalScale: {x: 2.7027915, y: 2.5400007, z: 1.146885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 6 @@ -8458,6 +8467,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8515,6 +8525,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068} m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5882025996355890838} m_RootOrder: 7 @@ -8608,6 +8619,7 @@ Transform: m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: -0.7071068} m_LocalPosition: {x: -0, y: 1.2068384, z: -0.00000019378662} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 7 @@ -8702,6 +8714,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2993479576695229492} m_RootOrder: 3 @@ -8725,6 +8738,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8783,6 +8797,7 @@ Transform: 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: - {fileID: 8563185104150229175} - {fileID: 7481023408980414230} @@ -8824,6 +8839,7 @@ Transform: m_LocalRotation: {x: 0.000000008089408, y: 0.99815303, z: 0.060750425, w: -0.00000013291212} m_LocalPosition: {x: -0.18686707, y: 2.232217, z: -6.360401} m_LocalScale: {x: 1.2480193, y: 1.2480197, z: 0.9301182} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 4 @@ -8847,6 +8863,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8905,6 +8922,7 @@ Transform: m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.41454008, y: 0.20676178, z: -0.000000007685469} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3297529915763662679} m_RootOrder: 1 @@ -8928,6 +8946,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -8986,6 +9005,7 @@ Transform: m_LocalRotation: {x: 0.000000091631094, y: 0.72558, z: 0.6881378, w: -0.000000096616816} m_LocalPosition: {x: -0.1869725, y: 1.6138662, z: -0.20825356} m_LocalScale: {x: 2.2279458, y: 2.5400007, z: 2.2279456} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915547052053663838} m_RootOrder: 8 @@ -9009,6 +9029,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -9048,7 +9069,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4784987086112188950} - - component: {fileID: 556642453360066292} m_Layer: 9 m_Name: LineTool m_TagString: Untagged @@ -9066,33 +9086,12 @@ Transform: 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: - {fileID: 5054092810243220108} m_Father: {fileID: 177187141883897122} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &556642453360066292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8816914964933306758} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: da63673a5f7db65498fc07a7af282128, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 3 - UiName: - MaxRange: 0 - Sprite: {fileID: 21300000, guid: fa8323d8b52054c46b24fc9a0040caa3, type: 3} - ignoreLayerMask: - serializedVersion: 2 - m_Bits: 96768 - Cursor: {fileID: 7593098362214606413} - lineRenderer: {fileID: 2563576905681239437} - linePreviewMaterial: {fileID: 2100000, guid: a8a7bf60a30970f469a9c9d3ae2de6ef, type: 2} --- !u!1 &8961895004939177439 GameObject: m_ObjectHideFlags: 0 @@ -9121,6 +9120,7 @@ Transform: m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.027123343, z: 0} m_LocalScale: {x: 0.877144, y: 1, z: 0.877144} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2851029660975025721} m_RootOrder: 4 @@ -9144,6 +9144,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 diff --git a/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab b/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab index a6e131dd..f9714d44 100644 --- a/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab +++ b/Assets/Resources/Prefabs/UI/Scrolls/ScrollPrefab.prefab @@ -28,6 +28,7 @@ RectTransform: 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: 8036621493440665722} m_RootOrder: 0 @@ -60,6 +61,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -103,6 +105,7 @@ RectTransform: 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: - {fileID: 4092972423489379447} m_Father: {fileID: 4092972423235671814} @@ -136,6 +139,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -164,6 +168,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -194,6 +199,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 7048808476049857575} + m_TargetAssemblyTypeName: m_MethodName: magicButton m_Mode: 1 m_Arguments: @@ -233,6 +239,7 @@ RectTransform: 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: - {fileID: 4092972422600727924} - {fileID: 8894159312141808596} @@ -267,6 +274,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -296,10 +304,9 @@ MonoBehaviour: cursor: {fileID: 0} parameterDisplayPrefab: {fileID: 8358525157842135574, guid: 0651df442e07acf439dd439c86c20e93, type: 3} - x_Start: 0 - y_Start: 65 - y_Paece_Between_Items: 120 currentMmtAnswer: + dynamicScrollDescriptionsActive: 1 + automaticHintGenerationActive: 1 --- !u!1 &4092972423489379446 GameObject: m_ObjectHideFlags: 0 @@ -328,6 +335,7 @@ RectTransform: 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: 4092972422600727924} m_RootOrder: 0 @@ -360,6 +368,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -385,13 +394,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 26.85 m_fontSizeBase: 36 m_fontWeight: 400 @@ -399,7 +407,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -409,10 +419,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -420,40 +428,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 4092972423489379448} - characterCount: 5 - spriteCount: 0 - spaceCount: 0 - wordCount: 1 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &6020540753602978540 @@ -482,6 +468,7 @@ RectTransform: 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: - {fileID: 2133666235260033763} m_Father: {fileID: 7321659448329576932} @@ -521,6 +508,7 @@ RectTransform: 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: - {fileID: 8036621493440665722} m_Father: {fileID: 8894159312509398409} @@ -554,6 +542,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -582,6 +571,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -644,6 +634,7 @@ RectTransform: 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: 8894159311577423771} m_RootOrder: 0 @@ -678,6 +669,7 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &8894159310465802590 MonoBehaviour: m_ObjectHideFlags: 0 @@ -721,6 +713,7 @@ RectTransform: 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: - {fileID: 8894159310465802589} m_Father: {fileID: 8894159312509398409} @@ -767,6 +760,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -809,6 +803,7 @@ RectTransform: 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: - {fileID: 8894159312286264418} - {fileID: 8894159312509398409} @@ -873,6 +868,7 @@ RectTransform: 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: 8894159312141808596} m_RootOrder: 0 @@ -905,6 +901,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -930,13 +927,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 18 m_fontSizeBase: 18 m_fontWeight: 400 @@ -944,7 +940,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -954,10 +952,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -965,40 +961,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 18, y: 24, z: 21.1, w: 12} - m_textInfo: - textComponent: {fileID: 8894159312286264419} - characterCount: 43 - spriteCount: 0 - spaceCount: 5 - wordCount: 6 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8894159312509398408 @@ -1031,6 +1005,7 @@ RectTransform: 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: - {fileID: 8894159311577423771} - {fileID: 7321659448329576932} @@ -1065,6 +1040,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Scenes/Menues/MainMenue.unity b/Assets/Scenes/Menues/MainMenue.unity index e5ebec1e..5f6c52ec 100644 --- a/Assets/Scenes/Menues/MainMenue.unity +++ b/Assets/Scenes/Menues/MainMenue.unity @@ -38259,111 +38259,6 @@ PrefabInstance: propertyPath: m_Name value: GlobalObject objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageError.a - value: 0.39215687 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageError.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageError.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageError.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageAccomplished.a - value: 0.39215687 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageAccomplished.b - value: 0.041520078 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageAccomplished.g - value: 0.6886792 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageAccomplished.r - value: 0.029236369 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationDuration - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationEndColor.a - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationEndColor.b - value: 0.10588237 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationEndColor.g - value: 0.6342677 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationEndColor.r - value: 0.972549 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageNotYetAccomplished.a - value: 0.39215687 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageNotYetAccomplished.b - value: 0.6901961 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageNotYetAccomplished.g - value: 0.4927269 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _StageNotYetAccomplished.r - value: 0.031372562 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationStartColor.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationStartColor.b - value: 0.1054201 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationStartColor.g - value: 0.9266228 - objectReference: {fileID: 0} - - target: {fileID: 1491172435906319289, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: _hintAnimationStartColor.r - value: 0.9716981 - objectReference: {fileID: 0} - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} propertyPath: m_RootOrder @@ -38372,17 +38267,17 @@ PrefabInstance: - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} propertyPath: m_LocalPosition.x - value: 772.31323 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} propertyPath: m_LocalPosition.y - value: 1024.1111 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} propertyPath: m_LocalPosition.z - value: -0.2632141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index f18d4c5c..a397063c 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -28033,11 +28033,6 @@ PrefabInstance: propertyPath: m_Name value: GlobalObject objectReference: {fileID: 0} - - target: {fileID: 1491172435906319288, guid: 22a53293eaa728146a6f47093d22ca92, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1491172435906319294, guid: 22a53293eaa728146a6f47093d22ca92, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Scripts/GlobalBehaviour.cs b/Assets/Scripts/GlobalBehaviour.cs index f4f8ac83..a4763359 100644 --- a/Assets/Scripts/GlobalBehaviour.cs +++ b/Assets/Scripts/GlobalBehaviour.cs @@ -1,6 +1,6 @@ using UnityEngine; -public class GlobalBehaviour : MonoBehaviour +public class GlobalBehaviour : MonoBehaviour, ISerializationCallbackReceiver { //Make sure when using RGBA-Colors, the A-value of animationStartColor //and animationEndColor is the same OR try with value = 255 @@ -12,29 +12,23 @@ public class GlobalBehaviour : MonoBehaviour public static Color StageNotYetAccomplished; public static Color StageError; - public static float GadgetLaserDistance = 30f; - public static float GadgetPhysicalDistance = 2.5f; - - [SerializeField] - private Color _hintAnimationStartColor; - [SerializeField] - private Color _hintAnimationEndColor; - [SerializeField] - private float _hintAnimationDuration; - - [SerializeField] - private Color _StageAccomplished; - [SerializeField] - private Color _StageNotYetAccomplished; - [SerializeField] - private Color _StageError; - - [SerializeField] - private float _GadgetLaserDistance = 30f; - [SerializeField] - private float _GadgetPhysicalDistance = 2.5f; - - void Awake() + public static float GadgetLaserDistance; + public static float GadgetPhysicalDistance; + + #region Unity Serialization + [SerializeField] private Color _hintAnimationStartColor; + [SerializeField] private Color _hintAnimationEndColor; + [SerializeField] private float _hintAnimationDuration; + + [SerializeField] private Color _StageAccomplished; + [SerializeField] private Color _StageNotYetAccomplished; + [SerializeField] private Color _StageError; + + [SerializeField] private float _GadgetLaserDistance = 30f; + [SerializeField] private float _GadgetPhysicalDistance = 2.5f; + + + void ISerializationCallbackReceiver.OnAfterDeserialize() { hintAnimationStartColor = _hintAnimationStartColor; hintAnimationEndColor = _hintAnimationEndColor; @@ -46,7 +40,20 @@ void Awake() GadgetLaserDistance = _GadgetLaserDistance; GadgetPhysicalDistance = _GadgetPhysicalDistance; + } + + void ISerializationCallbackReceiver.OnBeforeSerialize() + { + _hintAnimationStartColor = hintAnimationStartColor; + _hintAnimationEndColor = hintAnimationEndColor; + _hintAnimationDuration = hintAnimationDuration; + + _StageAccomplished = StageAccomplished; + _StageNotYetAccomplished = StageNotYetAccomplished; + _StageError = StageError; - //DontDestroyOnLoad(gameObject); + _GadgetLaserDistance = GadgetLaserDistance; + _GadgetPhysicalDistance = GadgetPhysicalDistance; } + #endregion } diff --git a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs index 80b730ae..da933c97 100644 --- a/Assets/Scripts/InteractionEngine/CommunicationEvents.cs +++ b/Assets/Scripts/InteractionEngine/CommunicationEvents.cs @@ -7,45 +7,23 @@ public static class CommunicationEvents { - public class HitEvent : UnityEvent<RaycastHit> { } + public static UnityEvent<RaycastHit> TriggerEvent = new(); - public class FactEvent : UnityEvent<Fact> { } + public static UnityEvent<int> ToolModeChangedEvent = new(); + public static UnityEvent<Fact> AddFactEvent = new(); + public static UnityEvent<Fact> RemoveFactEvent = new(); - public class MouseOverFactEvent : UnityEvent<Transform> { } + public static UnityEvent<Fact, FactObject.FactMaterials> PushoutFactEvent = new(); + public static UnityEvent<Fact> PushoutFactFailEvent = new(); - public class ToolModeEvent : UnityEvent<int> { } + public static UnityEvent gameSucceededEvent = new(); + public static UnityEvent gameNotSucceededEvent = new(); + public static UnityEvent NewAssignmentEvent = new(); - public class ShinyEvent : UnityEvent<Fact> { } - - public class SignalEvent : UnityEvent { } - - public class AnimationEvent : UnityEvent<GameObject, string> { } - - public class AnimationEventWithUris : UnityEvent<List<string>> { } - - - - public static HitEvent SnapEvent = new HitEvent(); - public static HitEvent TriggerEvent = new HitEvent(); - - public static ToolModeEvent ToolModeChangedEvent = new ToolModeEvent(); - public static FactEvent AddFactEvent = new FactEvent(); - public static FactEvent RemoveFactEvent = new FactEvent(); - - public static ShinyEvent PushoutFactEvent = new ShinyEvent(); - public static ShinyEvent PushoutFactEndEvent = new ShinyEvent(); - public static ShinyEvent PushoutFactFailEvent = new ShinyEvent(); - - public static SignalEvent gameSucceededEvent = new SignalEvent(); - public static SignalEvent gameNotSucceededEvent = new SignalEvent(); - public static SignalEvent LevelReset = new SignalEvent(); - public static SignalEvent NewAssignmentEvent = new SignalEvent(); - //public static SignalEvent ReloadConfigToUI = new SignalEvent(); - - public static AnimationEvent ScrollFactHintEvent = new AnimationEvent(); - public static FactEvent AnimateExistingFactEvent = new FactEvent(); - public static FactEvent AnimateNonExistingFactEvent = new FactEvent(); - public static AnimationEventWithUris HintAvailableEvent = new AnimationEventWithUris(); + public static UnityEvent<GameObject, string> ScrollFactHintEvent = new(); + public static UnityEvent<Fact> AnimateExistingFactEvent = new(); + public static UnityEvent<Fact> AnimateNonExistingFactEvent = new(); + public static UnityEvent<List<string>> HintAvailableEvent = new(); //------------------------------------------------------------------------------------ diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs index 85a846ac..6bebcd5d 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactObject.cs @@ -1,12 +1,78 @@ -using UnityEngine; +using System; +using System.Linq; +using System.Collections.Generic; +using UnityEngine; +using System.Collections; /// <summary> /// <see cref="Fact.Id"/>/ <c>MonoBehaviour</c> wrapper to be attached to <see cref="Fact.Representation"/> /// </summary> -public class FactObject : MonoBehaviour +public class FactObject : MonoBehaviour, ISerializationCallbackReceiver { /// <summary> /// <see cref="Fact.Id"/> to identify arbitrary <see cref="Fact"/> by its <see cref="Fact.Representation"/> /// </summary> public string URI; + + public enum FactMaterials + { + Default = 0, + Selected = 1, + Hint = 2, + Solution = 3, + } + + public Material[] materials; + public new Renderer[] renderer; + public List<FactObject> cascade; + + #region Unity Serialization + public Material Default; + public Material Selected; + public Material Hint; + public Material Solution; + void ISerializationCallbackReceiver.OnBeforeSerialize() + { + Default = materials[(int)FactMaterials.Default]; + Selected = materials[(int)FactMaterials.Selected]; + Hint = materials[(int)FactMaterials.Hint]; + Solution = materials[(int)FactMaterials.Solution]; + } + + 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; + } + #endregion + + private void Awake() + { + cascade = new() { this, }; + cascade.AddRange(transform.GetComponentsInChildren<FactObject>(includeInactive: true)); + } + + public void CascadeForChildren(Action<FactObject> func) + { + foreach (FactObject fo in cascade) + func(fo); + } + + public void ForAllRenderer(Action<Renderer> func) + { + foreach (Renderer ren in renderer) + func(ren); + } + + public void CoroutineCascadeForChildrenAllRenderer(Func<FactObject, Renderer, IEnumerator> func) + { + this.StopAllCoroutines(); + + foreach (FactObject fo in cascade) + foreach (Renderer ren in fo.renderer) + StartCoroutine(func(fo, ren)); + } } diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs index 71d9586d..7d242f0b 100644 --- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs +++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs @@ -37,19 +37,18 @@ public void FactAction(Fact fact) { public Func<Fact, Fact> getAction(Fact fact) { - switch (fact) + return fact switch { - case PointFact pointFact: - return SpawnPoint; - case LineFact lineFact: - return SpawnLine; - case AngleFact angleFact: - return SpawnAngle; - case RayFact rayFact: - return SpawnRay; - default: - return null; - } + PointFact pointFact + => SpawnPoint, + LineFact lineFact + => SpawnLine, + AngleFact angleFact + => SpawnAngle, + RayFact rayFact + => SpawnRay, + _ => null, + }; } @@ -83,13 +82,11 @@ public Fact SpawnLine(Fact fact) //Change scale and rotation, so that the two points are connected by the line //Get the Line-GameObject as the first Child of the Line-Prefab -> That's the Collider var v3T = line.transform.GetChild(0).localScale; - v3T.x = (point2 - point1).magnitude; + //For every Coordinate x,y,z we have to devide it by the LocalScale of the Child, //because actually the Child should be of this length and not the parent, which is only the Collider - v3T.x = v3T.x / line.transform.GetChild(0).GetChild(0).localScale.x; - //y and z of the line/Cube-GameObject here hard coded = ratio of sphere-prefab - v3T.y = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.y; - v3T.z = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.z; + v3T.x = (point2 - point1).magnitude / line.transform.GetChild(0).GetChild(0).localScale.x; + //Change Scale/Rotation of the Line-GameObject without affecting Scale of the Text line.transform.GetChild(0).localScale = v3T; line.transform.GetChild(0).rotation = Quaternion.FromToRotation(Vector3.right, point2 - point1); @@ -127,14 +124,11 @@ public Fact SpawnRay(Fact fact) //Change scale and rotation, so that the two points are connected by the line //Get the Line-GameObject as the first Child of the Line-Prefab -> That's the Collider var v3T = line.transform.GetChild(0).localScale; - v3T.x = (point2 - point1).magnitude; //For every Coordinate x,y,z we have to devide it by the LocalScale of the Child, //because actually the Child should be of this length and not the parent, which is only the Collider - v3T.x = v3T.x / line.transform.GetChild(0).GetChild(0).localScale.x; - //y and z of the line/Cube-GameObject here hard coded = ratio of sphere-prefab - v3T.y = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.y; - v3T.z = 0.1f / line.transform.GetChild(0).GetChild(0).localScale.z; + v3T.x = (point2 - point1).magnitude / line.transform.GetChild(0).GetChild(0).localScale.x; + //Change Scale/Rotation of the Line-GameObject without affecting Scale of the Text line.transform.GetChild(0).localScale = v3T; line.transform.GetChild(0).rotation = Quaternion.FromToRotation(Vector3.right, point2 - point1); @@ -210,15 +204,12 @@ public void animateNonExistingFactTrigger(Fact fact) { } public IEnumerator animateNonExistingFact(Fact fact) { - Fact returnedFact = getAction(fact)?.Invoke(fact); - if (returnedFact != null) - { - MeshRendererHintAnimation animator = returnedFact.Representation.GetComponentInChildren<MeshRendererHintAnimation>(); - animator.AnimationTrigger(); + Fact returnedFact = getAction(fact).Invoke(fact); - yield return new WaitForSeconds(GlobalBehaviour.hintAnimationDuration); + ShinyThings.HighlightFact(returnedFact, FactObject.FactMaterials.Hint); - GameObject.Destroy(returnedFact.Representation); - } + yield return new WaitForSeconds(GlobalBehaviour.hintAnimationDuration); + + GameObject.Destroy(returnedFact.Representation); } } diff --git a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs index 41c6ceb4..522ddf3f 100644 --- a/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs +++ b/Assets/Scripts/InteractionEngine/Gadgets/GadgetBehaviour.cs @@ -52,9 +52,11 @@ public void OnAfterDeserialize() GadgetButton = _GadgetButton; ParentMe = _ParentMe; +#pragma warning disable UNT0008 // Null propagation on Unity objects Materials = _DataContainerGadgetDict?.Materials ?? new Material[0]; ButtonSprites = _DataContainerGadgetDict?.ButtonSprites ?? new Sprite[0]; DataContainerGadgetDict = _DataContainerGadgetDict?.DataContainerGadgetDict ?? new(); +#pragma warning restore UNT0008 // Null propagation on Unity objects } #endregion diff --git a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs deleted file mode 100644 index a58ff2f6..00000000 --- a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs +++ /dev/null @@ -1,65 +0,0 @@ -using UnityEngine; -using static GlobalBehaviour; - -[RequireComponent(typeof(MeshRenderer))] -public class MeshRendererHintAnimation : MonoBehaviour -{ - private MeshRenderer meshRendererToChange; - private Color meshRendererToChangeDefaultColor; - - private Color animationStartColor; - private Color animationEndColor; - - private float animateDuration; - private bool animating = false; - private float timer = 0; - - // Start is called before the first frame update - void Start() - { - meshRendererToChange = this.GetComponent<MeshRenderer>(); - meshRendererToChangeDefaultColor = meshRendererToChange.material.color; - - updateAnimationParameters(); - } - - // Update is called once per frame - void Update() - { - if (animating) - { - this.timer += Time.deltaTime; - Animate(); - } - } - - public void AnimationTrigger() - { - if (meshRendererToChange != null) - { - updateAnimationParameters(); - animating = true; - } - } - - private void Animate() - { - if (timer >= animateDuration) - { - animating = false; - timer = 0; - meshRendererToChange.material.color = meshRendererToChangeDefaultColor; - } - else - { - meshRendererToChange.material.color = Color.Lerp(animationStartColor, animationEndColor, Mathf.PingPong(Time.time, 1)); - } - } - - private void updateAnimationParameters() - { - animationStartColor = GlobalBehaviour.hintAnimationStartColor; - animationEndColor = GlobalBehaviour.hintAnimationEndColor; - animateDuration = GlobalBehaviour.hintAnimationDuration; - } -} diff --git a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs.meta b/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs.meta deleted file mode 100644 index b3483c41..00000000 --- a/Assets/Scripts/InteractionEngine/MeshRendererHintAnimation.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a6b9fc46f5bfe6b4eb4adf01e6b65bac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/InteractionEngine/RendererExtensions.cs b/Assets/Scripts/InteractionEngine/RendererExtensions.cs new file mode 100644 index 00000000..d2b633e1 --- /dev/null +++ b/Assets/Scripts/InteractionEngine/RendererExtensions.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public static class RendererExtensions +{ + public static IEnumerator ProgrammMaterialChange(this Renderer renderer, IEnumerable<(float delay, float lerp_time, Material new_material)> instructions, bool loop = false) + { + Material last_material; + float start_time, end_time; + + do + foreach (var (delay, lerp_time, new_material) in instructions) + { + last_material = renderer.material; + start_time = Time.time; + end_time = start_time + lerp_time; + + yield return new WaitForSeconds(delay); + + while (end_time >= Time.time) + { + renderer.material.Lerp(last_material, new_material + , (Time.time - start_time) / lerp_time); + yield return null; + } + renderer.material = new_material; + + } + while (loop); + } +} diff --git a/Assets/Scripts/TestScripts/ScrollUIManager.cs.meta b/Assets/Scripts/InteractionEngine/RendererExtensions.cs.meta similarity index 83% rename from Assets/Scripts/TestScripts/ScrollUIManager.cs.meta rename to Assets/Scripts/InteractionEngine/RendererExtensions.cs.meta index 6fdba671..913a2e12 100644 --- a/Assets/Scripts/TestScripts/ScrollUIManager.cs.meta +++ b/Assets/Scripts/InteractionEngine/RendererExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a3515765f8985a24b9519ac4af6cfe5d +guid: 99d1218f56c6ec24b9e468253a50c5a0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/InteractionEngine/ShinyThings.cs b/Assets/Scripts/InteractionEngine/ShinyThings.cs index 6f93fd1f..211f7b6f 100644 --- a/Assets/Scripts/InteractionEngine/ShinyThings.cs +++ b/Assets/Scripts/InteractionEngine/ShinyThings.cs @@ -1,43 +1,25 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; -using UnityEditor; -using static CommunicationEvents; -using System; public class ShinyThings : MonoBehaviour { public WorldCursor Cursor; //Attributes for Highlighting of Facts when Mouse-Over - private string selectableTag = "Selectable"; - private Transform lastFactSelection; - public Material defaultMaterial; - public Material highlightMaterial; + private FactObject lastFactSelection; //Variables for Pushout-Highlighting - private Fact highlightedPushoutFact; - private GameObject extraHighlight; - private bool timerActive { get; set; } - private float timer { get; set; } - private float timerDuration = 2.5f; - private float timerDurationEnd = 5.0f; - private int slowDownCount = 8; - private int slowDownCounter; - private bool[] slowDownSwitch; - private float simulationSpeed; - private Boolean pushoutFail; + private static float timerDuration = 2.5f; + public GameObject directionalLight; - private Color lightColor; - private Color tempColor; - private Color darkColor; - private Boolean factAnimationActive = false; - private float speedSlowDown; + private Color darkColor = new (0.3f, 0.3f, 0.3f); public Material pushoutMaterial; - private Material tempMaterial; public GameObject Fireworks_Animation, RainPrefab; + // Start is called before the first frame update public void Start() { @@ -50,309 +32,116 @@ public void Start() CommunicationEvents.PushoutFactEvent.AddListener(HighlightFact); CommunicationEvents.PushoutFactFailEvent.AddListener(StartPushoutFactFailHighlighting); CommunicationEvents.AnimateExistingFactEvent.AddListener(HighlightWithFireworks); - - speedSlowDown = timerDurationEnd * 10; - lightColor = directionalLight.GetComponent<Light>().color; - - slowDownSwitch = new bool[slowDownCount]; - Array.Clear(slowDownSwitch, 0, slowDownSwitch.Length); - - this.timerActive = false; - this.timer = 0; } // Update is called once per frame public void Update() { - //SELECTION-HIGHLIGHTING-PART - //Check if a Fact was Hit - - RaycastHit Hit = Cursor.Hit; - - Highlighting(Hit); - - - //LineRendering-Part - - //@John before: hit.point - - //Debug.Log(this.transform.position); - - //If the Timer is Active, check Pushout-Highlighting - if (this.timerActive) - { - this.timer += Time.deltaTime; - CheckPushoutHighlighting(); - } + Highlighting(Cursor.Hit); } private void Highlighting(RaycastHit hit) { - if (hit.transform != null) - { - Transform selection = hit.transform; - - //only do stuff if selection changes + FactObject selected_fact_obj = hit.transform?.GetComponentInChildren<FactObject>(); - - //Set the last Fact unselected - if (this.lastFactSelection != null) - { - if (selection == this.lastFactSelection) return; - //Invoke the EndHighlightEvent that will be handled in FactSpawner - // CommunicationEvents.EndHighlightEvent.Invoke(this.lastFactSelection); - if (this.lastFactSelection.CompareTag(selectableTag)) - OnMouseOverFactEnd(lastFactSelection); - else - OnMouseOverSnapZoneEnd(lastFactSelection); - this.lastFactSelection = null; - } - - //Set the Fact that was Hit as selected - if (selection.CompareTag(selectableTag)) - { - //Invoke the HighlightEvent that will be handled in FactSpawner - this.lastFactSelection = selection; - //CommunicationEvents.HighlightEvent.Invoke(selection); - OnMouseOverFact(lastFactSelection); - } - else if (selection.CompareTag("SnapZone")) - { - this.lastFactSelection = selection; - OnMouseOverSnapZone(lastFactSelection); - - } - } - - - //SELECTION-HIGHLIGHTING-PART-END - } - - private void OnMouseOverSnapZoneEnd(Transform selection) - { - Renderer selectionRenderer; - - if (selection != null) + //Set the last Fact unselected + if (this.lastFactSelection != null + && (selected_fact_obj == null || this.lastFactSelection != selected_fact_obj)) { - selectionRenderer = selection.GetComponent<Renderer>(); - if (selectionRenderer != null) - { - //Add transparency - var oldCol = selectionRenderer.material.color; - oldCol.a = .25f; - selectionRenderer.material.color = oldCol; - } + ApplyMaterial(lastFactSelection, lastFactSelection.Default); + this.lastFactSelection = null; } - } - private void OnMouseOverSnapZone(Transform selection) - { - Renderer selectionRenderer; - selectionRenderer = selection.GetComponent<Renderer>(); - if (selectionRenderer != null) + //Set the Fact that was Hit as selected + if (selected_fact_obj != null && hit.transform != null + && (hit.transform.CompareTag("Selectable") || hit.transform.CompareTag("SnapZone")) + && (this.lastFactSelection == null || this.lastFactSelection != selected_fact_obj)) { - //Remove transparency - var oldCol = selectionRenderer.material.color; - oldCol.a = .75f; - selectionRenderer.material.color = oldCol; + ApplyMaterial(selected_fact_obj, selected_fact_obj.Selected); + this.lastFactSelection = selected_fact_obj; } - } - public void OnMouseOverFact(Transform selection) - { - Renderer selectionRenderer; - selectionRenderer = selection.GetComponent<Renderer>(); - if (selectionRenderer != null) - { - //Set the Material of the Fact, where the mouse is over, to a special one - selectionRenderer.material = highlightMaterial; - } + void ApplyMaterial(FactObject root, Material new_mat) => + root.CoroutineCascadeForChildrenAllRenderer( + (_, renderer) => + renderer.ProgrammMaterialChange(new[] { + (0f, 1f, new_mat), + }) + ); } - public void OnMouseOverFactEnd(Transform selection) + public static void HighlightFact(Fact startFact, FactObject.FactMaterials tmp_mat) { - Renderer selectionRenderer; - - if (selection != null) - { - selectionRenderer = selection.GetComponent<Renderer>(); - if (selectionRenderer != null) - { - //Set the Material of the fact back to default - selectionRenderer.material = defaultMaterial; - } - } + FactObject selected_fact_obj = startFact.Representation.GetComponentInChildren<FactObject>(); + + selected_fact_obj.CoroutineCascadeForChildrenAllRenderer( + (fact_obj, renderer) => + renderer.ProgrammMaterialChange(new[] { + (0f, 1f, fact_obj.materials[(int) tmp_mat]), + (timerDuration, 1f, fact_obj.Default), + }) + ); } public void HighlightWithFireworks(Fact fact) { - GameObject fireworksRepresentation = Fireworks_Animation; - - this.extraHighlight = GameObject.Instantiate(fireworksRepresentation); - this.extraHighlight.transform.position = fact.Representation.transform.position; - - HighlightFact(fact); - } - - public void HighlightFact(Fact startFact) { - - highlightedPushoutFact = startFact; + StartCoroutine(BlossomAndDie()); + HighlightFact(fact, FactObject.FactMaterials.Solution); - if (typeof(PointFact).IsInstanceOfType(highlightedPushoutFact)) + IEnumerator BlossomAndDie() { - PointFact fact = (PointFact)highlightedPushoutFact; - tempMaterial = fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material; - fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material = pushoutMaterial; - } - else if (typeof(LineFact).IsInstanceOfType(highlightedPushoutFact)) - { - LineFact fact = (LineFact)highlightedPushoutFact; - tempMaterial = fact.Representation.transform.GetChild(0).GetChild(1).GetComponent<MeshRenderer>().material; - fact.Representation.transform.GetChild(0).GetChild(1).GetComponent<MeshRenderer>().material = pushoutMaterial; - } - else if (typeof(AngleFact).IsInstanceOfType(highlightedPushoutFact)) { - AngleFact fact = (AngleFact)highlightedPushoutFact; - tempMaterial = fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material; - fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material = pushoutMaterial; - } + GameObject firework = GameObject.Instantiate(Fireworks_Animation); + firework.transform.position = fact.Representation.transform.position; - //Activate Timer - this.pushoutFail = false; - this.slowDownCounter = 0; - this.timerActive = true; - } + yield return new WaitForSeconds(timerDuration); - public void StopHighlighting() { + firework.transform.GetChild(0) + .GetComponent<ParticleSystem>() + .Stop(); + var sparks = firework.transform.GetChild(1) + .GetComponent<ParticleSystem>(); + sparks.Stop(); - if (typeof(PointFact).IsInstanceOfType(highlightedPushoutFact)) - { - PointFact fact = (PointFact)highlightedPushoutFact; - fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material = tempMaterial; - } - else if (typeof(LineFact).IsInstanceOfType(highlightedPushoutFact)) - { - LineFact fact = (LineFact)highlightedPushoutFact; - fact.Representation.transform.GetChild(0).GetChild(1).GetComponent<MeshRenderer>().material = tempMaterial; - } - else if (typeof(AngleFact).IsInstanceOfType(highlightedPushoutFact)) - { - AngleFact fact = (AngleFact)highlightedPushoutFact; - fact.Representation.transform.GetChild(0).GetComponent<MeshRenderer>().material = tempMaterial; - } + while (sparks.IsAlive()) + yield return null; - if (this.extraHighlight != null) - { - GameObject.Destroy(this.extraHighlight); - this.extraHighlight = null; + GameObject.Destroy(firework); } - - //Event for the happy Task-Charakter - CommunicationEvents.PushoutFactEndEvent.Invoke(null); -} + } public void StartPushoutFactFailHighlighting(Fact startFact) { - this.pushoutFail = true; - this.tempColor = this.lightColor; - this.darkColor = new Color(0.6f, 0.6f, 0.6f); - this.timerActive = true; - } + StartCoroutine(BlossomAndDie()); - public void CheckPushoutHighlighting() { - //If the Pushout suceeded -> Fireworks-Animation - if (this.pushoutFail == false) + IEnumerator BlossomAndDie() { - //Fireworks already started in StartPushoutFactHighlighting - if (this.timer >= this.timerDuration) - { - //After this.timerDuration+this.timerDurationEnd: Destroy Fireworks-Animation - if (this.timer >= this.timerDuration + this.timerDurationEnd) - { - this.timerActive = false; - this.timer = 0; - StopHighlighting(); - } - //After this.timerDuration: Slow Down Fireworks - else if (this.extraHighlight != null) - { - ParticleSystem main1 = this.extraHighlight.transform.GetChild(0).GetComponent<ParticleSystem>(); - ParticleSystem main2 = this.extraHighlight.transform.GetChild(1).GetComponent<ParticleSystem>(); - //Save StartSpeed when first slowing down - if (this.slowDownCounter == 0) - this.simulationSpeed = main1.main.simulationSpeed; - slowDownAnimation(main1, main2); - } + Color start = directionalLight.GetComponent<Light>().color; + IEnumerator<float> num = LerpfTime(0, 1, 1); + while (num.MoveNext()) { + directionalLight.GetComponent<Light>().color = Color.Lerp(start, darkColor, num.Current); + yield return null; } - } - //If the Pushout failed -> Rain-Animation - else - { - if (this.timer <= 0.5f * (this.timerDurationEnd)) - { - //sky slowly gets dark - if (directionalLight.GetComponent<Light>().color.r > darkColor.r) - { - tempColor.r -= Time.deltaTime/5; - tempColor.g -= Time.deltaTime/5; - tempColor.b -= Time.deltaTime/5; - directionalLight.GetComponent<Light>().color = tempColor; - } - } - else if (this.timer <= 2.0f * this.timerDuration + 0.5f * this.timerDurationEnd) - { - //Rain-Animation starts - if (!factAnimationActive) - { - GameObject RainRepresentation = RainPrefab; - RainRepresentation.transform.position = new Vector3(0, 40, 0); - this.extraHighlight = GameObject.Instantiate(RainRepresentation); - factAnimationActive = true; - } - } - //Rain-Animation stops and sky slowly gets bright again - else if (this.timer <= 2.0f * this.timerDuration + this.timerDurationEnd) - { - if (factAnimationActive) - { - //Stop Rain - GameObject.Destroy(this.extraHighlight); - this.extraHighlight = null; - factAnimationActive = false; - } - //sky slowly gets bright again - if (directionalLight.GetComponent<Light>().color.r <= lightColor.r) - { - tempColor.r += Time.deltaTime/5; - tempColor.g += Time.deltaTime/5; - tempColor.b += Time.deltaTime/5; - directionalLight.GetComponent<Light>().color = tempColor; - } - } - else + GameObject rainwork = GameObject.Instantiate(RainPrefab, new Vector3(0, 40, 0), Quaternion.identity); + yield return new WaitForSeconds(2*timerDuration); + GameObject.Destroy(rainwork); + + num = LerpfTime(0, 1, 1); + while (num.MoveNext()) { - //Stop timer - this.timerActive = false; - this.timer = 0; + directionalLight.GetComponent<Light>().color = Color.Lerp(darkColor, start, num.Current); + yield return null; } } - } - - public void slowDownAnimation(ParticleSystem main1, ParticleSystem main2) { - if (this.timer <= this.timerDuration + (this.timerDurationEnd*((float)slowDownCounter+1.0f)/(float)slowDownCount)) + IEnumerator<float> LerpfTime(float start, float end, float time) { - if(slowDownSwitch[(int)((this.timer-this.timerDuration)/(this.timerDuration/(float)slowDownCount))] == false) - if (slowDownCounter < slowDownCount) - { - var mainModule1 = main1.main; - float speed = mainModule1.simulationSpeed; - mainModule1.simulationSpeed = speed - (float)(this.simulationSpeed / (float)slowDownCount); - var mainModule2 = main2.main; - mainModule2.simulationSpeed = speed - (float)(this.simulationSpeed / (float)slowDownCount); + float + start_time = Time.time, + end_time = start_time + time; - slowDownSwitch[slowDownCounter] = true; - } + while(end_time >= Time.time) + yield return Mathf.Lerp(start, end, (Time.time - start_time) / time); } } } diff --git a/Assets/Scripts/InteractionEngine/WorldCursor.cs b/Assets/Scripts/InteractionEngine/WorldCursor.cs index 770bed21..520e006a 100644 --- a/Assets/Scripts/InteractionEngine/WorldCursor.cs +++ b/Assets/Scripts/InteractionEngine/WorldCursor.cs @@ -44,31 +44,16 @@ void Update() { updateMaxRange(); - Cam = Camera.main; //WARN: Should not called every Update; - Vector3 mousePos = new(0, 0, 0); - //************************************************ - if (UIconfig.InputManagerVersion == 1) - { - mousePos = Input.mousePosition; - } - if (UIconfig.InputManagerVersion == 2) + Cam = Camera.main; //WARN: Should not called every Update; TODO: Cache in Start/Awake? + Vector3 mousePos = UIconfig.InputManagerVersion switch { - //mousePos = Mouse.current.position.ReadValue(); - mousePos = Input.mousePosition; - } - if (UIconfig.InputManagerVersion == 3) - { - //mousePos = Mouse.current.position.ReadValue(); - mousePos = Input.mousePosition; - } - //**************************************************** + 1 or 2 or 3 => Input.mousePosition, + _ => Vector3.zero + }; //Ray ray = useCamCurser ? new Ray(Cam.transform.position, Cam.transform.forward) : Cam.ScreenPointToRay(Input.mousePosition); Ray ray = useCamCurser ? new Ray(Cam.transform.position, Cam.transform.forward) : Cam.ScreenPointToRay(mousePos); - - - this.Hit = new RaycastHit(); transform.up = Cam.transform.forward; transform.position = ray.GetPoint(GlobalBehaviour.GadgetPhysicalDistance); @@ -85,11 +70,9 @@ void Update() && Physics.Raycast(transform.position, Vector3.down, out Hit, GlobalBehaviour.GadgetPhysicalDistance, rayCastMask))) { bool deactSnapKey = false; + if (UIconfig.InputManagerVersion == 1) - { Input.GetButton(this.deactivateSnapKey); - } - if ((Hit.collider.transform.CompareTag("SnapZone") || Hit.collider.transform.CompareTag("Selectable")) && !deactSnapKey) diff --git a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs index 5de2ac52..dce0623d 100644 --- a/Assets/Scripts/InventoryStuff/DisplayScrolls.cs +++ b/Assets/Scripts/InventoryStuff/DisplayScrolls.cs @@ -1,4 +1,5 @@ -using System.Collections; +using Newtonsoft.Json; +using System.Collections; using System.Collections.Generic; using System.IO; using System.Linq; @@ -94,7 +95,7 @@ IEnumerator getScrollsfromServer() void BuildScrolls(string jsonString) { - AvailableScrolls = Scroll.FromJSON(jsonString); + AvailableScrolls = JsonConvert.DeserializeObject<List<Scroll>>(jsonString); AllowedScrolls = AvailableScrolls .Where(s => StageStatic.stage.AllowedScrolls?.Contains(s.label) ?? true) .ToList(); diff --git a/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs b/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs index 5f12b6c4..49b02a30 100644 --- a/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs +++ b/Assets/Scripts/InventoryStuff/RenderedScrollFact.cs @@ -15,7 +15,7 @@ public class RenderedScrollFact : MonoBehaviour public string Label { - get { return _label; } + get => _label; set { if (_label == value) return; @@ -37,14 +37,7 @@ public void OnClickHintButton() public void OnHintAvailable(List<string> uris) { GameObject hintButton = ScrollParameterObject.transform.GetChild(2).gameObject; - - if (uris.Contains(factUri)) - { - hintButton.SetActive(true); - } - else - { - hintButton.SetActive(false); - } + + hintButton.SetActive(value: uris.Contains(factUri)); } } diff --git a/Assets/Scripts/InventoryStuff/Scroll.cs b/Assets/Scripts/InventoryStuff/Scroll.cs index 888c155b..903564e8 100644 --- a/Assets/Scripts/InventoryStuff/Scroll.cs +++ b/Assets/Scripts/InventoryStuff/Scroll.cs @@ -12,17 +12,6 @@ public class Scroll public List<ScrollFact> requiredFacts; public List<ScrollFact> acquiredFacts; - public static List<Scroll> FromJSON(string json) - { - List<Scroll> scrolls = JsonConvert.DeserializeObject<List<Scroll>>(json); - return scrolls; - } - public static string ToJSON(FilledScroll scroll) - { - string json = Newtonsoft.Json.JsonConvert.SerializeObject(scroll); - return json; - } - public class FilledScroll { public string scroll; @@ -73,10 +62,10 @@ public class ScrollSymbolFact : ScrollFact public override String getType() { - if (this.tp is OMS) - return ((OMS)this.tp).uri; - else if (this.tp is OMA) - return ((OMS)((OMA)((OMA)this.tp).arguments[0]).applicant).uri; + if (this.tp is OMS oMS) + return oMS.uri; + else if (this.tp is OMA oMA) + return ((OMS)((OMA) oMA.arguments[0]).applicant).uri; else return null; } diff --git a/Assets/Scripts/InventoryStuff/ScrollDetails.cs b/Assets/Scripts/InventoryStuff/ScrollDetails.cs index 2536c300..8b99675f 100644 --- a/Assets/Scripts/InventoryStuff/ScrollDetails.cs +++ b/Assets/Scripts/InventoryStuff/ScrollDetails.cs @@ -12,10 +12,6 @@ public class ScrollDetails : MonoBehaviour public GameObject parameterDisplayPrefab; public Scroll ActiveScroll; - public int x_Start; - public int y_Start; - public int y_Paece_Between_Items; - public static List<GameObject> ParameterDisplays; private static List<Scroll.ScrollAssignment> LatestCompletions; private static List<Fact> LatestRenderedHints; @@ -25,11 +21,6 @@ public class ScrollDetails : MonoBehaviour public bool dynamicScrollDescriptionsActive = true; public bool automaticHintGenerationActive = true; - public Vector3 GetPosition(int i) - { - return new Vector3(x_Start, y_Start + i * (-y_Paece_Between_Items), 0f); - } - // Start is called before the first frame update void Start() { @@ -136,14 +127,14 @@ IEnumerator sendView(string endpoint) private string prepareScrollAssignments() { Fact tempFact; - List<Scroll.ScrollAssignment> assignmentList = new List<Scroll.ScrollAssignment>(); + List<Scroll.ScrollAssignment> assignmentList = new(); for (int i = 0; i < ParameterDisplays.Count; i++) { tempFact = ParameterDisplays[i].GetComponentInChildren<DropHandling>().currentFact; if (tempFact != null) { - Scroll.ScrollAssignment listEntry = new Scroll.ScrollAssignment + Scroll.ScrollAssignment listEntry = new() { fact = new Scroll.UriReference(ActiveScroll.requiredFacts[i].@ref.uri), assignment = new JSONManager.OMS(tempFact.Id) @@ -152,8 +143,8 @@ private string prepareScrollAssignments() } } - Scroll.FilledScroll filledScroll = new Scroll.FilledScroll(ActiveScroll.@ref, assignmentList); - return Scroll.ToJSON(filledScroll); + Scroll.FilledScroll filledScroll = new(ActiveScroll.@ref, assignmentList); + return JsonConvert.SerializeObject(filledScroll); } private void readPushout(List<Scroll.ScrollFact> pushoutFacts) @@ -167,7 +158,8 @@ private void readPushout(List<Scroll.ScrollFact> pushoutFacts) Fact newFact = ParsingDictionary.parseFactDictionary[pushoutFacts[i].getType()].Invoke(pushoutFacts[i]); if (newFact != null) { - PushoutFactEvent.Invoke(FactManager.AddFactIfNotFound(newFact, out bool exists, samestep, null, ActiveScroll.label)); + PushoutFactEvent.Invoke(FactManager.AddFactIfNotFound(newFact, out _, samestep, null, ActiveScroll.label) + , FactObject.FactMaterials.Solution); } else { Debug.Log("Parsing on pushout-fact returned null -> One of the dependent facts does not exist"); @@ -184,7 +176,7 @@ public void processScrollDynamicInfo(Scroll.ScrollDynamicInfo scrollDynamicInfo) LatestRenderedHints = new List<Fact>(); - List<string> hintUris = new List<string>(); + List<string> hintUris = new(); foreach (Scroll.ScrollAssignment currentCompletion in LatestCompletions) { hintUris.Add(currentCompletion.fact.uri); } @@ -253,9 +245,6 @@ public void animateHint(GameObject scrollParameter, string scrollParameterUri) { scrollParameter.GetComponentInChildren<ImageHintAnimation>().AnimationTrigger(); //Animate Fact in FactPanel AnimateExistingFactEvent.Invoke(fact); - //Animate factRepresentation in game, if fact has a Representation (e.g. OnLineFact has no Representation) - if(fact.Representation != null) - fact.Representation.GetComponentInChildren<MeshRendererHintAnimation>().AnimationTrigger(); } } else if (LatestRenderedHints.Exists(x => x.Id.Equals(scrollParameterUri))) @@ -272,9 +261,6 @@ public void animateHint(GameObject scrollParameter, string scrollParameterUri) { scrollParameter.GetComponentInChildren<ImageHintAnimation>().AnimationTrigger(); //Animate Fact in FactPanel AnimateExistingFactEvent.Invoke(existingFact); - //Animate factRepresentation in game if Fact has a Representation (e.g. OnLineFact has no Representation) - if (existingFact.Representation != null) - existingFact.Representation.GetComponentInChildren<MeshRendererHintAnimation>().AnimationTrigger(); } //If not -> Generate a Fact-Representation with such dependent facts else diff --git a/Assets/Scripts/Loading/Stage.cs b/Assets/Scripts/Loading/Stage.cs index e0164ce2..9d2ebd23 100644 --- a/Assets/Scripts/Loading/Stage.cs +++ b/Assets/Scripts/Loading/Stage.cs @@ -382,7 +382,7 @@ public bool DeepLoad() /// <returns>contians all <see cref="Stage">Stages</see> found given parameters.</returns> public static Dictionary<string, Stage> Grup(List<Directories> hierarchie = null, bool use_install_folder = false) { - Dictionary<string, Stage> ret = new Dictionary<string, Stage>(); + Dictionary<string, Stage> ret = new(); var new_hierarchie = IJSONsavable<Stage>.Instance._IJGetHierarchie(hierarchie); string path = CreatePathToFile(out _, "", "", new_hierarchie, use_install_folder); diff --git a/Assets/Scripts/TestScripts/ScrollUIManager.cs b/Assets/Scripts/TestScripts/ScrollUIManager.cs deleted file mode 100644 index a2686fbf..00000000 --- a/Assets/Scripts/TestScripts/ScrollUIManager.cs +++ /dev/null @@ -1,29 +0,0 @@ -using UnityEngine; - -public class ScrollUIManager : MonoBehaviour -{ - public bool initialShow; - private CanvasGroup canvasGroup; - - // Start is called before the first frame update - void Start() - { - canvasGroup = GetComponent<CanvasGroup>(); - if (initialShow) - Show(); - else - Hide(); - } - - public void Show(float delay = 0f) - { - canvasGroup.alpha = 1f; - canvasGroup.blocksRaycasts = true; - } - - public void Hide(float delay = 0f) - { - canvasGroup.alpha = 0f; //this makes everything transparent - canvasGroup.blocksRaycasts = false; //this prevents the UI element to receive input events - } -} diff --git a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs index af60fc87..6265c555 100644 --- a/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs +++ b/Assets/Scripts/UI/InGame/MainPlayerMode_Ctrl.cs @@ -58,7 +58,7 @@ private void Update() //Camera_ofActivePlayer.SetActive(true); ClearUIC(); GpMode_before = -100; - NoInput_GObj.gameObject.SetActive(true); + NoInput_GObj.SetActive(true); } } if (!InputDisable && GpMode_before != UIconfig.GameplayMode) @@ -82,29 +82,29 @@ private void Update2(){ //otherSidescrolle break; case 1: - Moorhuhn_GObj.gameObject.SetActive(true); + Moorhuhn_GObj.SetActive(true); break; case 2: - Escaperoom_GObj.gameObject.SetActive(true); + Escaperoom_GObj.SetActive(true); break; case 3: - ThirdPerson_manualCam_GObj.gameObject.SetActive(true); + ThirdPerson_manualCam_GObj.SetActive(true); break; case 4: - ThirdPerson_dampedCam_GObj.gameObject.SetActive(true); + ThirdPerson_dampedCam_GObj.SetActive(true); break; case 5: - FirstPerson_GObj.gameObject.SetActive(true); + FirstPerson_GObj.SetActive(true); //NPC1.setPlayer(FirstPerson_GObj.); break; case 6: - FirstPersonOldInpOrig_GObj.gameObject.SetActive(true); + FirstPersonOldInpOrig_GObj.SetActive(true); break; case 7: - ThirdPerson_Shoulder_GObj.gameObject.SetActive(true); + ThirdPerson_Shoulder_GObj.SetActive(true); break; case 8: - Sidescroller_GObj.gameObject.SetActive(true); + Sidescroller_GObj.SetActive(true); break; default: diff --git a/Assets/Stages/TechDemo A.JSON b/Assets/Stages/TechDemo A.JSON index ca0e0f0f..a34bb1fa 100644 --- a/Assets/Stages/TechDemo A.JSON +++ b/Assets/Stages/TechDemo A.JSON @@ -1 +1 @@ -{"category":"Demo Category","number":1,"description":"Tree Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[],"AllowedScrolls":null,"AllowedGadgets":null,"name":"TechDemo A","path":null} \ No newline at end of file +{"category":"Demo Category","number":1,"description":"Tree Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1318","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1319","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1320","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[{"solved":false,"date":-8585394366841814464,"seconds":26.867303499999936,"factState":{"WorkflowGadgetDict":{"-1":null,"0":{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":24066},"SecondaryLayerMask":{"value":0},"Workflow":[]},"2":{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":1},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152"]},"3":{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152"]},"5":{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154"]}},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152":{"s_type":"PointFact","Point":{"x":5.864498,"y":6.2535,"z":-10.552001,"normalized":{"x":0.431349158,"y":0.459961265,"z":-0.7761273,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":13.59571,"sqrMagnitude":184.843323},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153":{"s_type":"PointFact","Point":{"x":6.287037,"y":-0.00494432449,"z":-7.031151,"normalized":{"x":0.666559637,"y":-0.0005242035,"z":-0.7454515,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":9.43207,"sqrMagnitude":88.9639359},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154":{"s_type":"PointFact","Point":{"x":5.864502,"y":-0.00494384766,"z":-10.552002,"normalized":{"x":0.485787123,"y":-0.000409524539,"z":-0.874077,"normalized":{"x":0.485787153,"y":-0.000409524568,"z":-0.8740771,"magnitude":1.0,"sqrMagnitude":1.00000012},"magnitude":0.99999994,"sqrMagnitude":0.99999994},"magnitude":12.0721645,"sqrMagnitude":145.737152},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","Label":"C","hasCustomLabel":false,"LabelId":3},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact155":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","is_right_angle":false,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact155","Label":"∠ABC","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact156":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact156","Label":"⊾BCA","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact157":{"s_type":"LineFact","Distance":3.54611444,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","Dir":{"x":-0.119154342,"y":1.344675e-7,"z":-0.992875755,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact157","Label":"[BC]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact158":{"s_type":"LineFact","Distance":6.258444,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","Dir":{"x":-6.09528058e-7,"y":1.0,"z":1.52382015e-7,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact158","Label":"[CA]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154":{"workflow_id":2,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact155":{"workflow_id":3,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact156":{"workflow_id":4,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact157":{"workflow_id":5,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact158":{"workflow_id":6,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","samestep":false,"steplink":1,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":1.6304187000000639},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","samestep":false,"steplink":2,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":2.718663699999979},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","samestep":false,"steplink":3,"creation":true,"gadget_rank":2,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152"],"GadgetTime":5.074121399999967},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact155","samestep":false,"steplink":4,"creation":true,"gadget_rank":3,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154"],"GadgetTime":8.042263000000049},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact156","samestep":false,"steplink":5,"creation":true,"gadget_rank":3,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact152"],"GadgetTime":9.874896099999888},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact157","samestep":false,"steplink":6,"creation":true,"gadget_rank":5,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact153","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact154"],"GadgetTime":13.846140999999989},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory4?fact158","samestep":false,"steplink":7,"creation":true,"gadget_rank":-1,"scroll_label":"OppositeLen","GadgetFlow":[],"GadgetTime":24.601568399999907}],"marker":7,"worksteps":7,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":3,"UnusedLabelIds":[],"name":null,"path":null},"name":"TechDemo A_save","path":null}],"AllowedScrolls":null,"AllowedGadgets":null,"name":"TechDemo A","path":null} \ No newline at end of file diff --git a/Assets/Stages/TechDemo B.JSON b/Assets/Stages/TechDemo B.JSON index 8cf6b969..bdeee8db 100644 --- a/Assets/Stages/TechDemo B.JSON +++ b/Assets/Stages/TechDemo B.JSON @@ -1 +1 @@ -{"category":"Demo Category","number":2,"description":"River Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[],"AllowedScrolls":["OppositeLen"],"AllowedGadgets":[{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":24066},"SecondaryLayerMask":{"value":0}},{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"LineTool","Rank":4,"UiName":"Line Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":4,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"LotTool","Rank":5,"UiName":"Lot Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":5,"MaterialIndx":0,"IgnoreLayerMask":{"value":86530},"SecondaryLayerMask":{"value":0}},{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":1}},{"s_type":"Remover","Rank":8,"UiName":"Delete Fact","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":8,"MaterialIndx":0,"IgnoreLayerMask":{"value":115219},"SecondaryLayerMask":{"value":0}}],"name":"TechDemo B","path":null} \ No newline at end of file +{"category":"Demo Category","number":2,"description":"River Stage","scene":"RiverWorld","use_install_folder":true,"solution":{"ValidationSet":[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}],"WorkflowGadgetDict":{"-1":null},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321":{"s_type":"PointFact","Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322":{"s_type":"PointFact","Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323":{"s_type":"LineFact","Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323","Label":"[AB]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1321","samestep":false,"steplink":3,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1322","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact1323","samestep":true,"steplink":0,"creation":true,"gadget_rank":-1,"scroll_label":null}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":true,"MaxLabelId":2,"UnusedLabelIds":[],"name":null,"path":null},"solution_approches":[{"solved":true,"date":-8585394401831257389,"seconds":85.13498319999985,"factState":{"WorkflowGadgetDict":{"-1":null,"0":{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":24066},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact330"]},"2":{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":1},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact323"]},"3":{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact335","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact325"]},"4":{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact335","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact325","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact333"]},"7":{"s_type":"LineTool","Rank":4,"UiName":"Line Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":4,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":[]},"12":{"s_type":"LotTool","Rank":5,"UiName":"Lot Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":5,"MaterialIndx":0,"IgnoreLayerMask":{"value":86530},"SecondaryLayerMask":{"value":0},"Workflow":[]}},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202":{"s_type":"PointFact","Point":{"x":5.864498,"y":6.2535,"z":-10.552001,"normalized":{"x":0.431349158,"y":0.459961265,"z":-0.7761273,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":13.59571,"sqrMagnitude":184.843323},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203":{"s_type":"PointFact","Point":{"x":6.46365738,"y":-0.00494432449,"z":-7.769211,"normalized":{"x":0.639560163,"y":-0.0004892266,"z":-0.7687409,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":10.10641,"sqrMagnitude":102.139526},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204":{"s_type":"PointFact","Point":{"x":5.864502,"y":-0.00494384766,"z":-10.552002,"normalized":{"x":0.485787123,"y":-0.000409524539,"z":-0.874077,"normalized":{"x":0.485787153,"y":-0.000409524568,"z":-0.8740771,"magnitude":1.0,"sqrMagnitude":1.00000012},"magnitude":0.99999994,"sqrMagnitude":0.99999994},"magnitude":12.0721645,"sqrMagnitude":145.737152},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Label":"C","hasCustomLabel":false,"LabelId":3},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact205":{"s_type":"LineFact","Distance":2.84656167,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Dir":{"x":-0.210483909,"y":1.67513377e-7,"z":-0.977597356,"magnitude":1.0,"sqrMagnitude":1.00000012},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact205","Label":"[BC]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact206":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","is_right_angle":false,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact206","Label":"∠ABC","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact207":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact207","Label":"⊾BCA","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact208":{"s_type":"LineFact","Distance":6.258444,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","Dir":{"x":-6.09528058e-7,"y":1.0,"z":1.52382015e-7,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact208","Label":"[CA]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209":{"s_type":"RayFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Dir":{"x":-0.210483909,"y":1.67513377e-7,"z":-0.977597356,"magnitude":1.0,"sqrMagnitude":1.00000012},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","Label":"]BC[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact210":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact210","Label":"C∈]BC[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact211":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact211","Label":"B∈]BC[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212":{"s_type":"PointFact","Point":{"x":4.68058634,"y":-0.00494290562,"z":-16.050724,"normalized":{"x":0.279951781,"y":-0.000295641425,"z":-0.960014045,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":16.71926,"sqrMagnitude":279.533661},"Normal":{"x":-1.6751234e-7,"y":1.0,"z":2.07417713e-7,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","Label":"D","hasCustomLabel":false,"LabelId":4},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact213":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact213","Label":"D∈]BC[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214":{"s_type":"PointFact","Point":{"x":2.85415626,"y":-0.004944274,"z":-9.903852,"normalized":{"x":0.2769166,"y":-0.0004797045,"z":-0.960893869,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":10.3069162,"sqrMagnitude":106.232529},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Label":"E","hasCustomLabel":false,"LabelId":5},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215":{"s_type":"RayFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Dir":{"x":-0.977597356,"y":-1.38518971e-7,"z":0.210483864,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215","Label":"]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact216":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact216","Label":"C∈]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact217":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact217","Label":"E∈]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact218":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact218","Label":"⊾BCE","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact219":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","is_right_angle":false,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact219","Label":"∠DEC","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact220":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact220","Label":"⊾ECD","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact221":{"s_type":"LineFact","Distance":3.079331,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Dir":{"x":0.977597356,"y":1.38518971e-7,"z":-0.210483864,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact221","Label":"[EC]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact222":{"s_type":"LineFact","Distance":5.624731,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","Dir":{"x":-0.210483953,"y":1.67480508e-7,"z":-0.977597356,"magnitude":1.0,"sqrMagnitude":1.00000012},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact222","Label":"[CD]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204":{"workflow_id":2,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact205":{"workflow_id":3,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact206":{"workflow_id":4,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact207":{"workflow_id":5,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact208":{"workflow_id":6,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209":{"workflow_id":7,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact210":{"workflow_id":8,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact211":{"workflow_id":9,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212":{"workflow_id":10,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact213":{"workflow_id":11,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214":{"workflow_id":12,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215":{"workflow_id":13,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact216":{"workflow_id":14,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact217":{"workflow_id":15,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact218":{"workflow_id":16,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact219":{"workflow_id":17,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact220":{"workflow_id":18,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact221":{"workflow_id":19,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact222":{"workflow_id":20,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","samestep":false,"steplink":1,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":3.144779900000003},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","samestep":false,"steplink":2,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":9.367621499999814},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","samestep":false,"steplink":3,"creation":true,"gadget_rank":2,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202"],"GadgetTime":10.97424860000001},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact205","samestep":false,"steplink":4,"creation":true,"gadget_rank":3,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":14.957761799999844},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact206","samestep":false,"steplink":5,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":18.957587499999819},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact207","samestep":false,"steplink":6,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact202"],"GadgetTime":21.823295199999849},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact208","samestep":false,"steplink":7,"creation":true,"gadget_rank":-1,"scroll_label":"OppositeLen","GadgetFlow":[],"GadgetTime":33.09989239999982},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","samestep":false,"steplink":10,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact203","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":39.04403860000002},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact210","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":39.04403860000002},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact211","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":39.04403860000002},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","samestep":false,"steplink":12,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":44.71679919999997},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact213","samestep":true,"steplink":10,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209"],"GadgetTime":44.71679919999997},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","samestep":false,"steplink":17,"creation":true,"gadget_rank":12,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact209","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":50.95342979999987},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact215","samestep":true,"steplink":12,"creation":true,"gadget_rank":12,"scroll_label":null,"GadgetFlow":[],"GadgetTime":50.95342979999987},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact216","samestep":true,"steplink":12,"creation":true,"gadget_rank":12,"scroll_label":null,"GadgetFlow":[],"GadgetTime":50.95342979999987},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact217","samestep":true,"steplink":12,"creation":true,"gadget_rank":12,"scroll_label":null,"GadgetFlow":[],"GadgetTime":50.95342979999987},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact218","samestep":true,"steplink":12,"creation":true,"gadget_rank":12,"scroll_label":null,"GadgetFlow":[],"GadgetTime":50.95342979999987},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact219","samestep":false,"steplink":18,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":54.19296939999981},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact220","samestep":false,"steplink":19,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact212"],"GadgetTime":56.55137949999994},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact221","samestep":false,"steplink":20,"creation":true,"gadget_rank":3,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact214","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact204"],"GadgetTime":59.82344219999982},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory5?fact222","samestep":false,"steplink":21,"creation":true,"gadget_rank":-1,"scroll_label":"OppositeLen","GadgetFlow":[],"GadgetTime":83.29748599999994}],"marker":21,"worksteps":14,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":5,"UnusedLabelIds":[1,2,3,4,5],"name":null,"path":null},"name":"TechDemo B_save_1","path":null},{"solved":true,"date":-8585394389166339628,"seconds":101.30750609999996,"factState":{"WorkflowGadgetDict":{"-1":null,"0":{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":24066},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501"]},"2":{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":1},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494"]},"3":{"s_type":"Remover","Rank":8,"UiName":"Delete Fact","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":8,"MaterialIndx":0,"IgnoreLayerMask":{"value":115219},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495"]},"4":{"s_type":"LineTool","Rank":4,"UiName":"Line Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":4,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":[]},"7":{"s_type":"LotTool","Rank":5,"UiName":"Lot Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":5,"MaterialIndx":0,"IgnoreLayerMask":{"value":86530},"SecondaryLayerMask":{"value":0},"Workflow":[]},"19":{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505"]},"23":{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0},"Workflow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"]}},"FactDict":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494":{"s_type":"PointFact","Point":{"x":5.864498,"y":6.2535,"z":-10.552001,"normalized":{"x":0.431349158,"y":0.459961265,"z":-0.7761273,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":13.59571,"sqrMagnitude":184.843323},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Label":"A","hasCustomLabel":false,"LabelId":1},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495":{"s_type":"PointFact","Point":{"x":8.788986,"y":-0.00494432449,"z":-4.796604,"normalized":{"x":0.877785742,"y":-0.0004938064,"z":-0.47905305,"normalized":{"x":0.8777858,"y":-0.000493806438,"z":-0.47905308,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":0.99999994,"sqrMagnitude":0.9999999},"magnitude":10.0126781,"sqrMagnitude":100.253716},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495","Label":"F","hasCustomLabel":true,"LabelId":-2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496":{"s_type":"PointFact","Point":{"x":5.864502,"y":-0.00494384766,"z":-10.552002,"normalized":{"x":0.485787123,"y":-0.000409524539,"z":-0.874077,"normalized":{"x":0.485787153,"y":-0.000409524568,"z":-0.8740771,"magnitude":1.0,"sqrMagnitude":1.00000012},"magnitude":0.99999994,"sqrMagnitude":0.99999994},"magnitude":12.0721645,"sqrMagnitude":145.737152},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Label":"C","hasCustomLabel":false,"LabelId":3},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497":{"s_type":"RayFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Dir":{"x":-6.09528058e-7,"y":1.0,"z":1.52382015e-7,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497","Label":"]CA[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact498":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact498","Label":"A∈]CA[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact499":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact499","Label":"C∈]CA[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500":{"s_type":"PointFact","Point":{"x":6.93117142,"y":-0.00494364649,"z":-7.60458374,"normalized":{"x":0.67362535,"y":-0.0004804622,"z":-0.739072859,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":10.2893562,"sqrMagnitude":105.870857},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Label":"B","hasCustomLabel":false,"LabelId":2},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501":{"s_type":"RayFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Dir":{"x":0.3403003,"y":6.41780247e-8,"z":0.940316856,"magnitude":1.0,"sqrMagnitude":1.00000012},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","Label":"]CB[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact502":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact502","Label":"C∈]CB[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact503":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact503","Label":"B∈]CB[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact504":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact504","Label":"⊾ACB","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505":{"s_type":"PointFact","Point":{"x":3.96935177,"y":-0.00494420528,"z":-15.7886763,"normalized":{"x":0.243817836,"y":-0.000303698325,"z":-0.969821036,"magnitude":1.0,"sqrMagnitude":1.00000012},"magnitude":16.27999,"sqrMagnitude":265.0381},"Normal":{"x":-6.417745e-8,"y":1.0,"z":-4.50250823e-8,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","Label":"D","hasCustomLabel":false,"LabelId":4},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact506":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact506","Label":"D∈]CB[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507":{"s_type":"PointFact","Point":{"x":3.04246736,"y":-0.004944342,"z":-9.530709,"normalized":{"x":0.304108322,"y":-0.000494209235,"z":-0.9526373,"magnitude":1.0,"sqrMagnitude":0.99999994},"magnitude":10.0045519,"sqrMagnitude":100.091049},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Label":"E","hasCustomLabel":false,"LabelId":5},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508":{"s_type":"RayFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Dir":{"x":-0.940316856,"y":-1.64780772e-7,"z":0.340300143,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508","Label":"]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact509":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact509","Label":"C∈]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact510":{"s_type":"OnLineFact","Pid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Rid":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508","Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact510","Label":"E∈]CE[","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact511":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact511","Label":"⊾BCE","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact512":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","is_right_angle":false,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact512","Label":"∠ABC","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact513":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact513","Label":"⊾BCA","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact514":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","is_right_angle":false,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact514","Label":"∠DEC","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact515":{"s_type":"AngleFact","Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid3":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","is_right_angle":true,"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact515","Label":"⊾ECD","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact516":{"s_type":"LineFact","Distance":3.13449478,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Dir":{"x":-0.3403003,"y":-6.41780247e-8,"z":-0.940316856,"magnitude":1.0,"sqrMagnitude":1.00000012},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact516","Label":"[BC]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact517":{"s_type":"LineFact","Distance":3.00115275,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Dir":{"x":0.940316856,"y":1.64780772e-7,"z":-0.340300143,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact517","Label":"[EC]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact518":{"s_type":"LineFact","Distance":6.258444,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","Dir":{"x":-6.09528058e-7,"y":1.0,"z":1.52382015e-7,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact518","Label":"[CA]","hasCustomLabel":false,"LabelId":0},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact519":{"s_type":"LineFact","Distance":5.569053,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","Dir":{"x":-0.340300262,"y":-6.4217e-8,"z":-0.9403168,"magnitude":1.0,"sqrMagnitude":0.99999994},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact519","Label":"[CD]","hasCustomLabel":false,"LabelId":0}},"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495":{"workflow_id":1,"active":false},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496":{"workflow_id":2,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497":{"workflow_id":4,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact498":{"workflow_id":5,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact499":{"workflow_id":6,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500":{"workflow_id":7,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501":{"workflow_id":8,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact502":{"workflow_id":9,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact503":{"workflow_id":10,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact504":{"workflow_id":11,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505":{"workflow_id":12,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact506":{"workflow_id":13,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507":{"workflow_id":14,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508":{"workflow_id":15,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact509":{"workflow_id":16,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact510":{"workflow_id":17,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact511":{"workflow_id":18,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact512":{"workflow_id":19,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact513":{"workflow_id":20,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact514":{"workflow_id":21,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact515":{"workflow_id":22,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact516":{"workflow_id":23,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact517":{"workflow_id":24,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact518":{"workflow_id":25,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact519":{"workflow_id":26,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","samestep":false,"steplink":1,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":3.008776900000157},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495","samestep":false,"steplink":2,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":5.677035600000181},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","samestep":false,"steplink":3,"creation":true,"gadget_rank":2,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494"],"GadgetTime":7.0711654000001549},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495","samestep":false,"steplink":4,"creation":false,"gadget_rank":3,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact495"],"GadgetTime":8.808116900000187},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497","samestep":false,"steplink":7,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494"],"GadgetTime":11.177055099999962},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact498","samestep":true,"steplink":4,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":[],"GadgetTime":11.177055099999962},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact499","samestep":true,"steplink":4,"creation":true,"gadget_rank":4,"scroll_label":null,"GadgetFlow":[],"GadgetTime":11.177055099999962},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","samestep":false,"steplink":12,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact497","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":23.427122900000087},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":23.427122900000087},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact502","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":23.427122900000087},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact503","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":23.427122900000087},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact504","samestep":true,"steplink":7,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":23.427122900000087},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","samestep":false,"steplink":14,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":[],"GadgetTime":28.380581500000063},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact506","samestep":true,"steplink":12,"creation":true,"gadget_rank":0,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501"],"GadgetTime":28.380581500000063},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","samestep":false,"steplink":19,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact501","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":32.632836000000228},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact508","samestep":true,"steplink":14,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":32.632836000000228},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact509","samestep":true,"steplink":14,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":32.632836000000228},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact510","samestep":true,"steplink":14,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":32.632836000000228},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact511","samestep":true,"steplink":14,"creation":true,"gadget_rank":7,"scroll_label":null,"GadgetFlow":[],"GadgetTime":32.632836000000228},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact512","samestep":false,"steplink":20,"creation":true,"gadget_rank":19,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":35.90645309999991},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact513","samestep":false,"steplink":21,"creation":true,"gadget_rank":19,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact494"],"GadgetTime":37.86789859999999},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact514","samestep":false,"steplink":22,"creation":true,"gadget_rank":19,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":40.42473289999998},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact515","samestep":false,"steplink":23,"creation":true,"gadget_rank":19,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact505"],"GadgetTime":42.320842300000098},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact516","samestep":false,"steplink":24,"creation":true,"gadget_rank":23,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact500","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":47.03315449999991},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact517","samestep":false,"steplink":25,"creation":true,"gadget_rank":23,"scroll_label":null,"GadgetFlow":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact507","http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact496"],"GadgetTime":51.29664619999994},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact518","samestep":false,"steplink":26,"creation":true,"gadget_rank":-1,"scroll_label":"OppositeLen","GadgetFlow":[],"GadgetTime":72.81315610000002},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory9?fact519","samestep":false,"steplink":27,"creation":true,"gadget_rank":-1,"scroll_label":"OppositeLen","GadgetFlow":[],"GadgetTime":96.97216720000006}],"marker":27,"worksteps":16,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":5,"UnusedLabelIds":[],"name":null,"path":null},"name":"TechDemo B_save_3","path":null}],"AllowedScrolls":["OppositeLen"],"AllowedGadgets":[{"s_type":"Pointer","Rank":1,"UiName":"Pointer","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":1,"MaterialIndx":0,"IgnoreLayerMask":{"value":24066},"SecondaryLayerMask":{"value":0}},{"s_type":"Tape","Rank":2,"UiName":"Tape","MaxRange":2.5,"MaxHeight":2.5,"ButtonIndx":2,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"AngleTool","Rank":3,"UiName":"Angle Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":3,"MaterialIndx":1,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"LineTool","Rank":4,"UiName":"Line Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":4,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":0}},{"s_type":"LotTool","Rank":5,"UiName":"Lot Tool","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":5,"MaterialIndx":0,"IgnoreLayerMask":{"value":86530},"SecondaryLayerMask":{"value":0}},{"s_type":"Pendulum","Rank":6,"UiName":"Pendulum","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":6,"MaterialIndx":0,"IgnoreLayerMask":{"value":96770},"SecondaryLayerMask":{"value":1}},{"s_type":"Remover","Rank":8,"UiName":"Delete Fact","MaxRange":"Infinity","MaxHeight":"Infinity","ButtonIndx":8,"MaterialIndx":0,"IgnoreLayerMask":{"value":115219},"SecondaryLayerMask":{"value":0}}],"name":"TechDemo B","path":null} \ No newline at end of file -- GitLab