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/FunctionForecastTip.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/FunctionForecastTip.cs b/System/MainInterfacePanel/FunctionForecastTip.cs
index 8f8bf16..af89cac 100644
--- a/System/MainInterfacePanel/FunctionForecastTip.cs
+++ b/System/MainInterfacePanel/FunctionForecastTip.cs
@@ -43,7 +43,7 @@
private void OnFuncStateChangeEvent(int obj)
{
- var config = ConfigManager.Instance.GetTemplate<FunctionForecastConfig>(obj);
+ var config = Config.Instance.Get<FunctionForecastConfig>(obj);
if (config != null)
{
DataAssignment();
@@ -65,7 +65,7 @@
_FunctionForecastPanel.gameObject.SetActive(false);
}
- var configs = ConfigManager.Instance.GetAllValues<FunctionForecastConfig>();
+ var configs = Config.Instance.GetAllValues<FunctionForecastConfig>();
foreach (var config in configs)
{
if (!FuncOpen.Instance.IsFuncOpen(config.FuncId)
@@ -87,15 +87,15 @@
void OpenPanel(int ID)
{
_FunctionForecastPanel.gameObject.SetActive(true);
- _FunctionIcon.SetSprite(ConfigManager.Instance.GetTemplate<FunctionForecastConfig>(ID).FuncIconKey);
- _NameText.text = ConfigManager.Instance.GetTemplate<FunctionForecastConfig>(ID).Describe;
- FuncOpenLVConfig funcoPenConfig = ConfigManager.Instance.GetTemplate<FuncOpenLVConfig>(ID);
+ _FunctionIcon.SetSprite(Config.Instance.Get<FunctionForecastConfig>(ID).FuncIconKey);
+ _NameText.text = Config.Instance.Get<FunctionForecastConfig>(ID).Describe;
+ FuncOpenLVConfig funcoPenConfig = Config.Instance.Get<FuncOpenLVConfig>(ID);
if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID!=0)
{
if (funcoPenConfig.LimitMagicWeapon != 0)
{
int faBaoID = funcoPenConfig.LimitMagicWeapon / 100;
- TreasureConfig treasure = ConfigManager.Instance.GetTemplate<TreasureConfig>(faBaoID);
+ TreasureConfig treasure = Config.Instance.Get<TreasureConfig>(faBaoID);
_Information.text = string.Format(Language.Get("FuncFBOpen"), treasure.Name);
return;
}
--
Gitblit v1.8.0