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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/WorldMap/LocalMapTag.cs

@@ -71,7 +71,7 @@
                    break;

                case TagType.Elite:

                case TagType.Monster:

                    var config = ConfigManager.Instance.GetTemplate<NPCConfig>(npcId);

                    var config = Config.Instance.Get<NPCConfig>(npcId);

                    m_NpcName.text = config.charName;

                    m_NpcName.colorType = _colorType;

                    break;

@@ -95,7 +95,7 @@
            switch (m_TagType)

            {

                case TagType.Boss:

                    var config = ConfigManager.Instance.GetTemplate<NPCConfig>(npcId);

                    var config = Config.Instance.Get<NPCConfig>(npcId);

                    m_NpcName.text = config.charName;

                    m_Level.text = Language.Get("HeadUpName_Monster", config.NPCLV);

                    m_NpcName.colorType = _colorType;