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

client_Hale

2019-04-17 38dbbe3f7cb862fdf46ba053994bc2419c730ce1

 System/Store/Logic/BuyPetMatInfoWin.cs

@@ -94,7 +94,7 @@


        Color32 conditionColor = new Color32(255, 244, 205, 255);

        Color32 conditionRedColor = new Color32(255, 1, 1, 255);

        PetMatType matType = PetMatType.None;

        PetOrMount matType = PetOrMount.None;



        protected override void BindController()

        {

@@ -140,16 +140,16 @@
        {

            petSkillDict = null;

            mountSkillDict = null;

            matType = PetMatType.None;

            matType = PetOrMount.None;

            if (itemTipsModel.curAttrData == null) return;



            if (itemTipsModel.unlockPetDict.ContainsKey(itemTipsModel.curAttrData.itemId))

            {

                matType = PetMatType.Pet;

                matType = PetOrMount.Pet;

            }

            else if (itemTipsModel.unlockMountDict.ContainsKey(itemTipsModel.curAttrData.itemId))

            {

                matType = PetMatType.Mount;

                matType = PetOrMount.Mount;

            }



            SetTopUI();

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

            switch (matType)

            {

                case PetMatType.Pet:

                case PetOrMount.Pet:

                    PetInfoConfig petInfo = itemTipsModel.unlockPetDict[itemTipsModel.curAttrData.itemId];

                    itemEffectDict = petmodel.GetPetAttrAddDict(petInfo.ID);

                    break;

                case PetMatType.Mount:

                case PetOrMount.Mount:

                    HorseConfig horseConfig = itemTipsModel.unlockMountDict[itemTipsModel.curAttrData.itemId];

                    itemEffectDict = mountModel.GetMountAttrAddDict(horseConfig.HorseID);

                    break;

@@ -221,15 +221,15 @@
        {

            switch (matType)

            {

                case PetMatType.Pet:

                case PetOrMount.Pet:

                    PetInfoConfig petInfo = itemTipsModel.unlockPetDict[itemTipsModel.curAttrData.itemId];

                    petSkillDict = itemTipsModel.GetPetSkillDict(itemTipsModel.curAttrData.itemId);

                    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 = itemTipsModel.unlockMountDict[itemTipsModel.curAttrData.itemId];

                    mountSkillDict = itemTipsModel.GetMountSkillDict(itemTipsModel.curAttrData.itemId);

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

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

                    break;

            }