Merge branch 'master' into DogzDungeon

client_Wu Xijin

2018-08-20 406e6d485ce67acb8667c5e72eb858644d8efdbf

 System/Mount/MountPanelAssignment.cs

@@ -447,6 +447,22 @@
                        Skillimage[i].SetActive(true);

                    }

                    GroupSkill.GetChild(i).gameObject.SetActive(true);

                    UIEffect uie = GroupSkill.GetChild(i).GetComponent<UIEffect>();

                    if (mountModel.ListEffectSkill.Contains(MountSkills[i].SkillID))

                    {

                        if (!uie.IsPlaying)

                        {

                            uie.Play();

                        }

                    }

                    else

                    {

                        if (uie.IsPlaying)

                        {

                            uie.Stop();

                        }



                    }

                    SkillButtonPet mountSkill = GroupSkill.GetChild(i).gameObject.GetComponent<SkillButtonPet>();

                    int curMountLv = 0;

                    if (mountModel._DicHorse.ContainsKey(MountSkills[i].HorseID))