Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/BlastFurnace/GetEquipPathWin.cs

@@ -454,6 +454,9 @@
                    case 12:

                        legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 11:

                        legendCntPreview.text = itemTipsModel.GetWingsLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

@@ -472,10 +475,28 @@


        private void SetGemAttrUI()

        {

            if (itemAttrData.itemConfig.LV < itemTipsModel.gemOpenLvs[0])

            switch ((RoleEquipType)itemAttrData.itemConfig.EquipPlace)

            {

                gemAttr.SetActive(false);

                return;

                case RoleEquipType.retWeapon:

                case RoleEquipType.retWeapon2:

                case RoleEquipType.retHat:

                case RoleEquipType.retClothes:

                case RoleEquipType.retBelt:

                case RoleEquipType.retTrousers:

                case RoleEquipType.retShoes:

                case RoleEquipType.retNeck:

                case RoleEquipType.retFairyCan:

                case RoleEquipType.retFairyCan2:

                case RoleEquipType.retSpiritAnimal:

                    if (itemAttrData.itemConfig.LV < itemTipsModel.gemOpenLvs[0])

                    {

                        gemAttr.SetActive(false);

                        return;

                    }

                    break;

                case RoleEquipType.retWing:

                    gemAttr.SetActive(false);

                    return;

            }

            gemAttr.SetActive(true);

            gemTitleText.text = Language.Get("EquipWin_GemPropObj_Text_1");