diff --git a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs b/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs index 770dfb1..1f5c868 100644 --- a/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs +++ b/Assets/Cryville/Crtr/Browsing/BrowserItemTile.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using TMPro; +using UnityEngine; using UnityEngine.UI; namespace Cryville.Crtr.Browsing { @@ -10,14 +11,14 @@ namespace Cryville.Crtr.Browsing { private bool _dir; private Image _icon; - private Text _title; - private Text _desc; + private TMP_Text _title; + private TMP_Text _desc; #pragma warning disable IDE0051 void Awake() { _icon = transform.Find("__content__/Icon").GetComponent(); - _title = transform.Find("__content__/Texts/Title/__text__").GetComponent(); - _desc = transform.Find("__content__/Texts/Description/__text__").GetComponent(); + _title = transform.Find("__content__/Texts/Title/__text__").GetComponent(); + _desc = transform.Find("__content__/Texts/Description/__text__").GetComponent(); } void OnDestroy() { if (meta.Icon != null) meta.Icon.Cancel(); diff --git a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs b/Assets/Cryville/Crtr/Browsing/DetailPanel.cs index 448081f..5865b95 100644 --- a/Assets/Cryville/Crtr/Browsing/DetailPanel.cs +++ b/Assets/Cryville/Crtr/Browsing/DetailPanel.cs @@ -1,6 +1,7 @@ using Cryville.Common; using Cryville.Common.Unity.UI; using System; +using TMPro; using UnityEngine; using UnityEngine.UI; @@ -18,8 +19,8 @@ namespace Cryville.Crtr.Browsing { DockOccupiedRatioLayoutGroup _outerContentGroup; Transform _content; Image _cover; - Text _title; - Text _desc; + TMP_Text _title; + TMP_Text _desc; protected override void Awake() { base.Awake(); @@ -28,8 +29,8 @@ namespace Cryville.Crtr.Browsing { _outerContentGroup = _outerContent.GetComponent(); _content = _outerContent.transform.Find("__content__"); _cover = _content.Find("Cover").GetComponent(); - _title = _content.Find("Texts/Title").GetComponent(); - _desc = _content.Find("Texts/Description").GetComponent(); + _title = _content.Find("Texts/Title").GetComponent(); + _desc = _content.Find("Texts/Description").GetComponent(); } void OnDestroy() { if (_data.Cover != null) _data.Cover.Cancel(); diff --git a/Assets/Cryville/Crtr/Menu.cs.meta b/Assets/Cryville/Crtr/Menu.cs.meta index 94be617..268fe43 100644 --- a/Assets/Cryville/Crtr/Menu.cs.meta +++ b/Assets/Cryville/Crtr/Menu.cs.meta @@ -1,11 +1,10 @@ fileFormatVersion: 2 guid: ceefede648e4d6d40839f2dda9019066 -timeCreated: 1637222453 -licenseType: Free MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -500 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Menu.unity b/Assets/Menu.unity index 361812b..5f1d49c 100644 Binary files a/Assets/Menu.unity and b/Assets/Menu.unity differ diff --git a/Assets/Prefabs/BrowserTile.prefab b/Assets/Prefabs/BrowserTile.prefab index 053366d..a643752 100644 Binary files a/Assets/Prefabs/BrowserTile.prefab and b/Assets/Prefabs/BrowserTile.prefab differ diff --git a/Assets/Resources/TMP Settings.asset b/Assets/Resources/TMP Settings.asset index afba7b6..7cdbe7c 100644 Binary files a/Assets/Resources/TMP Settings.asset and b/Assets/Resources/TMP Settings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d9e2855..1af2dbc 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ