From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer

---
 Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs b/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs
index 8f993f0..4e8d749 100644
--- a/Core/GameEngine/Model/TelPartialConfig/OccupationNameConfig.cs
+++ b/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;
             }

--
Gitblit v1.8.0