3687 天赋功能

client_linchunjie

2018-09-25 b0511035e15dd4f65979f84e95d806a07e57d506

3687 天赋功能

 System/Skill/TalentSeriesBehaviour.cs

File was renamed from System/Skill/TalentButtonBehaviour.cs
@@ -6,9 +6,9 @@


namespace Snxxz.UI

{

    public class TalentButtonBehaviour : MonoBehaviour

    public class TalentSeriesBehaviour : MonoBehaviour

    {

        [SerializeField] int talentType;

        [SerializeField] int talentSeries;

        [SerializeField] Button m_Button;

        [SerializeField] Image m_Icon;

        [SerializeField] Text m_TalentType;

@@ -20,14 +20,14 @@


        private void Awake()

        {

            m_Button.onClick.AddListener(SelectType);

            m_Button.onClick.AddListener(SelectSeries);

        }



        private void SelectType()

        private void SelectSeries()

        {

            if (talentType != 0)

            if (talentSeries != 0)

            {

                model.selectTalentType = talentType;

                model.selectSeries = talentSeries;

            }

        }



@@ -46,7 +46,7 @@


        private void OnSelectTalentTypeEvnet()

        {

            m_Button.image.SetSprite(talentType == model.selectTalentType ? "Title_TabRight" : "Title_TabDark");

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

        }

    }

}

 System/Skill/TalentSeriesBehaviour.cs.meta

 System/Skill/TalentTreeBehaviour.cs

File was deleted

 System/Skill/TalentTreeBehaviour.cs.meta

File was deleted

 System/Skill/TalentTreeBehaviourPattern1.cs

File was deleted

 System/Skill/TalentTreeBehaviourPattern1.cs.meta

File was deleted

 System/Skill/TalentTreeScriptable.cs

@@ -36,6 +36,7 @@
                return this.job == job && this.talentType == talentType && this.talentSeries == talentSeries;

            }

        }



        [Serializable]

        public struct TalentElement

        {


 System/Skill/TalentWin.cs

@@ -14,11 +14,15 @@


    public class TalentWin : Window

    {

        [SerializeField] TalentButtonBehaviour[] m_TalentButtons;

        [SerializeField] TalentTreeBehaviour[] m_TalentTrees;

        [SerializeField] TalentSeriesBehaviour[] m_TalentSeries;

        [SerializeField] TalentTreeScriptable[] m_TalentConfigs;

        [SerializeField] RectTransform m_ContainerSelect;

        [SerializeField] Button m_TalentSeriesSelect;

        [SerializeField] Text m_TalentSeries;

        [SerializeField] Button m_TalentTypeSelect;

        [SerializeField] Text m_TalentType;



        [SerializeField] TalentSkillBehaviour[] m_TalentSkills;

        [SerializeField] Image[] m_Arrows;



        [SerializeField] RectTransform m_ContainerSelectSkill;

        [SerializeField] Image m_SelectSkillIcon;

        [SerializeField] Text m_SelectSkillLevel;

@@ -43,7 +47,7 @@


        protected override void AddListeners()

        {

            m_TalentSeriesSelect.onClick.AddListener(TalentSelectSeries);

            m_TalentTypeSelect.onClick.AddListener(SelectTalentType);

            m_ResetPoint.onClick.AddListener(ResetPoint);

            m_AddPoint.onClick.AddListener(AddPoint);

        }

@@ -71,13 +75,9 @@
            model.OnSelectSkillEvent -= OnSelectSkillEvent;

            model.talentSkillUpdate -= TalentSkillUpdate;

            model.talentPointUpdate -= TalentPointUpdate;

            for (int i = 0; i < m_TalentButtons.Length; i++)

            for (int i = 0; i < m_TalentSeries.Length; i++)

            {

                m_TalentButtons[i].Dispose();

            }

            for (int i = 0; i < m_TalentTrees.Length; i++)

            {

                m_TalentTrees[i].Dispose();

                m_TalentSeries[i].Dispose();

            }

        }



@@ -88,9 +88,9 @@


        void Display()

        {

            for (int i = 0; i < m_TalentButtons.Length; i++)

            for (int i = 0; i < m_TalentSeries.Length; i++)

            {

                m_TalentButtons[i].Display(model.selectSeries);

                m_TalentSeries[i].Display(model.selectSeries);

            }



            DisplaySkills();

@@ -101,20 +101,7 @@


        void DisplaySkills()

        {

            var job = PlayerDatas.Instance.baseData.Job;

            for (int i = 0; i < m_TalentTrees.Length; i++)

            {

                m_TalentTrees[i].Dispose();

                if (m_TalentTrees[i].BelongToTalentTree(job, model.selectSeries, model.selectTalentType))

                {

                    m_TalentTrees[i].gameObject.SetActive(true);

                    m_TalentTrees[i].Display(model.selectSeries, model.selectTalentType);

                }

                else

                {

                    m_TalentTrees[i].gameObject.SetActive(false);

                }

            }

            
        }



        void DisplaySeries()

@@ -123,7 +110,7 @@
            point += model.GetTalentTypeTotalPoint(model.selectSeries, 1);

            point += model.GetTalentTypeTotalPoint(model.selectSeries, 2);

            point += model.GetTalentTypeTotalPoint(model.selectSeries, 3);

            m_TalentSeries.text = model.selectSeries == 1 ? string.Format("智力天赋({0})", point) : string.Format("力量天赋({0})", point);

            m_TalentType.text = model.selectSeries == 1 ? string.Format("智力天赋({0})", point) : string.Format("力量天赋({0})", point);

        }



        void DisplaySelectSkill()

@@ -214,6 +201,20 @@
            }

        }



        bool TryGetTalentConfig(out TalentTreeScriptable config)

        {

            config = null;

            for (int i = 0; i < m_TalentConfigs.Length; i++)

            {

                if (m_TalentConfigs[i].Belong(PlayerDatas.Instance.baseData.Job, model.selectTalentType, model.selectSeries))

                {

                    config = m_TalentConfigs[i];

                    return true;

                }

            }

            return false;

        }



        void DisplayTalentPoint()

        {

            m_SurplusPoint.text = model.talentPoint.ToString();

@@ -250,9 +251,9 @@
            DisplaySelectSkill();

        }



        private void TalentSelectSeries()

        private void SelectTalentType()

        {

            model.selectSeries = model.selectSeries == 1 ? 2 : 1;

            model.selectTalentType = model.selectTalentType == 1 ? 2 : 1;

        }



        private void AddPoint()