Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/Skill/TalentModel.cs

@@ -63,6 +63,7 @@
        public event Action selectSkillEvent;

        public event Action talentPointUpdate;

        public event Action<int> talentSkillUpdate;

        public event Action<int> talentSkillLevelUp;



        public override void Init()

        {

@@ -336,10 +337,18 @@
            if (talentSkills.ContainsKey(config.SkillTypeID))

            {

                var talentSkill = talentSkills[config.SkillTypeID];

                bool levelUp = talentSkill.level < config.SkillLV;

                talentSkill.level = config.SkillLV;

                if (talentSkillUpdate != null)

                {

                    talentSkillUpdate(config.SkillTypeID);

                }

                if (levelUp && serverInited)

                {

                    if (talentSkillLevelUp != null)

                    {

                        talentSkillLevelUp(config.SkillTypeID);

                    }

                }

            }

        }

@@ -406,14 +415,7 @@


        public TalentConfig GetTalentConfig(int level = 0)

        {

            if (level > 0)

            {

                return Config.Instance.Get<TalentConfig>(skillId + level - 1);

            }

            else

            {

                return Config.Instance.Get<TalentConfig>(skillId + level);

            }

            return Config.Instance.Get<TalentConfig>(skillId);

        }

    }