Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-09 943640960074922031a8b927e30c28951a8433b2

Merge branch 'master' into 3687天赋功能

 System/Skill/TalentSeriesBehaviour.cs

@@ -13,6 +13,7 @@
        [SerializeField] Image m_Icon;

        [SerializeField] Text m_TalentType;

        [SerializeField] Text m_TalentPoint;

        [SerializeField] RectTransform m_ContainerSelect;



        TalentModel model { get { return ModelCenter.Instance.GetModel<TalentModel>(); } }



@@ -31,7 +32,7 @@


        public void Display()

        {

            m_Button.image.SetSprite(talentSeries == model.selectSeries ? "Title_TabRight" : "Title_TabDark");

            m_ContainerSelect.gameObject.SetActive(talentSeries == model.selectSeries);

            m_TalentType.text = Language.Get(StringUtility.Contact("TalentBtnSeries_", talentSeries));



            DisplayTalentPoint();

@@ -64,7 +65,7 @@


        private void OnSelectSeriesEvent()

        {

            m_Button.image.SetSprite(talentSeries == model.selectSeries ? "Title_TabRight" : "Title_TabDark");

            m_ContainerSelect.gameObject.SetActive(talentSeries == model.selectSeries);

        }



        private void OnSelectTalentTypeEvnet()