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

client_linchunjie

2019-03-14 eedeb8a020fce13e0e63ad7c57adfdff7578e875

 System/Compose/New/ComposeMatCell.cs

@@ -63,21 +63,19 @@
        {

            bool isShowMat = itemId != 0 || itemModel != null ? true : false;

            itemCell.gameObject.SetActive(isShowMat);

            itemCell.cellBtn.RemoveAllListeners();

            itemCell.reducebtn.RemoveAllListeners();

            if (isShowMat)

            {

                if (itemModel != null)

                {

                    itemCell.Init(itemModel);

                    itemCell.cellBtn.AddListener(ClickItemCell);

                    itemCell.button.SetListener(ClickItemCell);

                }

                else

                {



                    ItemCellModel cellModel = new ItemCellModel(itemId);

                    itemCell.Init(cellModel);

                    itemCell.cellBtn.AddListener(ClickItemCell);

                    itemCell.button.SetListener(ClickItemCell);

                }



                switch(matType)

@@ -85,7 +83,7 @@
                    case NeedMatType.unfixedItem:

                    case NeedMatType.addItem:

                        itemCell.reducebtn.gameObject.SetActive(true);

                        itemCell.reducebtn.AddListener(ClickReduce);

                        itemCell.reducebtn.SetListener(ClickReduce);

                        break;

                }

            }