From b7efcf87cf8c3386b475af9958c4051ffe060ec2 Mon Sep 17 00:00:00 2001
From: monitor1394 <monitor1394@gmail.com>
Date: Sat, 26 Mar 2022 18:26:34 +0800
Subject: [PATCH] 3.0

---
 Editor/Windows/XCSettingsEditor.cs | 7 +------
 Runtime/Internal/XCSettings.cs     | 4 +++-
 Runtime/Internal/XCThemeMgr.cs     | 7 +++++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Editor/Windows/XCSettingsEditor.cs b/Editor/Windows/XCSettingsEditor.cs
index e982e1d7..ef1add3a 100644
--- a/Editor/Windows/XCSettingsEditor.cs
+++ b/Editor/Windows/XCSettingsEditor.cs
@@ -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);
diff --git a/Runtime/Internal/XCSettings.cs b/Runtime/Internal/XCSettings.cs
index 19baa262..bbdd3635 100644
--- a/Runtime/Internal/XCSettings.cs
+++ b/Runtime/Internal/XCSettings.cs
@@ -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
                     {
diff --git a/Runtime/Internal/XCThemeMgr.cs b/Runtime/Internal/XCThemeMgr.cs
index 82cff028..9e6380e8 100644
--- a/Runtime/Internal/XCThemeMgr.cs
+++ b/Runtime/Internal/XCThemeMgr.cs
@@ -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);
+                }
             }
         }