From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/OpenServerActivity/OpenServerGiftWin.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerGiftWin.cs b/System/OpenServerActivity/OpenServerGiftWin.cs
index a883721..274d5e4 100644
--- a/System/OpenServerActivity/OpenServerGiftWin.cs
+++ b/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])
{
--
Gitblit v1.8.0