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

client_linchunjie

2018-08-20 8475d4589859b58e2a38f1f54ed43505dc1c50a5

 System/KnapSack/Logic/EquipTip.cs

@@ -179,7 +179,8 @@
            yield return null;

            if(itemAttrData.isCompare)

            {

                if (itemAttrData.packType != PackType.rptEquip)

                if (itemAttrData.packType != PackType.rptEquip

                    && itemAttrData.packType != PackType.rptDogzEquip)

                {

                    itemTipsModel.SetCurTips(this.GetComponent<RectTransform>());

                }

@@ -205,7 +206,8 @@
            ItemCellModel cellModel = new ItemCellModel(itemAttrData.itemId,itemAttrData.isPreview, (ulong)itemAttrData.count, itemAttrData.isBind,

                itemAttrData.guid,itemAttrData.packType,itemAttrData.isCompare, itemAttrData.useDataDict);

            itemCell.Init(cellModel);

            if(itemAttrData.packType == PackType.rptEquip)

            if(itemAttrData.packType == PackType.rptEquip

                || itemAttrData.packType == PackType.rptDogzEquip)

            {

                putOnIcon.SetActive(true);

            }

@@ -262,7 +264,8 @@


            if (itemAttrData.isCompare)

            {

                if(itemAttrData.packType != PackType.rptEquip)

                if(itemAttrData.packType != PackType.rptEquip

                    && itemAttrData.packType != PackType.rptDogzEquip)

                {

                    CreateFuncBtn();

                }