refactor: Update Unity to 2022.3.62

2025-06-30 16:04:04 +08:00
parent 4758b65159
commit 44a72d1a8f
329 changed files with 4201 additions and 100185 deletions
--- a/Assets/Cryville.Common/Cryville.Common.asmdef
+++ b/Assets/Cryville.Common/Cryville.Common.asmdef
@@ -2,7 +2,7 @@
    "name": "Cryville.Common",
    "rootNamespace": "",
    "references": [
-        "GUID:da293eebbcb9a4947a212534c52d1a32"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/Cryville.Common/Unity/UI/TMPLocalizedText.cs
+++ b/Assets/Cryville.Common/Unity/UI/TMPLocalizedText.cs
@@ -6,8 +6,9 @@ using System.Globalization;
 using System.Reflection;
 using TMPro;
 using UnityEngine;
+using UnityEngine.TextCore;
 using UnityEngine.TextCore.LowLevel;
-using UnityEngine.TextCore.Text;
+using AtlasPopulationMode = TMPro.AtlasPopulationMode;

 namespace Cryville.Common.Unity.UI {
 	[RequireComponent(typeof(TMP_Text))]
@@ -16,7 +17,7 @@ namespace Cryville.Common.Unity.UI {
 		public static FontMatcher FontMatcher;
 		public static int MaxFallbackCount = 4;

-		static readonly Dictionary<CultureInfo, FontAsset> _cachedFonts = new();
+		static readonly Dictionary<CultureInfo, TMP_FontAsset> _cachedFonts = new();

 		[SerializeField]
 		Shader m_shader;
@@ -46,7 +47,7 @@ namespace Cryville.Common.Unity.UI {
 							if (MaxFallbackCount <= 0) break;
 						}
 						else {
-							font.fallbackFontAssetTable ??= new List<FontAsset>();
+							font.fallbackFontAssetTable ??= new List<TMP_FontAsset>();
 							font.fallbackFontAssetTable.Add(ifont);
 							if (font.fallbackFontAssetTable.Count >= MaxFallbackCount) break;
 						}
@@ -58,23 +59,93 @@ namespace Cryville.Common.Unity.UI {
 			Text.font = font;
 		}

-		static MethodInfo _methodCreateFontAsset;
-		static readonly object[] _paramsCreateFontAsset = new object[] { null, null, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, Type.Missing, Type.Missing };
-		static FontAsset CreateFontAsset(string path, int index) {
-			if (_methodCreateFontAsset == null) {
-				_methodCreateFontAsset = typeof(FontAsset).GetMethod(
-					"CreateFontAsset", BindingFlags.Static | BindingFlags.NonPublic, null,
-					new Type[] {
-						typeof(string), typeof(int), typeof(int), typeof(int),
-						typeof(GlyphRenderMode), typeof(int), typeof(int),
-						typeof(AtlasPopulationMode), typeof(bool)
-					},
-					null
-				);
+		static TMP_FontAsset CreateFontAsset(string path, int index) => CreateFontAsset(path, index, 90, 9, GlyphRenderMode.SDFAA, 1024, 1024, AtlasPopulationMode.Dynamic);
+
+		static readonly Lazy<FieldInfo> _f_m_Version = new(() => typeof(TMP_FontAsset).GetField("m_Version", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasWidth = new(() => typeof(TMP_FontAsset).GetProperty("atlasWidth", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasHeight = new(() => typeof(TMP_FontAsset).GetProperty("atlasHeight", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasPadding = new(() => typeof(TMP_FontAsset).GetProperty("atlasPadding", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_atlasRenderMode = new(() => typeof(TMP_FontAsset).GetProperty("atlasRenderMode", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_freeGlyphRects = new(() => typeof(TMP_FontAsset).GetProperty("freeGlyphRects", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_usedGlyphRects = new(() => typeof(TMP_FontAsset).GetProperty("usedGlyphRects", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic));
+
+		static readonly Lazy<PropertyInfo> _p_ShaderRef_MobileBitmap = new(() => typeof(ShaderUtilities).GetProperty("ShaderRef_MobileBitmap", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic));
+		static readonly Lazy<PropertyInfo> _p_ShaderRef_MobileSDF = new(() => typeof(ShaderUtilities).GetProperty("ShaderRef_MobileSDF", BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic));
+
+		public static TMP_FontAsset CreateFontAsset(string path, int faceIndex, int samplingPointSize, int atlasPadding, GlyphRenderMode renderMode, int atlasWidth, int atlasHeight, AtlasPopulationMode atlasPopulationMode = AtlasPopulationMode.Dynamic, bool enableMultiAtlasSupport = true) {
+			// Initialize FontEngine
+			FontEngine.InitializeFontEngine();
+
+			// Load Font Face
+			if (FontEngine.LoadFontFace(path, samplingPointSize, faceIndex) != FontEngineError.Success) {
+				Debug.LogWarning("Unable to load font face at path " + path);
+				return null;
 			}
-			_paramsCreateFontAsset[0] = path;
-			_paramsCreateFontAsset[1] = index;
-			return (FontAsset)_methodCreateFontAsset.Invoke(null, _paramsCreateFontAsset);
+
+			// Create new font asset
+			TMP_FontAsset fontAsset = ScriptableObject.CreateInstance<TMP_FontAsset>();
+
+			_f_m_Version.Value.SetValue(fontAsset, "1.1.0");
+			fontAsset.faceInfo = FontEngine.GetFaceInfo();
+
+			fontAsset.atlasPopulationMode = atlasPopulationMode;
+
+			_p_atlasWidth.Value.SetValue(fontAsset, atlasWidth);
+			_p_atlasHeight.Value.SetValue(fontAsset, atlasHeight);
+			_p_atlasPadding.Value.SetValue(fontAsset, atlasPadding);
+			_p_atlasRenderMode.Value.SetValue(fontAsset, renderMode);
+
+			// Initialize array for the font atlas textures.
+			fontAsset.atlasTextures = new Texture2D[1];
+
+			// Create and add font atlas texture.
+			var texture = new Texture2D(0, 0, TextureFormat.Alpha8, false);
+			fontAsset.atlasTextures[0] = texture;
+
+			fontAsset.isMultiAtlasTexturesEnabled = enableMultiAtlasSupport;
+
+			// Add free rectangle of the size of the texture.
+			int packingModifier;
+			if (((int)renderMode & 0x10) != 0) {
+				packingModifier = 0;
+
+				// Optimize by adding static ref to shader.
+				var tmp_material = new Material((Shader)_p_ShaderRef_MobileBitmap.Value.GetValue(null));
+
+				//tmp_material.name = texture.name + " Material";
+				tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
+
+				fontAsset.material = tmp_material;
+			}
+			else {
+				packingModifier = 1;
+
+				// Optimize by adding static ref to shader.
+				var tmp_material = new Material((Shader)_p_ShaderRef_MobileSDF.Value.GetValue(null));
+
+				//tmp_material.name = texture.name + " Material";
+				tmp_material.SetTexture(ShaderUtilities.ID_MainTex, texture);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureWidth, atlasWidth);
+				tmp_material.SetFloat(ShaderUtilities.ID_TextureHeight, atlasHeight);
+
+				tmp_material.SetFloat(ShaderUtilities.ID_GradientScale, atlasPadding + packingModifier);
+
+				tmp_material.SetFloat(ShaderUtilities.ID_WeightNormal, fontAsset.normalStyle);
+				tmp_material.SetFloat(ShaderUtilities.ID_WeightBold, fontAsset.boldStyle);
+
+				fontAsset.material = tmp_material;
+			}
+
+			_p_freeGlyphRects.Value.SetValue(fontAsset, new List<GlyphRect>(8) { new(0, 0, atlasWidth - packingModifier, atlasHeight - packingModifier) });
+			_p_usedGlyphRects.Value.SetValue(fontAsset, new List<GlyphRect>(8));
+
+			// TODO: Consider adding support for extracting glyph positioning data
+
+			fontAsset.ReadFontAssetDefinition();
+
+			return fontAsset;
 		}
 	}
 }
--- a/Assets/Cryville.EEW.Unity/Cryville.EEW.Unity.asmdef
+++ b/Assets/Cryville.EEW.Unity/Cryville.EEW.Unity.asmdef
@@ -5,7 +5,7 @@
        "GUID:b92f9c7ac10b1c04e86fc48210f62ab1",
        "GUID:1e0937e40dadba24a97b7342c4559580",
        "GUID:e5b7e7f40a80a814ba706299d68f9213",
-        "GUID:da293eebbcb9a4947a212534c52d1a32"
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],
--- a/Assets/Main.unity
+++ b/Assets/Main.unity
--- a/Assets/Prefabs/MapElements/LabeledPoint.prefab
+++ b/Assets/Prefabs/MapElements/LabeledPoint.prefab
@@ -25,6 +25,7 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 314817003022633517}
+  serializedVersion: 2
  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}
@@ -32,7 +33,6 @@ Transform:
  m_Children:
  - {fileID: 5835740329156370247}
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &3466321595658153065
 SpriteRenderer:
@@ -102,7 +102,7 @@ MonoBehaviour:
  m_material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
  m_sprite: {fileID: 21300000, guid: 6fd7ea081adb0004a989c2e841e4cf34, type: 3}
  m_spriteArea: {fileID: 21300000, guid: ff05af16f0aa0464fb8ce6255a8bcbde, type: 3}
-  m_textMesh: {fileID: 8492560861778078080}
+  m_textMesh: {fileID: 2943969175049193218}
  m_text: 
  m_color: {r: 1, g: 1, b: 1, a: 1}
  m_textColor: {r: 0, g: 0, b: 0, a: 1}
@@ -116,7 +116,7 @@ GameObject:
  m_Component:
  - component: {fileID: 5835740329156370247}
  - component: {fileID: 7081374813375499800}
-  - component: {fileID: 8492560861778078080}
+  - component: {fileID: 2943969175049193218}
  m_Layer: 0
  m_Name: Text
  m_TagString: Untagged
@@ -137,7 +137,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3836035813174775836}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@@ -164,7 +163,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  - {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -186,7 +185,7 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &8492560861778078080
+--- !u!114 &2943969175049193218
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -195,7 +194,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 3168339112987716420}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35fd352f36a42a74e9f2d44b7fc67bdf, type: 3}
+  m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@@ -208,8 +207,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: 
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@@ -249,7 +248,7 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
--- a/Assets/Prefabs/MapElements/Point.prefab
+++ b/Assets/Prefabs/MapElements/Point.prefab
@@ -1,177 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1 &184933130346846969
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8761057050648440570}
-  - component: {fileID: 5417593746151227301}
-  - component: {fileID: 6679562870913980477}
-  m_Layer: 0
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &8761057050648440570
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  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: 2041650355143975329}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0.8, y: 0.6}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &5417593746151227301
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  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
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &6679562870913980477
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 184933130346846969}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35fd352f36a42a74e9f2d44b7fc67bdf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  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:
-      m_Calls: []
-  m_text: 
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, 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_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 6
-  m_fontSizeBase: 6
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 0
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  _SortingLayer: 0
-  _SortingLayerID: 0
-  _SortingOrder: 0
-  m_hasFontAssetChanged: 0
-  m_renderer: {fileID: 5417593746151227301}
-  m_maskType: 0
 --- !u!1 &3258148121682082704
 GameObject:
  m_ObjectHideFlags: 0
@@ -197,14 +25,13 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3258148121682082704}
+  serializedVersion: 2
  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: 8761057050648440570}
+  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1834065869972807124
 SpriteRenderer:
--- a/Assets/Prefabs/UI/Event
+++ b/Assets/Prefabs/UI/Event
--- a/Assets/Prefabs/UI/Event
+++ b/Assets/Prefabs/UI/Event
@@ -29,7 +29,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 7245722805295636248}
-  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -71,7 +70,6 @@ RectTransform:
  m_Children:
  - {fileID: 7245722804793660640}
  m_Father: {fileID: 7245722805295636248}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -230,7 +228,6 @@ RectTransform:
  m_Children:
  - {fileID: 7245722803986725359}
  m_Father: {fileID: 7245722804793660640}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -352,7 +349,6 @@ RectTransform:
  m_Children:
  - {fileID: 7245722804771600193}
  m_Father: {fileID: 7245722803680943975}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -433,7 +429,7 @@ GameObject:
  m_Component:
  - component: {fileID: 7245722804771600193}
  - component: {fileID: 7245722804771600199}
-  - component: {fileID: 7245722804771600198}
+  - component: {fileID: 865413950520411596}
  - component: {fileID: 7245722804771600196}
  m_Layer: 5
  m_Name: Text
@@ -455,7 +451,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 7245722803986725359}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -470,7 +465,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7245722804771600192}
  m_CullTransparentMesh: 1
--- !u!114 &7245722804771600198
+--- !u!114 &865413950520411596
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -479,7 +474,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 7245722804771600192}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@@ -492,8 +487,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Title  Location
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6368f7bc44d26f346a4682281270a0f0, type: 2}
+  m_sharedMaterial: {fileID: 9205331132965503640, guid: 6368f7bc44d26f346a4682281270a0f0, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@@ -521,8 +516,8 @@ MonoBehaviour:
  m_fontSizeBase: 14
  m_fontWeight: 400
  m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
  m_fontStyle: 0
  m_HorizontalAlignment: 1
  m_VerticalAlignment: 512
@@ -533,7 +528,7 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 0
+  m_enableWordWrapping: 0
  m_wordWrappingRatios: 0.4
  m_overflowMode: 1
  m_linkedTextComponent: {fileID: 0}
@@ -607,7 +602,6 @@ RectTransform:
  m_Children:
  - {fileID: 7245722803680943975}
  m_Father: {fileID: 3660102970111463108}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -742,7 +736,6 @@ RectTransform:
  - {fileID: 3660102970111463108}
  - {fileID: 6698345396572408384}
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
--- a/Assets/Prefabs/UI/Event
+++ b/Assets/Prefabs/UI/Event
--- a/Assets/Prefabs/UI/Event.prefab
+++ b/Assets/Prefabs/UI/Event.prefab
--- a/Assets/Prefabs/UI/Property.prefab
+++ b/Assets/Prefabs/UI/Property.prefab
@@ -10,7 +10,7 @@ GameObject:
  m_Component:
  - component: {fileID: 5569359501729395037}
  - component: {fileID: 5569359501729395039}
-  - component: {fileID: 5569359501729395036}
+  - component: {fileID: 3443541259058308425}
  - component: {fileID: 8105243158765966554}
  - component: {fileID: -3940543153975910597}
  m_Layer: 5
@@ -33,7 +33,6 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
@@ -48,7 +47,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5569359501729395026}
  m_CullTransparentMesh: 1
--- !u!114 &5569359501729395036
+--- !u!114 &3443541259058308425
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -57,7 +56,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 5569359501729395026}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83e7715acbfae1d4b84414c13d03ed3f, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
@@ -70,8 +69,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Key 1.0
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
-  m_sharedMaterial: {fileID: -3021868053195457599, guid: 2b12354fb2d86744887c3e4bfee63986, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 43806d535501e38458454007849d98a5, type: 2}
+  m_sharedMaterial: {fileID: 2032012751209664223, guid: 43806d535501e38458454007849d98a5, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@@ -99,8 +98,8 @@ MonoBehaviour:
  m_fontSizeBase: 12
  m_fontWeight: 400
  m_enableAutoSizing: 0
-  m_fontSizeMin: 0
-  m_fontSizeMax: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
  m_fontStyle: 0
  m_HorizontalAlignment: 1
  m_VerticalAlignment: 256
@@ -111,7 +110,7 @@ MonoBehaviour:
  m_lineSpacingMax: 0
  m_paragraphSpacing: 0
  m_charWidthMaxAdj: 0
-  m_TextWrappingMode: 1
+  m_enableWordWrapping: 1
  m_wordWrappingRatios: 0.4
  m_overflowMode: 0
  m_linkedTextComponent: {fileID: 0}
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f392c542024420b42905557893d859b1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Pro/Fonts/NotoSans-VariableFont_wdth,wght
+++ b/Pro/Fonts/NotoSans-VariableFont_wdth,wght
@@ -1,258 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &-3021868053195457599
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght Atlas Material
-  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, 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}
-    - _Cube:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _FaceTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 4318944087442446991}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OutlineTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _Ambient: 0.5
-    - _Bevel: 0.5
-    - _BevelClamp: 0
-    - _BevelOffset: 0
-    - _BevelRoundness: 0
-    - _BevelWidth: 0
-    - _BumpFace: 0
-    - _BumpOutline: 0
-    - _ColorMask: 15
-    - _CullMode: 0
-    - _Diffuse: 0.5
-    - _FaceDilate: 0
-    - _FaceUVSpeedX: 0
-    - _FaceUVSpeedY: 0
-    - _GlowInner: 0.05
-    - _GlowOffset: 0
-    - _GlowOuter: 0.05
-    - _GlowPower: 0.75
-    - _GradientScale: 10
-    - _LightAngle: 3.1416
-    - _MaskSoftnessX: 0
-    - _MaskSoftnessY: 0
-    - _OutlineSoftness: 0
-    - _OutlineUVSpeedX: 0
-    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0
-    - _PerspectiveFilter: 0.875
-    - _Reflectivity: 10
-    - _ScaleRatioA: 0.9
-    - _ScaleRatioB: 0.73125
-    - _ScaleRatioC: 0.73125
-    - _ScaleX: 1
-    - _ScaleY: 1
-    - _ShaderFlags: 0
-    - _Sharpness: 0
-    - _SpecularPower: 2
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _TextureHeight: 1024
-    - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
-    - _UnderlaySoftness: 0
-    - _VertexOffsetX: 0
-    - _VertexOffsetY: 0
-    - _WeightBold: 0.75
-    - _WeightNormal: 0
-    m_Colors:
-    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
-    - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0}
-    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
-    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
-    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
-    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
-    - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_BuildTextureStacks: []
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 19001, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght SDF
-  m_EditorClassIdentifier: 
-  m_Version: 1.1.0
-  m_Material: {fileID: -3021868053195457599}
-  m_SourceFontFileGUID: 35400ee909f32d94f9901006d051135c
-  m_SourceFontFile: {fileID: 12800000, guid: 35400ee909f32d94f9901006d051135c, type: 3}
-  m_AtlasPopulationMode: 1
-  InternalDynamicOS: 0
-  m_FaceInfo:
-    m_FaceIndex: 0
-    m_FamilyName: Noto Sans
-    m_StyleName: Regular
-    m_PointSize: 90
-    m_Scale: 1
-    m_UnitsPerEM: 1000
-    m_LineHeight: 122.58
-    m_AscentLine: 96.21001
-    m_CapLine: 65
-    m_MeanLine: 49
-    m_Baseline: 0
-    m_DescentLine: -26.37
-    m_SuperscriptOffset: 96.21001
-    m_SuperscriptSize: 0.5
-    m_SubscriptOffset: -26.37
-    m_SubscriptSize: 0.5
-    m_UnderlineOffset: -11.25
-    m_UnderlineThickness: 4.5
-    m_StrikethroughOffset: 19.6
-    m_StrikethroughThickness: 4.5
-    m_TabWidth: 23
-  m_FontWeightTable:
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  - regularTypeface: {fileID: 0}
-    italicTypeface: {fileID: 0}
-  m_GlyphTable: []
-  m_CharacterTable: []
-  m_AtlasTextures:
-  - {fileID: 4318944087442446991}
-  m_AtlasTextureIndex: 0
-  m_IsMultiAtlasTexturesEnabled: 0
-  m_ClearDynamicDataOnBuild: 1
-  m_AtlasWidth: 1024
-  m_AtlasHeight: 1024
-  m_AtlasPadding: 9
-  m_AtlasRenderMode: 4165
-  m_UsedGlyphRects: []
-  m_FreeGlyphRects:
-  - m_X: 0
-    m_Y: 0
-    m_Width: 1023
-    m_Height: 1023
-  m_FontFeatureTable:
-    m_GlyphPairAdjustmentRecords: []
-  m_FallbackFontAssetTable: []
-  m_fontAssetCreationEditorSettings:
-    sourceFontFileGUID: 35400ee909f32d94f9901006d051135c
-    faceIndex: 0
-    pointSizeSamplingMode: 0
-    pointSize: 90
-    padding: 9
-    packingMode: 0
-    atlasWidth: 1024
-    atlasHeight: 1024
-    characterSetSelectionMode: 7
-    characterSequence: 
-    referencedFontAssetGUID: 
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4165
-    includeFontFeatures: 0
-  m_RegularStyleWeight: 0
-  m_RegularStyleSpacing: 0
-  m_BoldStyleWeight: 0.75
-  m_BoldStyleSpacing: 7
-  m_ItalicStyleSlant: 35
-  m_TabMultiple: 10
--- !u!28 &4318944087442446991
-Texture2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: NotoSans-VariableFont_wdth,wght Atlas
-  m_ImageContentsHash:
-    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
-  m_IsAlphaChannelOptional: 0
-  serializedVersion: 2
-  m_Width: 0
-  m_Height: 0
-  m_CompleteImageSize: 0
-  m_MipsStripped: 0
-  m_TextureFormat: 1
-  m_MipCount: 1
-  m_IsReadable: 1
-  m_IsPreProcessed: 0
-  m_IgnoreMasterTextureLimit: 0
-  m_StreamingMipmaps: 0
-  m_StreamingMipmapsPriority: 0
-  m_VTOnly: 0
-  m_AlphaIsTransparency: 0
-  m_ImageCount: 1
-  m_TextureDimension: 2
-  m_TextureSettings:
-    serializedVersion: 2
-    m_FilterMode: 1
-    m_Aniso: 1
-    m_MipBias: 0
-    m_WrapU: 0
-    m_WrapV: 0
-    m_WrapW: 0
-  m_LightmapFormat: 0
-  m_ColorSpace: 0
-  m_PlatformBlob: 
-  image data: 0
-  _typelessdata: 
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
--- a/Pro/Shaders/SDFFunctions.hlsl
+++ b/Pro/Shaders/SDFFunctions.hlsl
@@ -1,178 +0,0 @@
-float2 UnpackUV(float uv)
-{
-	float2 output;
-	output.x = floor(uv / 4096.0);
-	output.y = uv - 4096.0 * output.x;
-
-	return output * 0.001953125;
-}
-
-float4 BlendARGB(float4 overlying, float4 underlying)
-{
-	overlying.rgb *= overlying.a;
-	underlying.rgb *= underlying.a;
-	float3 blended = overlying.rgb + ((1 - overlying.a) * underlying.rgb);
-	float alpha = underlying.a + (1 - underlying.a) * overlying.a;
-	return float4(blended / alpha, alpha);
-}
-
-float3 GetSpecular(float3 n, float3 l)
-{
-	float spec = pow(max(0.0, dot(n, l)), _Reflectivity);
-	return _SpecularColor.rgb * spec * _SpecularPower;
-}
-
-void GetSurfaceNormal_float(texture2D atlas, float textureWidth, float textureHeight, float2 uv, bool isFront, out float3 nornmal)
-{
-	float3 delta = float3(1.0 / textureWidth, 1.0 / textureHeight, 0.0);
-
-	// Read "height field"
-	float4 h = float4(
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.xz).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.xz).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv - delta.zy).a,
-		SAMPLE_TEXTURE2D(atlas, SamplerState_Linear_Clamp, uv + delta.zy).a);
-
-	bool raisedBevel = _BevelType;
-
-	h += _BevelOffset;
-
-	float bevelWidth = max(.01, _BevelWidth);
-
-	// Track outline
-	h -= .5;
-	h /= bevelWidth;
-	h = saturate(h + .5);
-
-	if (raisedBevel) h = 1 - abs(h * 2.0 - 1.0);
-	h = lerp(h, sin(h * 3.141592 / 2.0), float4(_BevelRoundness, _BevelRoundness, _BevelRoundness, _BevelRoundness));
-	h = min(h, 1.0 - float4(_BevelClamp, _BevelClamp, _BevelClamp, _BevelClamp));
-	h *= _BevelAmount * bevelWidth * _GradientScale * -2.0;
-
-	float3 va = normalize(float3(-1.0, 0.0, h.y - h.x));
-	float3 vb = normalize(float3(0.0, 1.0, h.w - h.z));
-
-	float3 f = float3(1, 1, 1);
-	if (isFront) f = float3(1, 1, -1);
-	nornmal = cross(va, vb) * f;
-}
-
-void EvaluateLight_float(float4 faceColor, float3 n, out float4 color)
-{
-	n.z = abs(n.z);
-	float3 light = normalize(float3(sin(_LightAngle), cos(_LightAngle), 1.0));
-
-	float3 col = max(faceColor.rgb, 0) + GetSpecular(n, light)* faceColor.a;
-	//faceColor.rgb += col * faceColor.a;
-	col *= 1 - (dot(n, light) * _Diffuse);
-	col *= lerp(_Ambient, 1, n.z * n.z);
-
-	//fixed4 reflcol = texCUBE(_Cube, reflect(input.viewDir, -n));
-	//faceColor.rgb += reflcol.rgb * lerp(_ReflectFaceColor.rgb, _ReflectOutlineColor.rgb, saturate(sd + outline * 0.5)) * faceColor.a;
-
-	color = float4(col, faceColor.a);
-}
-
-// Add custom function to handle time in HDRP
-
-
-//
-void GenerateUV_float(float2 inUV, float4 transform, float2 animSpeed, out float2 outUV)
-{
-	outUV = inUV * transform.xy + transform.zw + (animSpeed * _Time.y);
-}
-
-void ComputeUVOffset_float(float texWidth, float texHeight, float2 offset, float SDR, out float2 uvOffset)
-{
-	uvOffset = float2(-offset.x * SDR / texWidth, -offset.y * SDR / texHeight);
-}
-
-void ScreenSpaceRatio2_float(float4x4 projection, float4 position, float2 objectScale, float screenWidth, float screenHeight, float fontScale, out float SSR)
-{
-	float2 pixelSize = position.w;
-	pixelSize /= (objectScale * mul((float2x2)projection, float2(screenWidth, screenHeight)));
-	SSR = rsqrt(dot(pixelSize, pixelSize)*2) * fontScale;
-}
-
-// UV			: Texture coordinate of the source distance field texture
-// TextureSize	: Size of the source distance field texture
-// Filter		: Enable perspective filter (soften)
-void ScreenSpaceRatio_float(float2 UV, float TextureSize, bool Filter, out float SSR)
-{
-	if(Filter)
-	{
-		float2 a = float2(ddx(UV.x), ddy(UV.x));
-		float2 b = float2(ddx(UV.y), ddy(UV.y));
-		float s = lerp(dot(a,a), dot(b,b), 0.5);
-		SSR = rsqrt(s) / TextureSize;
-	}
-	else
-	{
-		float s = rsqrt(abs(ddx(UV.x) * ddy(UV.y) - ddy(UV.x) * ddx(UV.y)));
-		SSR = s / TextureSize;
-	}
-}
-
-// SSR : Screen Space Ratio
-// SD  : Signed Distance (encoded : Distance / SDR + .5)
-// SDR : Signed Distance Ratio
-//
-// IsoPerimeter : Dilate / Contract the shape
-void ComputeSDF_float(float SSR, float SD, float SDR, float isoPerimeter, float softness, out float outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5) * SDR;																				// Signed distance to edge, in Texture space
-	outAlpha = saturate((d * 2.0 * SSR + 0.5 + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));	// Screen pixel coverage (alpha)
-}
-
-void ComputeSDF2_float(float SSR, float SD, float SDR, float2 isoPerimeter, float2 softness, out float2 outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5f) * SDR;
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void ComputeSDF4_float(float SSR, float SD, float SDR, float4 isoPerimeter, float4 softness, out float4 outAlpha)
-{
-	softness *= SSR * SDR;
-	float d = (SD - 0.5f) * SDR;
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void ComputeSDF44_float(float SSR, float4 SD, float SDR, float4 isoPerimeter, float4 softness, bool outline, out float4 outAlpha)
-{
-	softness *= SSR * SDR;
-	float4 d = (SD - 0.5f) * SDR;
-	if(outline) d.w = max(max(d.x, d.y), d.z);
-	outAlpha = saturate((d * 2.0f * SSR + 0.5f + isoPerimeter * SDR * SSR + softness * 0.5) / (1.0 + softness));
-}
-
-void Composite_float(float4 overlying, float4 underlying, out float4 outColor)
-{
-	outColor = BlendARGB(overlying, underlying);
-}
-
-// Face only
-void Layer1_float(float alpha, float4 color0, out float4 outColor)
-{
-	color0.a *= alpha;
-	outColor = color0;
-}
-
-// Face + 1 Outline
-void Layer2_float(float2 alpha, float4 color0, float4 color1, out float4 outColor)
-{
-	color1.a *= alpha.y;
-	color0.rgb *= color0.a; color1.rgb *= color1.a;
-	outColor = lerp(color1, color0, alpha.x);
-	outColor.rgb /= outColor.a;
-}
-
-// Face + 3 Outline
-void Layer4_float(float4 alpha, float4 color0, float4 color1, float4 color2, float4 color3, out float4 outColor)
-{
-	color3.a *= alpha.w;
-	color0.rgb *= color0.a; color1.rgb *= color1.a; color2.rgb *= color2.a; color3.rgb *= color3.a;
-	outColor = lerp(lerp(lerp(color3, color2, alpha.z), color1, alpha.y), color0, alpha.x);
-	outColor.rgb /= outColor.a;
-}
--- a/Pro/Shaders/SDFFunctions.hlsl.meta
+++ b/Pro/Shaders/SDFFunctions.hlsl.meta
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 96de908384869cd409c75efa351d5edf
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  preprocessorOverride: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: ca2ed216f98028c4dae6c5224a952b3c
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: f63d574838ccfb44f84acc05fed0af48
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: a3d800b099a06e0478fb790c5e79057a
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
--- a/Assets/Resources/TextMesh
+++ b/Assets/Resources/TextMesh
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 124c112a6e8f1a54e8b0870e881b56d8
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Pro/Shaders/TMPro_Properties.cginc
+++ b/Pro/Shaders/TMPro_Properties.cginc
@@ -1,80 +0,0 @@
-// UI Editable properties
-uniform sampler2D	_FaceTex;					// Alpha : Signed Distance
-uniform float		_FaceUVSpeedX;
-uniform float		_FaceUVSpeedY;
-uniform fixed4		_FaceColor;					// RGBA : Color + Opacity
-uniform float		_FaceDilate;				// v[ 0, 1]
-uniform float		_OutlineSoftness;			// v[ 0, 1]
-
-uniform sampler2D	_OutlineTex;				// RGBA : Color + Opacity
-uniform float		_OutlineUVSpeedX;
-uniform float		_OutlineUVSpeedY;
-uniform fixed4		_OutlineColor;				// RGBA : Color + Opacity
-uniform float		_OutlineWidth;				// v[ 0, 1]
-
-uniform float		_Bevel;						// v[ 0, 1]
-uniform float		_BevelOffset;				// v[-1, 1]
-uniform float		_BevelWidth;				// v[-1, 1]
-uniform float		_BevelClamp;				// v[ 0, 1]
-uniform float		_BevelRoundness;			// v[ 0, 1]
-
-uniform sampler2D	_BumpMap;					// Normal map
-uniform float		_BumpOutline;				// v[ 0, 1]
-uniform float		_BumpFace;					// v[ 0, 1]
-
-uniform samplerCUBE	_Cube;						// Cube / sphere map
-uniform fixed4 		_ReflectFaceColor;			// RGB intensity
-uniform fixed4		_ReflectOutlineColor;
-//uniform float		_EnvTiltX;					// v[-1, 1]
-//uniform float		_EnvTiltY;					// v[-1, 1]
-uniform float3      _EnvMatrixRotation;
-uniform float4x4	_EnvMatrix;
-
-uniform fixed4		_SpecularColor;				// RGB intensity
-uniform float		_LightAngle;				// v[ 0,Tau]
-uniform float		_SpecularPower;				// v[ 0, 1]
-uniform float		_Reflectivity;				// v[ 5, 15]
-uniform float		_Diffuse;					// v[ 0, 1]
-uniform float		_Ambient;					// v[ 0, 1]
-
-uniform fixed4		_UnderlayColor;				// RGBA : Color + Opacity
-uniform float		_UnderlayOffsetX;			// v[-1, 1]
-uniform float		_UnderlayOffsetY;			// v[-1, 1]
-uniform float		_UnderlayDilate;			// v[-1, 1]
-uniform float		_UnderlaySoftness;			// v[ 0, 1]
-
-uniform fixed4 		_GlowColor;					// RGBA : Color + Intesity
-uniform float 		_GlowOffset;				// v[-1, 1]
-uniform float 		_GlowOuter;					// v[ 0, 1]
-uniform float 		_GlowInner;					// v[ 0, 1]
-uniform float 		_GlowPower;					// v[ 1, 1/(1+4*4)]
-
-// API Editable properties
-uniform float 		_ShaderFlags;
-uniform float		_WeightNormal;
-uniform float		_WeightBold;
-
-uniform float		_ScaleRatioA;
-uniform float		_ScaleRatioB;
-uniform float		_ScaleRatioC;
-
-uniform float		_VertexOffsetX;
-uniform float		_VertexOffsetY;
-
-//uniform float		_UseClipRect;
-uniform float		_MaskID;
-uniform sampler2D	_MaskTex;
-uniform float4		_MaskCoord;
-uniform float4		_ClipRect;	// bottom left(x,y) : top right(z,w)
-uniform float		_MaskSoftnessX;
-uniform float		_MaskSoftnessY;
-
-// Font Atlas properties
-uniform sampler2D	_MainTex;
-uniform float		_TextureWidth;
-uniform float		_TextureHeight;
-uniform float 		_GradientScale;
-uniform float		_ScaleX;
-uniform float		_ScaleY;
-uniform float		_PerspectiveFilter;
-uniform float		_Sharpness;
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1eb3a3a1f4cda344f849e6ba47430c17
+guid: f54d1bd14bd3ca042bd867b519fee8cc
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fa01d66f44e9d4a42ae8ca989003a496
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,3 +0,0 @@
-*** DO NOT REMOVE THIS FILE ***
-
-// This is a special file to control automatic GUID remapping of TMP resources such as <TMP_FontAsset> to the Unity internal <FontAsset> type.
--- a/CONVERT.json.meta
+++ b/CONVERT.json.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2ade62400bece1a4f9093a91ca22b276
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Resources/Gizmos/TMP
+++ b/Resources/Gizmos/TMP
--- a/Resources/Gizmos/TMP
+++ b/Resources/Gizmos/TMP
@@ -1,143 +0,0 @@
-fileFormatVersion: 2
-guid: be1dd4c785e3be14fb0a702bb1fe9772
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 7
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 1
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: -2
-  maxTextureSize: 128
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: 1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 2
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: iPhone
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: 2
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Windows Store Apps
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: WebGL
-    maxTextureSize: 128
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 1
-  pSDShowRemoveMatteOption: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Show More
+++ b/Show More