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/MainInterfacePanel/PlayerMainDate.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/MainInterfacePanel/PlayerMainDate.cs b/System/MainInterfacePanel/PlayerMainDate.cs
index 9b145d8..e49ebe1 100644
--- a/System/MainInterfacePanel/PlayerMainDate.cs
+++ b/System/MainInterfacePanel/PlayerMainDate.cs
@@ -111,12 +111,12 @@
         ElectricQuantity = SDKUtility.Instance.BatteryLevel * 0.01f;
         if (GetCurrencyItemID.Count <= 0)
         {
-            string str = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MoneyDisplayModel").Numerical1;
+            string str = Config.Instance.Get<FuncConfigConfig>("MoneyDisplayModel").Numerical1;
             GetCurrencyItemID = ConfigParse.GetDic<int, int>(str);
 
         }
         OneKeyList.Clear();
-        var funconfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OneKeyBtnMap");
+        var funconfig = Config.Instance.Get<FuncConfigConfig>("OneKeyBtnMap");
         int[] Listmap = ConfigParse.GetMultipleStr<int>(funconfig.Numerical1);
         for (int i = 0; i < Listmap.Length; i++)
         {

--
Gitblit v1.8.0