diff --git a/Assets/MyGame/aa/UI/Game/Sub/HHWKTuJianPanel.cs b/Assets/MyGame/aa/UI/Game/Sub/HHWKTuJianPanel.cs index 34bf1773b..669524874 100644 --- a/Assets/MyGame/aa/UI/Game/Sub/HHWKTuJianPanel.cs +++ b/Assets/MyGame/aa/UI/Game/Sub/HHWKTuJianPanel.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class HHWKTuJianPanel : SubUIBase { + public Toggle toggle_PuTong; [Header("普通鱼 - Item1 预制体")] public TuJianItem prefab_Item1; [Header("黄金鱼/特殊鱼/Boss/特殊Boss - Item2 预制体")] @@ -74,4 +75,9 @@ public class HHWKTuJianPanel : SubUIBase if (scrollRect != null) scrollRect.normalizedPosition = new Vector2(0, 1); } + protected override void OnShow(object args = null) + { + base.OnShow(args); + toggle_PuTong.isOn = true; + } } diff --git a/Assets/MyGame/aa/UI/Game/Sub/TuJian.prefab b/Assets/MyGame/aa/UI/Game/Sub/TuJian.prefab index 307ae17e5..b1d140a66 100644 --- a/Assets/MyGame/aa/UI/Game/Sub/TuJian.prefab +++ b/Assets/MyGame/aa/UI/Game/Sub/TuJian.prefab @@ -2886,7 +2886,7 @@ MonoBehaviour: m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 - m_DecelerationRate: 0.135 + m_DecelerationRate: 0 m_ScrollSensitivity: 1 m_Viewport: {fileID: 831834931042295888} m_HorizontalScrollbar: {fileID: 0} @@ -5421,6 +5421,7 @@ MonoBehaviour: m_EditorClassIdentifier: btn_Close: {fileID: 3530945359150349625} uIEffect: 1 + toggle_PuTong: {fileID: 5568220943499308472} prefab_Item1: {fileID: 7025245232001895659} prefab_Item2: {fileID: 583698777643594762} "parent_\u666E\u901A\u9C7C": {fileID: 3443026272750322915} diff --git a/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab b/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab index 00d47698f..2b15edc53 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab @@ -1570,8 +1570,7 @@ MonoBehaviour: m_text: 1000 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2} - m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, - type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 917ba140962d74746a6d858a66ee9d0f, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1595,8 +1594,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 21 - m_fontSizeBase: 21 + m_fontSize: 21.86 + m_fontSizeBase: 21.86 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1631,7 +1630,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: 5.9, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab index dda0a1731..e22089dc5 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/EmailPanel.prefab @@ -973,7 +973,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 8497601212215982911} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 m_Elasticity: 0.1 @@ -1339,6 +1339,8 @@ RectTransform: - {fileID: 192939463883791818} - {fileID: 7825622084081178721} - {fileID: 1860116199200310832} + - {fileID: 3420959013788734697} + - {fileID: 859821817495647539} m_Father: {fileID: 9072187280592513264} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1647,11 +1649,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9072187280592513264} + m_Father: {fileID: 3524178559932422126} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 141, y: 160} + m_AnchoredPosition: {x: 29.378662, y: 37.986603} m_SizeDelta: {x: 104, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5649040687132606433 @@ -2525,6 +2527,7 @@ MonoBehaviour: m_EditorClassIdentifier: btn_Close: {fileID: 5491621444214098605} uIEffect: 1 + obj_ShowEmail: {fileID: 2903539061501306576} tMPText_Header: {fileID: 118118469195421749} tMPText_Content: {fileID: 8331406854104295500} tMPText_EmailCount: {fileID: 1578311975270780186} @@ -3264,8 +3267,6 @@ RectTransform: - {fileID: 7721244057577569626} - {fileID: 1666103475042114020} - {fileID: 3524178559932422126} - - {fileID: 3420959013788734697} - - {fileID: 859821817495647539} - {fileID: 7519741605095477535} - {fileID: 4545061391079089811} - {fileID: 7337472293351622535} @@ -3346,11 +3347,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 9072187280592513264} + m_Father: {fileID: 3524178559932422126} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 141, y: 159.5} + m_AnchoredPosition: {x: 29.378662, y: 37.486603} m_SizeDelta: {x: 104, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4903157477974614168 diff --git a/Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab index 01122caac..91c73c325 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/SettingPanel.prefab @@ -2879,6 +2879,7 @@ MonoBehaviour: m_EditorClassIdentifier: btn_Close: {fileID: 2404201308153906490} uIEffect: 1 + toggle_SystemSetting: {fileID: 3421559140040621297} slider_AudioMusic: {fileID: 3431799425660422017} slider_AudioEffect: {fileID: 2244551264341511853} toggle_QualityLow: {fileID: 8494326727416694464} diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs index aba5ccbc2..85b477ecd 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs @@ -29,7 +29,7 @@ public class UIHome_BY_BackPackPanel : SubUIBase public Button btn_Use; // 刷新时保存的状态 - private Vector2 savedScrollPos; + //private Vector2 savedScrollPos; private string savedPropID; public override void Awake() @@ -41,14 +41,14 @@ public class UIHome_BY_BackPackPanel : SubUIBase private void OnUserDataChanged() { // 刷新前保存状态 - if (scrollRect != null) savedScrollPos = scrollRect.normalizedPosition; + //if (scrollRect != null) savedScrollPos = scrollRect.normalizedPosition; savedPropID = propID; RefreshUI(); RebuildPropsList(); // 刷新后恢复状态 - if (scrollRect != null) scrollRect.normalizedPosition = savedScrollPos; + //if (scrollRect != null) scrollRect.normalizedPosition = savedScrollPos; } protected override void OnShow(object args = null) diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_EmailPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_EmailPanel.cs index a7b5ef83a..89a7a0259 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_EmailPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_EmailPanel.cs @@ -14,6 +14,7 @@ using UnityEngine.UI; public class UIHome_BY_EmailPanel : SubUIBase { + public GameObject obj_ShowEmail; public TextMeshProUGUI tMPText_Header; public TextMeshProUGUI tMPText_Content; public TextMeshProUGUI tMPText_EmailCount; @@ -84,6 +85,14 @@ public class UIHome_BY_EmailPanel : SubUIBase dic_GetEmailByPageResponses.Remove(currEmailID); ; Destroy(dic_EmalItems[currEmailID].gameObject); dic_EmalItems.Remove(currEmailID); + if (dic_EmalItems.Count == 0) + { + obj_ShowEmail.SetActive(false); + } + else + { + obj_ShowEmail.SetActive(true); + } tMPText_EmailCount.text = itemPrefabParent.childCount.ToString(); }); @@ -127,7 +136,14 @@ public class UIHome_BY_EmailPanel : SubUIBase } } tMPText_EmailCount.text = itemPrefabParent.childCount.ToString(); - + if (dic_EmalItems.Count == 0) + { + obj_ShowEmail.SetActive(false); + } + else + { + obj_ShowEmail.SetActive(true); + } }); }); @@ -161,6 +177,14 @@ public class UIHome_BY_EmailPanel : SubUIBase if (args != null) { List getEmailByPageResponse = (List)args; + if (getEmailByPageResponse.Count==0) + { + obj_ShowEmail.SetActive(false); + } + else + { + obj_ShowEmail.SetActive(true); + } foreach (var item in getEmailByPageResponse) { dic_GetEmailByPageResponses[item.id] = item; diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SettingPenel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SettingPenel.cs index a133cb4c1..8d0ee6c48 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SettingPenel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SettingPenel.cs @@ -8,6 +8,7 @@ using UnityEngine.UI; public class UIHome_BY_SettingPanel : SubUIBase { + public Toggle toggle_SystemSetting;//默认打开系统设置界面 public Slider slider_AudioMusic; public Slider slider_AudioEffect; @@ -80,7 +81,11 @@ public class UIHome_BY_SettingPanel : SubUIBase toggle_Fps60?.onValueChanged.AddListener(a => { if (a) SetFps(1); }); toggle_FpsUnlimited?.onValueChanged.AddListener(a => { if (a) SetFps(2); }); } - + protected override void OnShow(object args = null) + { + base.OnShow(args); + toggle_SystemSetting.isOn = true; + } private void CacheToggleColor(Toggle tg) { if (tg == null) return; diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab index 99458bdad..8f1943928 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab @@ -7396,7 +7396,9 @@ MonoBehaviour: m_EditorClassIdentifier: btn_Close: {fileID: 4603626640602430691} uIEffect: 1 + toggle_BaseUserInfo: {fileID: 4787222581389779299} sprite_Avatar: {fileID: 3540025539893487929} + sprite_AvatarK: {fileID: 0} btn_ChangeUser: {fileID: 1447385288583706753} tMPText_Name: {fileID: 102329551224647658} tMPText_ID: {fileID: 7215819849252547559} diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs index a6e69308d..231722b9a 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs @@ -10,6 +10,7 @@ using UnityEngine.UI; /// public class UserInfoPanel : SubUIBase { + public Toggle toggle_BaseUserInfo; //打开默认打开基础信息页面 [Header("基础信息")] public Image sprite_Avatar; // 显示已保存的用户头像(点使用后更新) public Image sprite_AvatarK; // 显示已保存的用户头像框(点使用后更新) @@ -51,6 +52,7 @@ public class UserInfoPanel : SubUIBase protected override void OnShow(object args = null) { base.OnShow(args); + toggle_BaseUserInfo.isOn = true; InitInformation(); BuildAvatarList(); BuildAvatarFrameList(); diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat new file mode 100644 index 000000000..8cb640d2c --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat @@ -0,0 +1,195 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Black + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - GLOW_ON + - UNDERLAY_ON + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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} + - _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} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: -5242640295693195929, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + 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} + - _OutlineTex: + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Ambient: 0.5 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpFace: 0 + - _BumpOutline: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _CullMode: 0 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _Diffuse: 0.5 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _FaceDilate: 0.132 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 1 + - _GlowPower: 0.5 + - _GradientScale: 4 + - _LightAngle: 3.1416 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _OutlineSoftness: 0.117 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 + - _Parallax: 0.005 + - _PerspectiveFilter: 0.875 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Reflectivity: 10 + - _ScaleRatioA: 0.75 + - _ScaleRatioB: 0.08850002 + - _ScaleRatioC: 0.08850002 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpecularPower: 2 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 1 + - _StencilWriteMask: 0 + - _Surface: 0 + - _TextureHeight: 2048 + - _TextureWidth: 4096 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: -0.024 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0.54 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 3 + - _WeightNormal: 1.2 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 0, b: 0, a: 0.5} + - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767} + - _OutlineColor: {r: 0.47353154, g: 0.22322798, b: 0.05448028, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat.meta new file mode 100644 index 000000000..b67197a1a --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/Black.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 917ba140962d74746a6d858a66ee9d0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat b/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat new file mode 100644 index 000000000..7256c7e61 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8467828682047168872 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlackTxt + m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + m_Parent: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a, + type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 1054111927184489937, guid: 4b1b429c45677a84c9609930fc8fd523, + type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _FaceDilate: -0.44 + - _GlowOuter: 0.58 + - _GlowPower: 0.75 + - _GradientScale: 10 + - _OutlineSoftness: 0 + - _OutlineWidth: 0.229 + - _ScaleRatioA: 0.9 + - _ScaleRatioB: 1.1835 + - _ScaleRatioC: 1.1835 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _UnderlayOffsetX: 0 + - _UnderlaySoftness: 0 + - _WeightBold: 0.5 + - _WeightNormal: 0 + m_Colors: + - _GlowColor: {r: 0.14126332, g: 0.89626956, b: 0.9559735, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat.meta b/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat.meta new file mode 100644 index 000000000..82e82ddd1 --- /dev/null +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/BlackTxt.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f257679c6051c0344abe6499dd8b1803 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: