Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-10 c6bc396fe264cd53ba594e7430011c623cc26c4a

 System/OpenServerActivity/OpenServerActivityCell.cs

@@ -43,7 +43,7 @@
        public void ChangeState(TitleBtnState _state)

        {

            m_Icon.SetSprite(alternativeConfig.GetIconKey(_state));

            m_Title.color = alternativeConfig.GetFontColor(_state);

            //m_Title.color = alternativeConfig.GetFontColor(_state);

            m_Title.fontSize = alternativeConfig.GetFontSize(_state);

        }

    }