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/ScriptEditor/NewBieGuideEditorWindow.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
index c7d1308..6628fa5 100644
--- a/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
+++ b/Assets/Editor/ScriptEditor/NewBieGuideEditorWindow.cs
@@ -4,7 +4,7 @@
using UnityEditor;
using Snxxz.UI;
using UnityEngine.UI;
-using TableConfig;
+
public class NewBieGuideEditorWindow : EditorWindow
{
@@ -181,7 +181,7 @@
uiroot = GameObject.FindObjectOfType<UIRoot>();
if (uiroot == null)
{
- var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
+ var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
root.name = "UIRoot";
uiroot = root.GetComponent<UIRoot>();
@@ -332,7 +332,7 @@
uiroot = GameObject.FindObjectOfType<UIRoot>();
if (uiroot == null)
{
- var rootPrefab = Resources.Load<GameObject>("UI/Prefabs/UIRoot");
+ var rootPrefab = BuiltInLoader.LoadPrefab("UIRoot");
var root = GameObject.Instantiate(rootPrefab, Vector3.zero, Quaternion.identity);
root.name = "UIRoot";
uiroot = root.GetComponent<UIRoot>();
@@ -451,10 +451,10 @@
void DrawNewbieGuides()
{
- if (Config.Instance.inited && newbieGuides == null)
+ if (ConfigInitiator.done && newbieGuides == null)
{
newbieGuides = new List<NewBieGuide>();
- var guides = Config.Instance.GetAllValues<GuideConfig>();
+ var guides = GuideConfig.GetValues();
foreach (var config in guides)
{
if (config.Type == 1)
@@ -507,10 +507,10 @@
void DrawFunctionalGuides()
{
- if (Config.Instance.inited && functionalGuides == null)
+ if (ConfigInitiator.done && functionalGuides == null)
{
functionalGuides = new List<FunctionalGuide>();
- var guides = Config.Instance.GetAllValues<GuideConfig>();
+ var guides = GuideConfig.GetValues();
foreach (var config in guides)
{
if (config.Type == 2)
--
Gitblit v1.8.0