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/PartPriorBundleConfig.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Core/GameEngine/Model/TelPartialConfig/PartPriorBundleConfig.cs b/Core/GameEngine/Model/TelPartialConfig/PartPriorBundleConfig.cs
index 4ecb18b..3e96360 100644
--- a/Core/GameEngine/Model/TelPartialConfig/PartPriorBundleConfig.cs
+++ b/Core/GameEngine/Model/TelPartialConfig/PartPriorBundleConfig.cs
@@ -55,7 +55,7 @@
 
         static void Init()
         {
-            var values = ConfigManager.Instance.GetAllValues<PriorBundleConfig>();
+            var values = Config.Instance.GetAllValues<PriorBundleConfig>();
             m_Audios = new List<string>();
             m_Effects = new List<string>();
             m_Scenes = new List<string>();

--
Gitblit v1.8.0