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/OpenServerRedEnvelopeWin.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs b/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
index 8f50526..415c988 100644
--- a/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
+++ b/System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
@@ -209,7 +209,7 @@
model.m_OSRedAchieves.Sort(model.CompareAchievement);
for (int i = 0; i < model.m_OSRedAchieves.Count; i++)
{
- var _cfg = ConfigManager.Instance.GetTemplate<OSRedAchieveConfig>(model.m_OSRedAchieves[i]);
+ var _cfg = Config.Instance.Get<OSRedAchieveConfig>(model.m_OSRedAchieves[i]);
if (_cfg.func == 0 || FuncOpen.Instance.IsFuncOpen(_cfg.func))
{
m_RedAchieveControl.AddCell(ScrollerDataType.Header, i);
--
Gitblit v1.8.0