From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
Core/ResModule/UILoader.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Core/ResModule/UILoader.cs b/Core/ResModule/UILoader.cs
index 8f8eae3..9e96e5c 100644
--- a/Core/ResModule/UILoader.cs
+++ b/Core/ResModule/UILoader.cs
@@ -123,7 +123,7 @@
public static Sprite LoadSprite(string _iconKey)
{
- var iconConfig = ConfigManager.Instance.GetTemplate<IconConfig>(_iconKey);
+ var iconConfig = Config.Instance.Get<IconConfig>(_iconKey);
if (iconConfig == null)
{
return null;
@@ -171,7 +171,7 @@
{
if (!AssetSource.uiFromEditor)
{
- var iconConfig = ConfigManager.Instance.GetTemplate<IconConfig>(_iconKey);
+ var iconConfig = Config.Instance.Get<IconConfig>(_iconKey);
if (iconConfig != null)
{
var bundleName = StringUtility.Contact("ui/sprite/", iconConfig.folder.ToLower());
--
Gitblit v1.8.0