Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Pet/SkillButtonPet.cs

@@ -21,7 +21,7 @@


        public void SetModel(int skillId, int skillUnlock, bool isUnlock, int petId, SkillType skillType, bool isAll = false)

        {

            SkillConfig skillConfig = ConfigManager.Instance.GetTemplate<SkillConfig>(skillId);

            SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(skillId);

            if (skillConfig == null) return;



            skillIcon.SetSprite(skillConfig.IconName);

@@ -56,14 +56,14 @@
                switch (skillType)

                {

                    case SkillType.PetSkill:

                        PetInfoConfig petInfo = ConfigManager.Instance.GetTemplate<PetInfoConfig>(petId);

                        PetInfoConfig petInfo = Config.Instance.Get<PetInfoConfig>(petId);

                        if (petInfo != null)

                        {

                            str[2] = Language.Get("pet_SkillTipLv", petInfo.Name, skillUnlock);

                        }

                        break;

                    case SkillType.MountSkill:

                        HorseConfig horseInfo = ConfigManager.Instance.GetTemplate<HorseConfig>(petId);

                        HorseConfig horseInfo = Config.Instance.Get<HorseConfig>(petId);

                        if (horseInfo != null)

                        {

                            str[2] = Language.Get("pet_SkillTipLv", horseInfo.Name, skillUnlock);