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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

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