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/SignInModel.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/Welfare/SignInModel.cs b/System/Welfare/SignInModel.cs
index ca4bed4..b401c8c 100644
--- a/System/Welfare/SignInModel.cs
+++ b/System/Welfare/SignInModel.cs
@@ -22,7 +22,7 @@
{
if (m_signAwardList == null)
{
- m_signAwardList = ConfigManager.Instance.GetAllValues<SignInConfig>();
+ m_signAwardList = Config.Instance.GetAllValues<SignInConfig>();
}
return m_signAwardList;
}
@@ -35,7 +35,7 @@
{
if (m_ctnSignList == null)
{
- m_ctnSignList = ConfigManager.Instance.GetAllValues<ContinueSignInConfig>();
+ m_ctnSignList = Config.Instance.GetAllValues<ContinueSignInConfig>();
}
return m_ctnSignList;
}
@@ -50,7 +50,7 @@
{
if (m_ctnSignJade == -1)
{
- FuncConfigConfig cfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SignConsumption");
+ FuncConfigConfig cfg = Config.Instance.Get<FuncConfigConfig>("SignConsumption");
if (cfg != null)
{
m_ctnSignJade = int.Parse(cfg.Numerical1);
@@ -135,7 +135,7 @@
public Dictionary<int, List<int>> m_ContinueJobItems = new Dictionary<int, List<int>>();
void ParseConfig()
{
- var _cfgs = ConfigManager.Instance.GetAllValues<ContinueSignInConfig>();
+ var _cfgs = Config.Instance.GetAllValues<ContinueSignInConfig>();
for (int i = 0; i < _cfgs.Count; i++)
{
var _cfg = _cfgs[i];
--
Gitblit v1.8.0