3687 天赋功能

client_linchunjie

2018-09-26 0d1dd516489117a01fc5562e190cb063d9f24eb1

3687 天赋功能

 Core/GameEngine/Model/Config/TalentConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, September 25, 2018
//    [  Date ]:           Wednesday, September 26, 2018
//--------------------------------------------------------

using UnityEngine;
@@ -13,10 +13,7 @@

        public int skillId { get ; private set ; }

        public int type { get ; private set ; }

        public int series { get ; private set ; }

        public int level { get ; private set ; }

        public int requireSeries { get ; private set ; }

        public int requireSeriesPoint { get ; private set ; }
        public int series { get ; private set ; }

        public override string getKey()
        {
@@ -30,13 +27,7 @@
            

                type=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 

            

                series=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
			
                level=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; 
			
                requireSeries=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; 
			
                requireSeriesPoint=IsNumeric(rawContents[5]) ? int.Parse(rawContents[5]):0; 
                series=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; 
            }
            catch (Exception ex)
            {

 Core/GameEngine/Model/Config/TalentConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 86eb4a564c7dcb047bb4509cf2e2758a
timeCreated: 1537873567
timeCreated: 1537942940
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Skill/TalentModel.cs

@@ -180,15 +180,15 @@
                    return false;

                }

                var talentConfig = talent.GetTalentConfig(talent.level + 1);

                if (talentConfig.requireSeriesPoint != 0)

                var skillConfig = talent.GetSkillConfig(talent.level + 1);

                if (skillConfig.LearnSkillPointReq != 0)

                {

                    if (GetSeriesPoint(talentConfig.type, talentConfig.requireSeries) < talentConfig.requireSeriesPoint)

                    if (GetSeriesPoint(talentConfig.type, 1) < skillConfig.LearnSkillPointReq)

                    {

                        error = 4;

                        return false;

                    }

                }

                var skillConfig = talent.GetSkillConfig(talent.level + 1);

                if (skillConfig.LearnSkillReq != 0)

                {

                    TalentSkill learnTalent;


 System/Skill/TalentWin.cs

@@ -19,6 +19,7 @@
        [SerializeField] RectTransform m_ContainerSelect;

        [SerializeField] Button m_TalentTypeSelect;

        [SerializeField] Text m_TalentType;

        [SerializeField] Text m_TalentTitle;



        [SerializeField] ScrollRect m_Scroller;

        [SerializeField] TalentSkillBehaviour[] m_TalentSkills;

@@ -168,14 +169,15 @@


        void DisplayTalentType()

        {

            var point = model.GetTalentTypePoint(model.selectTalentType);

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

            var point = model.GetTalentTypePoint(model.selectTalentType == 1 ? 2 : 1);

            var job = PlayerDatas.Instance.baseData.Job;

            var talentTypeDisplay = Language.Get(StringUtility.Contact("TalentType_", job, "_", model.selectTalentType == 1 ? 2 : 1));

            m_TalentType.text = StringUtility.Contact(talentTypeDisplay, "（", point, "）");

            //m_TalentTitle.text = Language.Get(StringUtility.Contact("TalentType_", job, "_", model.selectTalentType));

        }



        void DisplaySelectSkill()

        {

            m_ContainerSelect.gameObject.SetActive(false);



            DisplaySkillInfo();

            DisplayConditions();

            DisplaySkillEffect();

@@ -191,10 +193,10 @@
                var skillConfig = talent.GetSkillConfig(talent.level + 1);

                if (talentConfig != null)

                {

                    if (talentConfig.requireSeriesPoint != 0 && index < m_SelectConditions.Length)

                    if (skillConfig.LearnSkillPointReq != 0 && index < m_SelectConditions.Length)

                    {

                        m_SelectConditions[index].gameObject.SetActive(true);

                        m_SelectConditions[index].text = StringUtility.Contact(0, "/", talentConfig.requireSeriesPoint);

                        m_SelectConditions[index].text = StringUtility.Contact(0, "/", skillConfig.LearnSkillPointReq);

                        index++;

                    }

                }

@@ -295,6 +297,7 @@
            model.selectSeries = 1;

            DisplaySkills();

            DisplaySelectSkill();

            DisplayTalentType();

        }



        private void OnSelectSeriesEvent()