diff --git a/Assets/InteractionEngine/FactSpawner.cs b/Assets/InteractionEngine/FactSpawner.cs
index 05a8229db1b77272cfd23e44900314267f5a0035..58b91125495b38328c455dd47d59c9a2bcb65991 100644
--- a/Assets/InteractionEngine/FactSpawner.cs
+++ b/Assets/InteractionEngine/FactSpawner.cs
@@ -171,10 +171,14 @@ public void SpawnAngle(AngleFact angleFact)
//string letter = ((Char)(64 + angleFact.Id + 1)).ToString();
//Don't need next line anymore: Cause Text is now not above, but in the centre of the angle
//angle.GetComponentInChildren<TextMeshPro>().transform.localPosition = new Vector3((0.5f * tempProjection).x, angle.GetComponentInChildren<TextMeshPro>().transform.localPosition.y, (0.5f * tempProjection).z);
- //Change Text not to the id, but to the angle-value
- angle.GetComponentInChildren<TextMeshPro>().text = Math.Abs(Math.Round(Vector3.Angle((point1-point2).normalized, (point3-point2).normalized), 1)).ToString() + "°";
- //Change font-size relative to length of the angle
- angle.GetComponentInChildren<TextMeshPro>().fontSize = angle.GetComponentInChildren<TextMeshPro>().fontSize * angle.transform.GetChild(0).transform.GetChild(0).localScale.x;
+
+ TextMeshPro[] texts = angle.GetComponentsInChildren<TextMeshPro>();
+ foreach (TextMeshPro t in texts) {
+ //Change Text not to the id, but to the angle-value (from both sides) AND change font-size relative to length of the angle (from both sides)
+ t.text = Math.Abs(Math.Round(Vector3.Angle((point1 - point2).normalized, (point3 - point2).normalized), 1)).ToString() + "°";
+ t.fontSize = angle.GetComponentInChildren<TextMeshPro>().fontSize * angle.transform.GetChild(0).transform.GetChild(0).localScale.x;
+ }
+
angle.GetComponentInChildren<FactObject>().Id = angleFact.Id;
//If a new Angle was spawned -> We are in CreateAngleMode -> Then we want the collider to be disabled
if (CommunicationEvents.ActiveToolMode != ToolMode.ExtraMode)
diff --git a/Assets/Materials/AngleMaterial.mat b/Assets/Materials/AngleMaterial.mat
index 08916143740fc60c108df8f6ac1b4ef2c681d6d1..64e3086fa97b9319f79006f8c85f76c3f99f865c 100644
--- a/Assets/Materials/AngleMaterial.mat
+++ b/Assets/Materials/AngleMaterial.mat
@@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: AngleMaterial
m_Shader: {fileID: 4800000, guid: 2649b895a4c22d649852a0ca4c825c74, type: 3}
- m_ShaderKeywords:
+ m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@@ -63,13 +63,13 @@ Material:
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- - _GlossyReflections: 1
+ - _GlossyReflections: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
+ - _SpecularHighlights: 0
- _SrcBlend: 1
- _Stencil: 0
- _StencilComp: 8
@@ -79,5 +79,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 0.990566, g: 0.97702986, b: 0, a: 0.84705883}
+ - _Color: {r: 0.9787419, g: 0.990566, b: 0.032707386, a: 0.84705883}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/AngleMaterial_Opaque.mat b/Assets/Materials/AngleMaterial_Opaque.mat
deleted file mode 100644
index 9bee389b3177223df58f9278a8ae6706f2b65d9e..0000000000000000000000000000000000000000
--- a/Assets/Materials/AngleMaterial_Opaque.mat
+++ /dev/null
@@ -1,77 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: AngleMaterial_Opaque
- m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords:
- 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_Floats:
- - _BumpScale: 1
- - _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
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 0.99215686, g: 0.9764706, b: 0, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/Materials/AngleMaterial_Opaque.mat.meta b/Assets/Materials/AngleMaterial_Opaque.mat.meta
deleted file mode 100644
index a14bca657fbf408e37e526d0799cda00aed6ce3b..0000000000000000000000000000000000000000
--- a/Assets/Materials/AngleMaterial_Opaque.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d796eeb0d5e0d4445b7929f07480301c
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 2100000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Prefabs/Angle.prefab b/Assets/Resources/Prefabs/Angle.prefab
index f5756542b7985dacdf7ec2c5ec13006a5bf31074..775219d3bcaad684fde81e6341d36c245842753c 100644
--- a/Assets/Resources/Prefabs/Angle.prefab
+++ b/Assets/Resources/Prefabs/Angle.prefab
@@ -1,5 +1,207 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1047820262597827614
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 776204628661091474}
+ - component: {fileID: 1611341617565119760}
+ - component: {fileID: 5847986162312327669}
+ - component: {fileID: 3727883962287805668}
+ - component: {fileID: 8678993674720081185}
+ m_Layer: 12
+ m_Name: AngleText_Back
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &776204628661091474
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047820262597827614}
+ 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: 1, y: 1, z: 0.25}
+ m_Children: []
+ m_Father: {fileID: 4650993679319476103}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.7, y: -1.5}
+ m_SizeDelta: {x: 1, y: 1}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!23 &1611341617565119760
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047820262597827614}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!33 &5847986162312327669
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047820262597827614}
+ m_Mesh: {fileID: 0}
+--- !u!222 &3727883962287805668
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047820262597827614}
+ m_CullTransparentMesh: 0
+--- !u!114 &8678993674720081185
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1047820262597827614}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_text: Test
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_outlineColor:
+ serializedVersion: 2
+ rgba: 4278190080
+ m_fontSize: 2
+ m_fontSizeBase: 2
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_textAlignment: 514
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_firstOverflowCharacterIndex: -1
+ m_linkedTextComponent: {fileID: 0}
+ m_isLinkedTextComponent: 0
+ m_isTextTruncated: 0
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 0
+ m_isCullingEnabled: 0
+ m_ignoreRectMaskCulling: 0
+ m_ignoreCulling: 1
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 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: 8678993674720081185}
+ characterCount: 4
+ 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_renderer: {fileID: 1611341617565119760}
+ m_subTextObjects:
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ - {fileID: 0}
+ m_maskType: 0
--- !u!1 &4650993678488610235
GameObject:
m_ObjectHideFlags: 0
@@ -117,7 +319,7 @@ GameObject:
m_Component:
- component: {fileID: 4650993679089994826}
m_Layer: 12
- m_Name: Angle
+ m_Name: Angle_Text_Front_Back
m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -168,6 +370,7 @@ Transform:
m_LocalScale: {x: 0.95, y: 0.5, z: 0.95}
m_Children:
- {fileID: 6834100498144429849}
+ - {fileID: 776204628661091474}
m_Father: {fileID: 4650993678488610234}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -229,7 +432,7 @@ GameObject:
- component: {fileID: 9133314279872122108}
- component: {fileID: 8080899974220995652}
- component: {fileID: 3620593617881097249}
- m_Layer: 0
+ m_Layer: 12
m_Name: AngleText_Front
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -354,8 +557,8 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 2.5
- m_fontSizeBase: 2.5
+ m_fontSize: 2
+ m_fontSizeBase: 2
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
diff --git a/Assets/Resources/Prefabs/Angle.prefab.meta b/Assets/Resources/Prefabs/Angle.prefab.meta
index 3b39ee59ff2259eeb51e29d3149715aba7fa5836..02d7146c99e19d500bcb751039db986a8d2d5a73 100644
--- a/Assets/Resources/Prefabs/Angle.prefab.meta
+++ b/Assets/Resources/Prefabs/Angle.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: c3c060066c8c5944ab98b4ba6521aeeb
+guid: 95bb89792d80420439f2fa54872220dc
PrefabImporter:
externalObjects: {}
userData:
diff --git a/Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab b/Assets/Resources/Prefabs/Angle_Text_Front.prefab
similarity index 67%
rename from Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab
rename to Assets/Resources/Prefabs/Angle_Text_Front.prefab
index 62e64b26507abfbe0e2e9b31b84dddace75d4322..f5756542b7985dacdf7ec2c5ec13006a5bf31074 100644
--- a/Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab
+++ b/Assets/Resources/Prefabs/Angle_Text_Front.prefab
@@ -1,207 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1047820262597827614
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 776204628661091474}
- - component: {fileID: 1611341617565119760}
- - component: {fileID: 5847986162312327669}
- - component: {fileID: 3727883962287805668}
- - component: {fileID: 8678993674720081185}
- m_Layer: 0
- m_Name: AngleText_Back
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &776204628661091474
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- 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: 1, y: 1, z: 0.25}
- m_Children: []
- m_Father: {fileID: 4650993679319476103}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.7, y: -1.5}
- m_SizeDelta: {x: 1, y: 1}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!23 &1611341617565119760
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
---- !u!33 &5847986162312327669
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- m_Mesh: {fileID: 0}
---- !u!222 &3727883962287805668
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- m_CullTransparentMesh: 0
---- !u!114 &8678993674720081185
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1047820262597827614}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_text: Test
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_outlineColor:
- serializedVersion: 2
- rgba: 4278190080
- m_fontSize: 2
- m_fontSizeBase: 2
- m_fontWeight: 400
- m_enableAutoSizing: 0
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_textAlignment: 514
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_firstOverflowCharacterIndex: -1
- m_linkedTextComponent: {fileID: 0}
- m_isLinkedTextComponent: 0
- m_isTextTruncated: 0
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 0
- m_isCullingEnabled: 0
- m_ignoreRectMaskCulling: 0
- m_ignoreCulling: 1
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 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: 8678993674720081185}
- characterCount: 4
- 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_renderer: {fileID: 1611341617565119760}
- m_subTextObjects:
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- - {fileID: 0}
- m_maskType: 0
--- !u!1 &4650993678488610235
GameObject:
m_ObjectHideFlags: 0
@@ -319,7 +117,7 @@ GameObject:
m_Component:
- component: {fileID: 4650993679089994826}
m_Layer: 12
- m_Name: Angle_Text_Front_Back
+ m_Name: Angle
m_TagString: Selectable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -370,7 +168,6 @@ Transform:
m_LocalScale: {x: 0.95, y: 0.5, z: 0.95}
m_Children:
- {fileID: 6834100498144429849}
- - {fileID: 776204628661091474}
m_Father: {fileID: 4650993678488610234}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -399,7 +196,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2100000, guid: d796eeb0d5e0d4445b7929f07480301c, type: 2}
+ - {fileID: 2100000, guid: d24faa9ba77ab91459039238ad17d83c, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -557,8 +354,8 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 2
- m_fontSizeBase: 2
+ m_fontSize: 2.5
+ m_fontSizeBase: 2.5
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
diff --git a/Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab.meta b/Assets/Resources/Prefabs/Angle_Text_Front.prefab.meta
similarity index 74%
rename from Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab.meta
rename to Assets/Resources/Prefabs/Angle_Text_Front.prefab.meta
index 02d7146c99e19d500bcb751039db986a8d2d5a73..3b39ee59ff2259eeb51e29d3149715aba7fa5836 100644
--- a/Assets/Resources/Prefabs/Angle_Text_Front_Back.prefab.meta
+++ b/Assets/Resources/Prefabs/Angle_Text_Front.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 95bb89792d80420439f2fa54872220dc
+guid: c3c060066c8c5944ab98b4ba6521aeeb
PrefabImporter:
externalObjects: {}
userData: