From 6f8ed2e37f8762fb3501a671d0dca40bcd68edae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 21 十月 2018 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
index 3b84134..c7d1308 100644
--- a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
+++ b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
@@ -451,10 +451,10 @@
void DrawNewbieGuides()
{
- if (ConfigManager.Instance.inited && newbieGuides == null)
+ if (Config.Instance.inited && newbieGuides == null)
{
newbieGuides = new List<NewBieGuide>();
- var guides = ConfigManager.Instance.GetAllValues<GuideConfig>();
+ var guides = Config.Instance.GetAllValues<GuideConfig>();
foreach (var config in guides)
{
if (config.Type == 1)
@@ -507,10 +507,10 @@
void DrawFunctionalGuides()
{
- if (ConfigManager.Instance.inited && functionalGuides == null)
+ if (Config.Instance.inited && functionalGuides == null)
{
functionalGuides = new List<FunctionalGuide>();
- var guides = ConfigManager.Instance.GetAllValues<GuideConfig>();
+ var guides = Config.Instance.GetAllValues<GuideConfig>();
foreach (var config in guides)
{
if (config.Type == 2)
--
Gitblit v1.8.0