From 18d888dfce8ad597d4933a3f33fe69b97a81ee4b Mon Sep 17 00:00:00 2001 From: CortexCore <2630229280@qq.com> Date: Mon, 29 Jul 2024 11:34:06 +0800 Subject: [PATCH] 1 --- .../Fonts/SDF/SourceHanMono-Bold SDF.asset | 30 +++++++++++++++---- .../SDF/SourceHanMono-Bold SDF.asset.meta | 2 +- Src/Unity/Scripts/UX/Core/UXToolTips.cs | 4 +-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset b/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset index 4f53054..6603c46 100644 --- a/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset +++ b/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!21 &-5271035113850593674 +--- !u!21 &-8990289800176473828 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SourceHanMono-Bold SDF Material - m_Shader: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: c8d12adcee749c344b8117cf7c7eb912, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -24,13 +24,24 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: -97867964374299358} + m_Texture: {fileID: -566257409327716681} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _ColorMask: 15 + - _CullMode: 0 - _FaceDilate: 0 - _GradientScale: 11 + - _MaskEdgeSoftness: 0.01 + - _MaskInverse: 0 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _MaskWipeControl: 0.5 - _OutlineSoftness: 0 - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 @@ -41,6 +52,11 @@ Material: - _ScaleY: 1 - _ShaderFlags: 0 - _Sharpness: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _TextureHeight: 4096 - _TextureWidth: 4096 - _UnderlayDilate: 0 @@ -52,11 +68,13 @@ Material: - _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} + - _MaskEdgeColor: {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: [] ---- !u!28 &-97867964374299358 +--- !u!28 &-566257409327716681 Texture2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -117,7 +135,7 @@ MonoBehaviour: m_Name: Assets/BITKit/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset m_EditorClassIdentifier: m_Version: 1.1.0 - m_Material: {fileID: -5271035113850593674} + m_Material: {fileID: -8990289800176473828} m_SourceFontFileGUID: 70e08abd745a9214299a520605342101 m_fontAssetCreationEditorSettings: sourceFontFileGUID: 70e08abd745a9214299a520605342101 @@ -83254,7 +83272,7 @@ MonoBehaviour: m_GlyphIndex: 59248 m_Scale: 1 m_AtlasTextures: - - {fileID: -97867964374299358} + - {fileID: -566257409327716681} m_AtlasTextureIndex: 0 m_IsMultiAtlasTexturesEnabled: 0 m_ClearDynamicDataOnBuild: 0 diff --git a/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset.meta b/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset.meta index 912b379..675a868 100644 --- a/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset.meta +++ b/Src/Unity/Art/Fonts/SDF/SourceHanMono-Bold SDF.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8061e7a414e9fa54784969a6a8f1f76d +guid: 7b6a2cbff5c66dc42a81b604c826c04d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Src/Unity/Scripts/UX/Core/UXToolTips.cs b/Src/Unity/Scripts/UX/Core/UXToolTips.cs index 4bb30ed..a835263 100644 --- a/Src/Unity/Scripts/UX/Core/UXToolTips.cs +++ b/Src/Unity/Scripts/UX/Core/UXToolTips.cs @@ -52,9 +52,7 @@ namespace BITKit.UX { // https://docs.unity3d.com/2022.2/Documentation/Manual/UIE-faq-event-and-input-system.html - if (panel is null) return string.Empty; - - if (!EventSystem.current.IsPointerOverGameObject()) return string.Empty; + if (!EventSystem.current.IsPointerOverGameObject()) return ""; var screenPosition = Mouse.current.position.ReadValue(); screenPosition.y = Screen.height - screenPosition.y;