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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Debug/DebugController.cs

@@ -74,7 +74,7 @@
            var list = model.GetCTGConfigs(VersionConfig.Get().appId);

            for (int i = 0; i < list.Count; i++)

            {

                var config = ConfigManager.Instance.GetTemplate<CTGConfig>(list[i]);

                var config = Config.Instance.Get<CTGConfig>(list[i]);

                if (config.PayType == 4)

                {

                    model.CTG(config.RecordID);