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

client_linchunjie

2018-12-28 e5dbf462d9f1aa233806d506c085fc4166eb30e0

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

 System/Compose/New/ComposeMatCell.cs

@@ -23,6 +23,16 @@
        SelectEquipModel selectModel {get { return ModelCenter.Instance.GetModel<SelectEquipModel>(); }}

        ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }



        private void OnEnable()

        {

            playerPack.ItemCntReduceAct += UpdateItemCount;

        }



        private void OnDisable()

        {

            playerPack.ItemCntReduceAct -= UpdateItemCount;

        }



        public void SetDisplay(ItemCompoundConfig _itemCompound,NeedMatType _matType,bool isLock,string des = "", int _itemId = 0,int _itemIndex = -1)

        {

            this.itemCompound = _itemCompound;

@@ -187,6 +197,18 @@
            WindowCenter.Instance.Open<SelectItemWin>();

        }



        private void UpdateItemCount(PackType type, int index, int id)

        {

            if (itemModel == null) return;

            
            if(itemModel.packType == type 
                && itemModel.itemInfo.ItemPlace == index

                && itemModel.itemId == id)

            {

                ClickReduce();

            }

        }



        private void ClickReduce()

        {

            if (itemModel == null) return;