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

Client_PangDeRong

2018-08-23 85448a839d432aab4220e6b23e55a0270e007b6f

 System/KnapSack/Logic/EquipTip.cs

@@ -827,7 +827,10 @@
        {

            if(itemAttrData.packType != PackType.rptDogzItem && itemAttrData.packType != PackType.rptDogzEquip)

            {

                dogzEquipDesText.gameObject.SetActive(false);

                if (dogzEquipDesText != null)

                {

                    dogzEquipDesText.gameObject.SetActive(false);

                }

                if (itemAttrData.itemConfig.Description == "" || string.IsNullOrEmpty(itemAttrData.itemConfig.Description))

                {

                    equipSourceNormal.gameObject.SetActive(true);

@@ -849,8 +852,11 @@
                equipSourceNormal.gameObject.SetActive(false);

                equipSourceDes.gameObject.SetActive(false);

                equipSourceText.gameObject.SetActive(false);

                dogzEquipDesText.gameObject.SetActive(true);

                dogzEquipDesText.text = itemAttrData.itemConfig.Description;

                if (dogzEquipDesText != null)

                {

                    dogzEquipDesText.gameObject.SetActive(true);

                    dogzEquipDesText.text = itemAttrData.itemConfig.Description;

                }

            }

           

        }