Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 406e6d485ce67acb8667c5e72eb858644d8efdbf

 System/Pet/PetAttributeMethods.cs

@@ -187,6 +187,21 @@
        {

            int skillIdIndex = cell.index;

            SkillButtonPet skillButton = cell.transform.GetComponent<SkillButtonPet>();

            UIEffect uie = cell.transform.GetComponent<UIEffect>();

            if (petmodel.ListEffectSkill.Contains(curPetSkillIds[skillIdIndex]))

            {

                if (!uie.IsPlaying)

                {

                    uie.Play();

                }

            }

            else

            {

                if (uie.IsPlaying)

                {

                    uie.Stop();

                }

            }

            if (petmodel._DicPetBack.ContainsKey(petInfoConfig.ID))

            {

                PetBackpack _PetBackpack = petmodel._DicPetBack[petInfoConfig.ID];