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/Welfare/LevelGiftModel.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/System/Welfare/LevelGiftModel.cs b/System/Welfare/LevelGiftModel.cs
index 9edf458..49fbb1d 100644
--- a/System/Welfare/LevelGiftModel.cs
+++ b/System/Welfare/LevelGiftModel.cs
@@ -49,7 +49,7 @@
         {
             levelGiftItemDict = new Dictionary<int, ImpactRankModel.RankAwardItem>();
             m_VipItemDict = new Dictionary<int, VIPAward>();
-            var _cfgs = ConfigManager.Instance.GetAllValues<LVAawrdConfig>();
+            var _cfgs = Config.Instance.GetAllValues<LVAawrdConfig>();
             for (int i = 0; i < _cfgs.Count; i++)
             {
                 var _json = LitJson.JsonMapper.ToObject(_cfgs[i].Reward);
@@ -103,7 +103,7 @@
 
         public bool IsGet(int _id)
         {
-            var _cfgs = ConfigManager.Instance.GetAllValues<LVAawrdConfig>();
+            var _cfgs = Config.Instance.GetAllValues<LVAawrdConfig>();
             var _index = _cfgs.FindIndex((x) =>
             {
                 return x.RewardID == _id;
@@ -117,7 +117,7 @@
 
         public bool IsVipGet(int _id)
         {
-            var _cfgs = ConfigManager.Instance.GetAllValues<LVAawrdConfig>();
+            var _cfgs = Config.Instance.GetAllValues<LVAawrdConfig>();
             var _index = _cfgs.FindIndex((x) =>
             {
                 return x.RewardID == _id;
@@ -160,7 +160,7 @@
         public void TryGetLevelGift(out int _index)
         {
             _index = 0;
-            var _cfgs = ConfigManager.Instance.GetAllValues<LVAawrdConfig>();
+            var _cfgs = Config.Instance.GetAllValues<LVAawrdConfig>();
             for (int i = 0; i < _cfgs.Count; i++)
             {
                 var _cfg = _cfgs[i];
@@ -200,7 +200,7 @@
         public void UpdateRedpoint()
         {
             redpoint.state = RedPointState.None;
-            var _cfgs = ConfigManager.Instance.GetAllValues<LVAawrdConfig>();
+            var _cfgs = Config.Instance.GetAllValues<LVAawrdConfig>();
             for (int i = 0; i < _cfgs.Count; i++)
             {
                 var _cfg = _cfgs[i];

--
Gitblit v1.8.0