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/Compose/New/SelectEquipModel.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/Compose/New/SelectEquipModel.cs b/System/Compose/New/SelectEquipModel.cs
index b993e4a..136c51c 100644
--- a/System/Compose/New/SelectEquipModel.cs
+++ b/System/Compose/New/SelectEquipModel.cs
@@ -40,11 +40,11 @@
public int[] noOneKeyPutCondis;
public override void Init()
{
- addonsTypeModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ComposeAddonsType");
- addonsQualityModel = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ComposeAddonsQuality");
+ addonsTypeModel = Config.Instance.Get<FuncConfigConfig>("ComposeAddonsType");
+ addonsQualityModel = Config.Instance.Get<FuncConfigConfig>("ComposeAddonsQuality");
_addonsTypelist = ConfigParse.GetMultipleStr<int>(addonsTypeModel.Numerical1);
_addonsQualitylist = ConfigParse.GetMultipleStr<int>(addonsQualityModel.Numerical1);
- FuncConfigConfig onekeyPut = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("ComposeAutoLimit");
+ FuncConfigConfig onekeyPut = Config.Instance.Get<FuncConfigConfig>("ComposeAutoLimit");
extraOneKeyPutCondis = ConfigParse.GetMultipleStr<int>(onekeyPut.Numerical1);
noOneKeyPutCondis = ConfigParse.GetMultipleStr<int>(onekeyPut.Numerical2);
}
--
Gitblit v1.8.0