Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 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());