diff --git a/Packages/com.bywaystudios.textmeshpro.ext/Editor/TextMeshProBywayUIInspector.cs b/Packages/com.bywaystudios.textmeshpro.ext/Editor/TextMeshProBywayUIInspector.cs index b5774a3..340e6ef 100644 --- a/Packages/com.bywaystudios.textmeshpro.ext/Editor/TextMeshProBywayUIInspector.cs +++ b/Packages/com.bywaystudios.textmeshpro.ext/Editor/TextMeshProBywayUIInspector.cs @@ -10,75 +10,6 @@ namespace Byway.TMP [CustomEditor(typeof(TextMeshProBywayUI))] public class TextMeshProBywayUIInspector : TMP_EditorPanelUI { - static readonly GUIContent k_HasOutlineLabel = new GUIContent("Outline", "Should the text Contains the outline."); - static readonly GUIContent k_OutlineColorLabel = new GUIContent("Outline Color", "The outline color of the text."); - static readonly GUIContent k_OutlineWidthLabel = new GUIContent("Outline Width", "The outline width of the text."); - static readonly GUIContent k_HasUnderlayLabel = new GUIContent("Underlay", "Should the text Contains the underlay."); - static readonly GUIContent k_UnderlayColorLabel = new GUIContent("Underlay Color", "The underlay color of the text."); - static readonly GUIContent k_UnderlayOffsetXLabel = new GUIContent("Underlay Offset X", "The underlay offset X of the text."); - static readonly GUIContent k_UnderlayOffsetYLabel = new GUIContent("Underlay Offset Y", "The underlay offset Y of the text."); - - protected SerializedProperty m_FontHasOutlineProp; - protected SerializedProperty m_FontOutlineColorProp; - protected SerializedProperty m_FontOutlineWidthProp; - protected SerializedProperty m_FontHasUnderlayProp; - protected SerializedProperty m_FontUnderlayColorProp; - protected SerializedProperty m_FontUnderlayOffsetXProp; - protected SerializedProperty m_FontUnderlayOffsetYProp; - - protected override void OnEnable() - { - m_FontHasOutlineProp = serializedObject.FindProperty("m_OverrideHasOutline"); - m_FontOutlineColorProp = serializedObject.FindProperty("m_OverrideOutlineColor"); - m_FontOutlineWidthProp = serializedObject.FindProperty("m_OverrideOutlineWidth"); - m_FontHasUnderlayProp = serializedObject.FindProperty("m_OverrideHasUnderlay"); - m_FontUnderlayColorProp = serializedObject.FindProperty("m_OverrideUnderlayColor"); - m_FontUnderlayOffsetXProp = serializedObject.FindProperty("m_OverrideUnderlayOffsetX"); - m_FontUnderlayOffsetYProp = serializedObject.FindProperty("m_OverrideUnderlayOffsetY"); - - base.OnEnable(); - } - - protected override void DrawExtraSettings() - { - EditorGUI.BeginChangeCheck(); - - EditorGUILayout.PropertyField(m_FontHasOutlineProp, k_HasOutlineLabel); - - if (m_FontHasOutlineProp.boolValue) - { - EditorGUI.indentLevel += 1; - - EditorGUILayout.PropertyField(m_FontOutlineColorProp, k_OutlineColorLabel); - - EditorGUILayout.PropertyField(m_FontOutlineWidthProp, k_OutlineWidthLabel); - - EditorGUI.indentLevel -= 1; - } - - EditorGUILayout.PropertyField(m_FontHasUnderlayProp, k_HasUnderlayLabel); - - if (m_FontHasUnderlayProp.boolValue) - { - EditorGUI.indentLevel += 1; - - EditorGUILayout.PropertyField(m_FontUnderlayColorProp, k_UnderlayColorLabel); - - EditorGUILayout.PropertyField(m_FontUnderlayOffsetXProp, k_UnderlayOffsetXLabel); - - EditorGUILayout.PropertyField(m_FontUnderlayOffsetYProp, k_UnderlayOffsetYLabel); - - EditorGUI.indentLevel -= 1; - } - - if (EditorGUI.EndChangeCheck()) - { - serializedObject.ApplyModifiedProperties(); - } - - base.DrawExtraSettings(); - } - [MenuItem("GameObject/UI/Text - Textmesh Pro - Byway", false, 30)] private static void CreateTextmeshProByway(MenuCommand command) { diff --git a/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset b/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset deleted file mode 100644 index 2b42b3b..0000000 --- a/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !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: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} - m_Name: Leaderboard_pic_maomitiezhi - m_EditorClassIdentifier: - hashCode: -969386721 - material: {fileID: 0} - materialHashCode: 0 - m_Version: 1.1.0 - m_FaceInfo: - m_FaceIndex: 0 - m_FamilyName: - m_StyleName: - m_PointSize: 0 - m_Scale: 0 - m_UnitsPerEM: 0 - m_LineHeight: 0 - m_AscentLine: 0 - m_CapLine: 0 - m_MeanLine: 0 - m_Baseline: 0 - m_DescentLine: 0 - m_SuperscriptOffset: 0 - m_SuperscriptSize: 0 - m_SubscriptOffset: 0 - m_SubscriptSize: 0 - m_UnderlineOffset: 0 - m_UnderlineThickness: 0 - m_StrikethroughOffset: 0 - m_StrikethroughThickness: 0 - m_TabWidth: 0 - spriteSheet: {fileID: 2800000, guid: e2be59fc3e239c24896d7b3315379568, type: 3} - m_SpriteCharacterTable: - - m_ElementType: 2 - m_Unicode: 65534 - m_GlyphIndex: 0 - m_Scale: 1 - m_Name: Leaderboard_pic_maomitiezhi - m_HashCode: -969386721 - m_SpriteGlyphTable: - - m_Index: 0 - m_Metrics: - m_Width: 145 - m_Height: 145 - m_HorizontalBearingX: -72.5 - m_HorizontalBearingY: 72.5 - m_HorizontalAdvance: 145 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 145 - m_Height: 145 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - sprite: {fileID: 21300000, guid: e2be59fc3e239c24896d7b3315379568, type: 3} - spriteInfoList: [] - fallbackSpriteAssets: [] diff --git a/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset.meta b/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset.meta deleted file mode 100644 index 72881f5..0000000 --- a/Packages/com.bywaystudios.textmeshpro.ext/Leaderboard_pic_maomitiezhi.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8660c30b869ed75478078dcea1304892 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2 b/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2 deleted file mode 100644 index d8be69a..0000000 --- a/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2 +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!612988286 &1 -SpriteAtlasAsset: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 2 - m_MasterAtlas: {fileID: 0} - m_ImporterData: - packables: - - {fileID: 102900000, guid: f3839d6d31957ed4aa35cc668aac1ec8, type: 3} - m_IsVariant: 0 diff --git a/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2.meta b/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2.meta deleted file mode 100644 index 9527d9c..0000000 --- a/Packages/com.bywaystudios.textmeshpro.ext/New Sprite Atlas.spriteatlasv2.meta +++ /dev/null @@ -1,43 +0,0 @@ -fileFormatVersion: 2 -guid: 51a0a8661f36fb745b342b1fc655c1cb -SpriteAtlasImporter: - externalObjects: {} - textureSettings: - serializedVersion: 2 - anisoLevel: 1 - compressionQuality: 50 - maxTextureSize: 2048 - textureCompression: 0 - filterMode: 1 - generateMipMaps: 0 - readable: 0 - crunchedCompression: 0 - sRGB: 1 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 50 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - packingSettings: - serializedVersion: 2 - padding: 8 - blockOffset: 1 - allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 - enableAlphaDilation: 0 - secondaryTextureSettings: {} - variantMultiplier: 1 - bindAsDefault: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProBywayUI.cs b/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProBywayUI.cs index 8196a8c..09540c4 100644 --- a/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProBywayUI.cs +++ b/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProBywayUI.cs @@ -6,165 +6,5 @@ namespace Byway.TMP public class TextMeshProBywayUI : TextMeshProUGUI { //private TextMeshProBywayUIRuntimeHelper m_RuntimeHelper; - - [SerializeField] - protected bool m_OverrideHasOutline = false; - - public bool outline - { - get - { - return m_OverrideHasOutline; - } - set - { - if (m_OverrideHasOutline == value) - { - return; - } - m_OverrideHasOutline = value; - } - } - - [SerializeField] - protected Color32 m_OverrideOutlineColor = Color.black; - - public new Color32 outlineColor - { - get - { - return m_OverrideOutlineColor; - } - set - { - if (m_OverrideHasOutline && m_OverrideOutlineColor.Compare(value)) - { - return; - } - m_OverrideHasOutline = true; - m_OverrideOutlineColor = value; - } - } - - [SerializeField] - [Range(0f, 1f)] - protected float m_OverrideOutlineWidth = 0.2f; - - public new float outlineWidth - { - get - { - return m_OverrideOutlineWidth; - } - set - { - m_OverrideHasOutline = true; - m_OverrideOutlineWidth = value; - } - } - - [SerializeField] - protected bool m_OverrideHasUnderlay = false; - - public bool underlay - { - get - { - return m_OverrideHasUnderlay; - } - set - { - if (m_OverrideHasUnderlay == value) - { - return; - } - m_OverrideHasUnderlay = value; - } - } - - [SerializeField] - protected Color32 m_OverrideUnderlayColor = Color.black; - - public Color32 underlayColor - { - get - { - return m_OverrideUnderlayColor; - } - set - { - if (m_OverrideHasUnderlay && m_OverrideUnderlayColor.Compare(value)) - { - return; - } - m_OverrideHasUnderlay = true; - m_OverrideUnderlayColor = value; - } - } - - [SerializeField] - [Range(-1f, 1f)] - protected float m_OverrideUnderlayOffsetX = 0.5f; - - [SerializeField] - [Range(-1f, 1f)] - protected float m_OverrideUnderlayOffsetY = -0.5f; - - public float underlayOffsetX - { - get - { - return m_OverrideUnderlayOffsetX; - } - set - { - m_OverrideHasUnderlay = true; - m_OverrideUnderlayOffsetX = value; - } - } - public float underlayOffsetY - { - get - { - return m_OverrideUnderlayOffsetY; - } - set - { - m_OverrideHasUnderlay = true; - m_OverrideUnderlayOffsetY = value; - } - } - - public Vector2 underlayOffset - { - get - { - return new Vector2(m_OverrideUnderlayOffsetX, m_OverrideUnderlayOffsetY); - } - set - { - m_OverrideHasUnderlay = true; - m_OverrideUnderlayOffsetX = value.x; - m_OverrideUnderlayOffsetY = value.y; - } - } - - public ColorMode gradientColorMode - { - get - { - return m_colorMode; - } - set - { - if (m_colorMode == value) - { - return; - } - m_havePropertiesChanged = true; - m_colorMode = value; - SetVerticesDirty(); - } - } } } \ No newline at end of file diff --git a/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProSystemFontInitializer.cs b/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProSystemFontInitializer.cs index 05c7c96..b016744 100644 --- a/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProSystemFontInitializer.cs +++ b/Packages/com.bywaystudios.textmeshpro.ext/Runtime/TextMeshProSystemFontInitializer.cs @@ -28,10 +28,10 @@ namespace Byway.TMP // Get the file paths of all OS fonts. systemFontPaths = Font.GetPathsToOSFonts(); - foreach (var fontPath in systemFontPaths) - { - Debug.Log("Your system has font: " + fontPath); - } + //foreach (var fontPath in systemFontPaths) + //{ + // Debug.Log("Your system has font: " + fontPath); + //} if (!Check()) { diff --git a/Packages/com.bywaystudios.textmeshpro.ext/package.json b/Packages/com.bywaystudios.textmeshpro.ext/package.json index 5b09e93..b77cfeb 100644 --- a/Packages/com.bywaystudios.textmeshpro.ext/package.json +++ b/Packages/com.bywaystudios.textmeshpro.ext/package.json @@ -1,7 +1,7 @@ { "name": "com.bywaystudios.textmeshpro.ext", "displayName": "TextmeshPro Extension", - "version": "0.1.17", + "version": "0.1.18", "dependencies": { "com.unity.textmeshpro": "3.0.9" },