From 54fad068f41ba7b0d2f16699a3f774be2a0d84e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 14 二月 2019 12:02:50 +0800
Subject: [PATCH] 3335 配置表读取重构。
---
Assets/Editor/Tool/SpriteManageTool.cs | 2 +-
Assets/Editor/Tool/ExcelParseTool.cs | 4 ++--
Assets/Editor/Actor/ActorEditor.cs | 2 +-
Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Editor/Actor/ActorEditor.cs b/Assets/Editor/Actor/ActorEditor.cs
index 79cbf3b..7e9019d 100644
--- a/Assets/Editor/Actor/ActorEditor.cs
+++ b/Assets/Editor/Actor/ActorEditor.cs
@@ -75,7 +75,7 @@
private void OnEnable()
{
- Config.Instance.SyncLoadConfigs();
+ ConfigInitiator.EditorLoad();
m_NpcResBuilder = new NpcResourcesBuilder();
m_ModelResBuilder = new ModelResourcesBuilder();
}
diff --git a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
index e0d2cc9..6628fa5 100644
--- a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
+++ b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
@@ -451,7 +451,7 @@
void DrawNewbieGuides()
{
- if (Config.Instance.inited && newbieGuides == null)
+ if (ConfigInitiator.done && newbieGuides == null)
{
newbieGuides = new List<NewBieGuide>();
var guides = GuideConfig.GetValues();
@@ -507,7 +507,7 @@
void DrawFunctionalGuides()
{
- if (Config.Instance.inited && functionalGuides == null)
+ if (ConfigInitiator.done && functionalGuides == null)
{
functionalGuides = new List<FunctionalGuide>();
var guides = GuideConfig.GetValues();
diff --git a/Assets/Editor/Tool/ExcelParseTool.cs b/Assets/Editor/Tool/ExcelParseTool.cs
index 1981fc0..ee11fdd 100644
--- a/Assets/Editor/Tool/ExcelParseTool.cs
+++ b/Assets/Editor/Tool/ExcelParseTool.cs
@@ -51,7 +51,7 @@
if (GUILayout.Button("瑙ｆ瀽"))
{
m_Englishs.Clear();
- Config.Instance.SyncLoadConfigs();
+ ConfigInitiator.EditorLoad();
m_FitterKeys.Clear();
m_FitterKeys.AddRange(LanguageConfig.GetKeys());
m_FitterKeys.AddRange(SysInfoConfig.GetKeys());
@@ -84,7 +84,7 @@
{
DebugEx.LogError(e.ToString());
}
- Config.Instance.SyncLoadConfigs();
+ ConfigInitiator.EditorLoad();
m_FitterKeys.Clear();
m_FitterKeys.AddRange(LanguageConfig.GetKeys());
m_FitterKeys.AddRange(SysInfoConfig.GetKeys());
diff --git a/Assets/Editor/Tool/SpriteManageTool.cs b/Assets/Editor/Tool/SpriteManageTool.cs
index 972c9f9..46784c7 100644
--- a/Assets/Editor/Tool/SpriteManageTool.cs
+++ b/Assets/Editor/Tool/SpriteManageTool.cs
@@ -125,7 +125,7 @@
private void OnEnable()
{
- Config.Instance.SyncLoadConfigs();
+ ConfigInitiator.EditorLoad();
m_IconCfgs = IconConfig.GetValues();
m_DeleteTexture = EditorGUIUtility.FindTexture("TreeEditor.Trash");
InitStyle();
--
Gitblit v1.8.0