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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Guard/GuardModel.cs

@@ -130,7 +130,7 @@


        void ParseConfig()

        {

            var config = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("XjmjGuardian");

            var config = Config.Instance.Get<FuncConfigConfig>("XjmjGuardian");

            fairyLandGuardItems.AddRange(ConfigParse.GetMultipleStr<int>(config.Numerical1));

            fairyLandGuardItems.Sort(Compare);

        }