From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

---
 System/MainInterfacePanel/FeaturesType2.cs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/System/MainInterfacePanel/FeaturesType2.cs b/System/MainInterfacePanel/FeaturesType2.cs
index c0be9a7..6b7c0a1 100644
--- a/System/MainInterfacePanel/FeaturesType2.cs
+++ b/System/MainInterfacePanel/FeaturesType2.cs
@@ -37,7 +37,7 @@
             {
                 return;
             }
-            m_FunctionName.text = functionForecastConfig.FuncName;
+           
             m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+Language.Get("Z1041");
             bool  Type = false;
             int NeedLv = 0;
@@ -50,9 +50,11 @@
             if (!FuncOpen.Instance.IsFuncOpen(funcId) && Type && NeedLv> playerLv)
             {
                 m_FeaturesTypeIcon.SetSprite("UnKnowIcon");
+                m_FunctionName.text = "?";
             }
             else
             {
+                m_FunctionName.text = functionForecastConfig.FuncName;
                 m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);
             }
             if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.DisplayLevel)

--
Gitblit v1.8.0