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/Tool/SpriteManageTool.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Assets/Editor/Tool/SpriteManageTool.cs b/Assets/Editor/Tool/SpriteManageTool.cs
index fec7fcf..f318b51 100644
--- a/Assets/Editor/Tool/SpriteManageTool.cs
+++ b/Assets/Editor/Tool/SpriteManageTool.cs
@@ -125,8 +125,8 @@
private void OnEnable()
{
- ConfigManager.Instance.SyncLoadConfigs();
- m_IconCfgs = ConfigManager.Instance.GetAllValues<IconConfig>();
+ Config.Instance.SyncLoadConfigs();
+ m_IconCfgs = Config.Instance.GetAllValues<IconConfig>();
m_DeleteTexture = EditorGUIUtility.FindTexture("TreeEditor.Trash");
InitStyle();
@@ -464,7 +464,8 @@
var _spriteName = Regex.Replace(_fileInfo.Name, @"\.png", string.Empty, RegexOptions.IgnoreCase);
var _index = m_IconCfgs.FindIndex((x) =>
{
- return x.sprite == _spriteName && x.folder == _fileInfo.Directory.Name;
+ return x.sprite.ToLower().Equals(_spriteName.ToLower())
+ && x.folder == _fileInfo.Directory.Name;
});
if (_index == -1)
{
--
Gitblit v1.8.0