Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Pet/RidingAndPetActivationWin.cs

@@ -155,7 +155,7 @@
            HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);

            int InitFightPower = 0;

            InitFightPower += Horseconfig.InitFightPower;

            UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);

            UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);

            MountSkills.Clear();

            foreach (var key in mountModel.GetMountSkillAndItem.Keys)

            {

@@ -228,7 +228,7 @@
            HorseConfig Horseconfig = Config.Instance.Get<HorseConfig>(ActivateID);

            int InitFightPower = 0;

            InitFightPower += Horseconfig.InitFightPower;

            UI3DModelExhibition.Instance.BeginShowHourse(Horseconfig.Model, m_RawImageMount);

            UI3DModelExhibition.Instance.ShowHourse(Horseconfig.Model, m_RawImageMount);

            MountSkills.Clear();

            foreach (var key in mountModel.GetMountSkillAndItem.Keys)

            {

@@ -267,7 +267,7 @@
            m_RawImagePet.gameObject.SetActive(true);

            m_RawImageMount.gameObject.SetActive(false);

            var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);

            UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);

            int InitFightPower = int.Parse(petInfoConfig.InitFightPower);

            string StrPetSkill = petInfoConfig.SkillID;

@@ -317,7 +317,7 @@
            m_RawImageMount.gameObject.SetActive(false);



            var npcConfig = Config.Instance.Get<NPCConfig>(ActivateID);

            UI3DModelExhibition.Instance.BeginShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            UI3DModelExhibition.Instance.ShowNPC(ActivateID, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, m_RawImagePet);

            // StartCoroutine("FrameDelay");

            PetInfoConfig petInfoConfig = Config.Instance.Get<PetInfoConfig>(ActivateID);

            int InitFightPower = int.Parse(petInfoConfig.InitFightPower);