foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-21 16:00:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.0

Browse Source
This commit is contained in:
monitor1394
2022-03-26 18:26:34 +08:00
parent 1aea9f3cfe
commit b7efcf87cf
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/Windows/XCSettingsEditor.cs
View File

@@ -8,11 +8,6 @@ namespace XCharts.Editor
[CustomEditor(typeof(XCSettings))]
public class XCSettingsEditor : UnityEditor.Editor
{
internal class Styles
{
public static readonly GUIContent defaultFontAssetLabel = new GUIContent("Default Font Asset", "The Font Asset that will be assigned by default to newly created text objects when no Font Asset is specified.");
public static readonly GUIContent defaultFontAssetPathLabel = new GUIContent("Path: Resources/", "The relative path to a Resources folder where the Font Assets and Material Presets are located.\nExample \"Fonts & Materials/\"");
}
}
#if UNITY_2018_3_OR_NEWER
@@ -48,7 +43,7 @@ namespace XCharts.Editor
static SettingsProvider[] CreateXCSettingsProvider()
{
var providers = new System.Collections.Generic.List<SettingsProvider> { new XCResourceImporterProvider() };
var isExist = File.Exists("Assets/XCharts/Resources/XCSettings.asset");
if (GetSettings() != null)
{
var provider = new AssetSettingsProvider("Project/XCharts/Settings", GetSettings);

4
Runtime/Internal/XCSettings.cs
View File

@@ -129,7 +129,9 @@ namespace XCharts.Runtime
#if UNITY_EDITOR
if (s_Instance == null)
{
XChartsPackageResourceImporterWindow.ShowPackageImporterWindow();
var isExist = System.IO.File.Exists("Assets/XCharts/Resources/XCSettings.asset");
if(isExist)
XChartsPackageResourceImporterWindow.ShowPackageImporterWindow();
}
else
{

7
Runtime/Internal/XCThemeMgr.cs
View File

@@ -23,9 +23,12 @@ namespace XCharts.Runtime
XChartsMgr.themeNames.Clear();
AddTheme(LoadTheme(ThemeType.Default));
AddTheme(LoadTheme(ThemeType.Dark));
foreach (var theme in XCSettings.customThemes)
if (XCSettings.Instance != null)
{
AddTheme(theme);
foreach (var theme in XCSettings.customThemes)
{
AddTheme(theme);
}
}
}