Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/MainInterfacePanel/FeaturesType1.cs

@@ -38,7 +38,7 @@
            {

                return;

            }

            m_FunctionName.text = functionForecastConfig.FuncName;

           
            m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+ Language.Get("Z1041");



            bool Type = false;

@@ -51,10 +51,12 @@
            }

            if (!FuncOpen.Instance.IsFuncOpen(funcId) && Type && NeedLv > playerLv)

            {

                m_FunctionName.text = "?";

                m_FeaturesTypeIcon.SetSprite("UnKnowIcon");

            }

            else

            {

                m_FunctionName.text = functionForecastConfig.FuncName;

                m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);

            }