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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OpenServerActivity/OSGiftModel.cs

@@ -103,7 +103,8 @@
            {

                return false;

            }

            var _list = StoreConfig.GetTypeStoreModel((int)StoreFunc.OSGift);

            List<StoreConfig> _list = null;

            StoreConfig.TryGetStoreConfigs((int)StoreFunc.OSGift,out _list);

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

            {

                var _limit = storeModel.GetBuyShopLimit((uint)_list[i].ID);