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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OffLineTime/OffLineTimeLackBehaviour.cs

@@ -49,7 +49,7 @@
            }

            else

            {

                var config = ConfigManager.Instance.GetTemplate<StoreConfig>(152);

                var config = Config.Instance.Get<StoreConfig>(152);

                storeModel.OnClickShopCell(config);

            }