Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-11 15c103c6dcfbfd9d96a5602e6a3ba90032f1eb06

 System/Skill/TalentModel.cs

@@ -82,6 +82,16 @@
        public void OnPlayerLoginOk()

        {

            serverInited = true;

            if (WindowCenter.Instance.IsOpen<TalentWin>())

            {

                foreach (var talent in talentSkills.Values)

                {

                    if (talentSkillUpdate != null)

                    {

                        talentSkillUpdate(talent.skillId);

                    }

                }

            }

            UpdateRedpoint();

        }



@@ -207,7 +217,7 @@


        public int GetSeriesPoint(int talentType,int talentSeries)

        {

            var job = (int)Math.Pow(PlayerDatas.Instance.baseData.Job, 2);

            var job = PlayerDatas.Instance.baseData.Job;

            List<int> list;

            var point = 0;

            if (TryGetTalents(job, talentType, talentSeries, out list))

@@ -305,6 +315,10 @@
        public void UpdateTalentSkill(int _oldSkillId, int _newSkillId)

        {

            var config = Config.Instance.Get<SkillConfig>(_newSkillId);

            if (config == null)

            {

                return;

            }

            if (talentSkills.ContainsKey(config.SkillTypeID))

            {

                var talentSkill = talentSkills[config.SkillTypeID];

@@ -315,6 +329,24 @@
                }

            }

        }



        public void DeleteTalentSkill(int _skillId)

        {

            var config = Config.Instance.Get<SkillConfig>(_skillId);

            if (config == null)

            {

                return;

            }

            if (talentSkills.ContainsKey(config.SkillTypeID))

            {

                var talentSkill = talentSkills[config.SkillTypeID];

                talentSkill.level = 0;

                if (talentSkillUpdate != null)

                {

                    talentSkillUpdate(config.SkillTypeID);

                }

            }

        }

        #endregion



        #region 红点