Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-04-17 38dbbe3f7cb862fdf46ba053994bc2419c730ce1

 System/BlastFurnace/GetPetMatPathWin.cs

@@ -66,7 +66,7 @@
        Dictionary<int, int> petSkillDict;

        Dictionary<int, List<int>> mountSkillDict;

        private List<GameObject> tempObjlist = new List<GameObject>();

        PetMatType matType = PetMatType.None;

        PetOrMount matType = PetOrMount.None;

        PetModel petmodel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }

        MountModel mountModel { get { return ModelCenter.Instance.GetModel<MountModel>(); } }



@@ -120,18 +120,18 @@


        private void InitUI()

        {

            matType = PetMatType.None;

            matType = PetOrMount.None;

            petSkillDict = null;

            mountSkillDict = null;

            if (itemPathModel.chinItemModel == null) return;



            if (tipsModel.unlockPetDict.ContainsKey(itemPathModel.chinItemModel.ID))

            {

                matType = PetMatType.Pet;

                matType = PetOrMount.Pet;

            }

            else if (tipsModel.unlockMountDict.ContainsKey(itemPathModel.chinItemModel.ID))

            {

                matType = PetMatType.Mount;

                matType = PetOrMount.Mount;

            }



            tipAlpha.alpha = 0;

@@ -149,11 +149,11 @@
            Dictionary<int, int> itemEffectDict = null;

            switch (matType)

            {

                case PetMatType.Pet:

                case PetOrMount.Pet:

                    PetInfoConfig petInfo = tipsModel.unlockPetDict[itemPathModel.chinItemModel.ID];

                    itemEffectDict = petmodel.GetPetAttrAddDict(petInfo.ID);

                    break;

                case PetMatType.Mount:

                case PetOrMount.Mount:

                    HorseConfig horseConfig = tipsModel.unlockMountDict[itemPathModel.chinItemModel.ID];

                    itemEffectDict = mountModel.GetMountAttrAddDict(horseConfig.HorseID);

                    break;

@@ -208,15 +208,15 @@
        {

            switch (matType)

            {

                case PetMatType.Pet:

                case PetOrMount.Pet:

                    PetInfoConfig petInfo = tipsModel.unlockPetDict[itemPathModel.chinItemModel.ID];

                    petSkillDict = tipsModel.GetPetSkillDict(itemPathModel.chinItemModel.ID);

                    modelShow.SetModelShow(petInfo.ID, ModelShowType.pet, Language.Get("TreasureEffect103"), petInfo.ShowFightPower);

                    modelShow.SetModelShow(petInfo.ID, ModelShowType.Pet, Language.Get("TreasureEffect103"), petInfo.ShowFightPower);

                    break;

                case PetMatType.Mount:

                case PetOrMount.Mount:

                    HorseConfig horseConfig = tipsModel.unlockMountDict[itemPathModel.chinItemModel.ID];

                    mountSkillDict = tipsModel.GetMountSkillDict(itemPathModel.chinItemModel.ID);

                    modelShow.SetModelShow(horseConfig.Model, ModelShowType.mount, Language.Get("TreasureEffect103"), horseConfig.ShowFightPower);

                    modelShow.SetModelShow(horseConfig.Model, ModelShowType.Mount, Language.Get("TreasureEffect103"), horseConfig.ShowFightPower);

                    break;

            }