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/HighSettingTip.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index bd14564..cb10cfa 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -65,7 +65,7 @@
public void Init()
{
- swicthCdTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);
+ swicthCdTime = int.Parse(Config.Instance.Get<FuncConfigConfig>("AutomaticSwitch").Numerical1);
OpenServerActivityStateChange();
m_RechargetBtnBehaviour.Init();
m_HighSettingFadeInFadeOut.Init();
@@ -397,7 +397,7 @@
private void RefreshStoreEffect()
{
storeDesBtn.gameObject.SetActive(false);
- int limitLv = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MallPush").Numerical1);
+ int limitLv = int.Parse(Config.Instance.Get<FuncConfigConfig>("MallPush").Numerical1);
if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store)
|| PlayerDatas.Instance.baseData.LV < limitLv)
return;
--
Gitblit v1.8.0