diff --git a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs index 5e629dd42..8b4798c49 100644 --- a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs +++ b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs @@ -27,6 +27,7 @@ namespace BFEditor.Resource private const string AssetDefaultName = "font_sdf.asset"; private const string AssetNumberName = "font_number_sdf.asset"; private const string AssetBattleName = "font_battle_sdf.asset"; + private const string AssetThaiName = "font_thai_sdf.asset"; private const string DevStrPath = "Assets/Editor/BFResourceTools/FontTools/cn_3900.txt"; private const string CommonCNWordsPath = "Assets/Editor/BFResourceTools/FontTools/cn_1200.txt"; @@ -153,6 +154,10 @@ namespace BFEditor.Resource var defaultNumberFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/default/tmpfont/font_number.TTF"); GenTMPFontAsset(defaultNumberFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/default/tmpfont", "Assets/arts/fonts/tmpfonts/default/tmpfont", 256, new List()), AssetNumberName, isdevelop); + // 泰语 + var thaiFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf"); + GenTMPFontAsset(thaiFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/default/tmpfont", "Assets/arts/fonts/tmpfonts/default/tmpfont", 512, new List()), AssetThaiName, isdevelop); + // 战斗用 // var battleFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/battle/font_battle.ttf"); // GenTMPFontAsset(battleFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/battle", "Assets/arts/fonts/tmpfonts/battle", 1024, new List()), AssetBattleName, isdevelop); diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset index 9347a1e8a..77c886364 100644 --- a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset @@ -113,7 +113,8 @@ MonoBehaviour: m_FontFeatureTable: m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] - m_FallbackFontAssetTable: [] + m_FallbackFontAssetTable: + - {fileID: 11400000, guid: fb372181bb5896149b689946854b5451, type: 2} m_CreationSettings: sourceFontFileName: sourceFontFileGUID: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf new file mode 100644 index 000000000..576d3b976 Binary files /dev/null and b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf differ diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta new file mode 100644 index 000000000..c203a8dd2 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: adf03298474858443a8a36a21a9a0d7d +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Mitr + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset new file mode 100644 index 000000000..31b451d37 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset @@ -0,0 +1,135 @@ +%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: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} + m_Name: font_thai_sdf + m_EditorClassIdentifier: + hashCode: 0 + material: {fileID: 0} + materialHashCode: -2006316128 + m_Version: 1.1.0 + m_SourceFontFileGUID: adf03298474858443a8a36a21a9a0d7d + m_SourceFontFile_EditorRef: {fileID: 12800000, guid: adf03298474858443a8a36a21a9a0d7d, type: 3} + m_SourceFontFile: {fileID: 12800000, guid: adf03298474858443a8a36a21a9a0d7d, type: 3} + m_AtlasPopulationMode: 1 + m_FaceInfo: + m_FaceIndex: 0 + m_FamilyName: Mitr + m_StyleName: Regular + m_PointSize: 32 + m_Scale: 1 + m_LineHeight: 50.24 + m_AscentLine: 36.8 + m_CapLine: 22 + m_MeanLine: 16 + m_Baseline: 0 + m_DescentLine: -13.44 + m_SuperscriptOffset: 36.8 + m_SuperscriptSize: 0.5 + m_SubscriptOffset: -13.44 + m_SubscriptSize: 0.5 + m_UnderlineOffset: -3.2 + m_UnderlineThickness: 1.6 + m_StrikethroughOffset: 6.4 + m_StrikethroughThickness: 1.6 + m_TabWidth: 12 + m_GlyphTable: [] + m_CharacterTable: [] + m_AtlasTextures: + - {fileID: 0} + m_AtlasTextureIndex: 0 + m_IsMultiAtlasTexturesEnabled: 1 + m_ClearDynamicDataOnBuild: 0 + m_UsedGlyphRects: [] + m_FreeGlyphRects: + - m_X: 0 + m_Y: 0 + m_Width: 511 + m_Height: 511 + m_fontInfo: + Name: + PointSize: 0 + Scale: 0 + CharacterCount: 0 + LineHeight: 0 + Baseline: 0 + Ascender: 0 + CapHeight: 0 + Descender: 0 + CenterLine: 0 + SuperscriptOffset: 0 + SubscriptOffset: 0 + SubSize: 0 + Underline: 0 + UnderlineThickness: 0 + strikethrough: 0 + strikethroughThickness: 0 + TabWidth: 0 + Padding: 0 + AtlasWidth: 0 + AtlasHeight: 0 + atlas: {fileID: 0} + m_AtlasWidth: 512 + m_AtlasHeight: 512 + m_AtlasPadding: 4 + m_AtlasRenderMode: 4165 + m_glyphInfoList: [] + m_KerningTable: + kerningPairs: [] + m_FontFeatureTable: + m_GlyphPairAdjustmentRecords: [] + fallbackFontAssets: [] + m_FallbackFontAssetTable: [] + m_CreationSettings: + sourceFontFileName: + sourceFontFileGUID: + pointSizeSamplingMode: 0 + pointSize: 0 + padding: 0 + packingMode: 0 + atlasWidth: 0 + atlasHeight: 0 + characterSetSelectionMode: 0 + characterSequence: + referencedFontAssetGUID: + referencedTextAssetGUID: + fontStyle: 0 + fontStyleModifier: 0 + renderMode: 0 + includeFontFeatures: 0 + 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} + fontWeights: [] + normalStyle: 0 + normalSpacingOffset: 0 + boldStyle: 0.75 + boldSpacing: 7 + italicStyle: 35 + tabSize: 10 diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta new file mode 100644 index 000000000..9a579dcef --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb372181bb5896149b689946854b5451 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat new file mode 100644 index 000000000..8ed75587d --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat @@ -0,0 +1,63 @@ +%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: font_thai_sdf + m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: ad77093c9c58b98478cfc65f8d51fb75, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _FaceDilate: 0 + - _GradientScale: 5 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _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} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta new file mode 100644 index 000000000..ae15916ec --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f0d1f997c8424a47a8c1568cc71c466 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset new file mode 100644 index 000000000..0d9c2a019 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!28 &2800000 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: font_thai_sdf_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: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta new file mode 100644 index 000000000..5b791dc88 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad77093c9c58b98478cfc65f8d51fb75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2800000 + userData: + assetBundleName: + assetBundleVariant: