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/SystemSetting/ActivitiesPushMgr.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/SystemSetting/ActivitiesPushMgr.cs b/System/SystemSetting/ActivitiesPushMgr.cs
index 1dc3b54..74d62e6 100644
--- a/System/SystemSetting/ActivitiesPushMgr.cs
+++ b/System/SystemSetting/ActivitiesPushMgr.cs
@@ -17,7 +17,7 @@
public override void Init()
{
- List<OSCBillRankAwardConfig> configs = ConfigManager.Instance.GetAllValues<OSCBillRankAwardConfig>();
+ List<OSCBillRankAwardConfig> configs = Config.Instance.GetAllValues<OSCBillRankAwardConfig>();
for(int i = 0; i < configs.Count; i++)
{
if(!rankTypelist.Contains(configs[i].RangListType))
--
Gitblit v1.8.0