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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OpenServerActivity/OpenServerGiftWin.cs

@@ -90,11 +90,12 @@


        private void Display()

        {

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

            List<StoreConfig> _list = null;

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

            var _index = 0;

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

            {

                var _storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(_list[i].ID);

                var _storeConfig = Config.Instance.Get<StoreConfig>(_list[i].ID);

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

                if (_limit == null || _limit.BuyCnt < _storeConfig.PurchaseNumber[0])

                {