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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs

@@ -8,7 +8,7 @@
    {
        public static string GetOccupationName(int occupa,int classLv)
        {
            var cfg = ConfigManager.Instance.GetTemplate<OccupationNameConfig>(occupa*100 + classLv);
            var cfg = Config.Instance.Get<OccupationNameConfig>(occupa*100 + classLv);
            if (cfg != null) {
                return cfg.name;
            }