Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

hzr

2018-09-26 e2e2ceac90a6f3e8eda884ac445133ff7fb44483

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

 Assets/Editor/Tool/SpriteManageTool.cs

@@ -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)

            {