4800 【前端】【1.3】集市上架界面不显示不可上架的道具

client_linchunjie

2018-11-16 afdc785c7facc04369efde1f636da1004791cde6

4800 【前端】【1.3】集市上架界面不显示不可上架的道具

 System/Market/MarketPutawayWin.cs

@@ -17,42 +17,29 @@


    public class MarketPutawayWin : Window

    {

        [SerializeField] ScrollerController putawayItemCtrl;

        [SerializeField] ScrollerController bagItemCtrl;

        [SerializeField] ScrollerController m_PutawayController;

        [SerializeField] ScrollerController m_BagItemController;



        [SerializeField] RectTransform m_NotItemPutTip;

        [SerializeField] RectTransform m_ContainerEmptyItem;



        MarketModel m_Model = null;

        MarketModel model

        {

            get

            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<MarketModel>());

            }

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

        }



        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel

        PlayerPackModel packModel

        {

            get

            {

                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }



        PlayerPackModel m_PackModel;

        PlayerPackModel PackModel

        {

            get { return m_PackModel ?? (m_PackModel = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

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

        }





        #region Built-in

        protected override void BindController()

        {

            putawayItemCtrl.OnRefreshCell += OnRefreshPutawayItemCell;

            bagItemCtrl.OnRefreshCell += OnRefreshBagItemCell;

            bagItemCtrl.lockType = EnhanceLockType.KeepVertical;

            m_PutawayController.OnRefreshCell += OnRefreshPutawayItemCell;

            m_BagItemController.OnRefreshCell += OnRefreshBagItemCell;

            m_BagItemController.lockType = EnhanceLockType.KeepVertical;

        }



        protected override void AddListeners()

@@ -63,7 +50,7 @@
        {

            model.m_AchievementIndex = -1;

            PlayerMarketData.OnRefreshPutaway += OnRefreshPutaway;

            PackModel.RefreshItemCountAct += ItemRefreshEvent;

            packModel.RefreshItemCountAct += ItemRefreshEvent;

            InitData();

        }



@@ -74,7 +61,7 @@


        private void InitPutawayItem()

        {

            putawayItemCtrl.Refresh();

            m_PutawayController.Refresh();

            List<MarketItemData> list = PlayerDatas.Instance.market.putawayList;

            if (list.Count > 0)

            {

@@ -82,14 +69,14 @@
                int page = Mathf.CeilToInt((float)list.Count / 2);

                for (int i = 0; i < page; i++)

                {

                    putawayItemCtrl.AddCell(ScrollerDataType.Header, i);

                    m_PutawayController.AddCell(ScrollerDataType.Header, i);

                }

            }

            else

            {

                m_NotItemPutTip.gameObject.SetActive(true);

            }

            putawayItemCtrl.Restart();

            m_PutawayController.Restart();

        }



        private void OnRefreshPutaway()

@@ -109,7 +96,7 @@
        protected override void OnAfterClose()

        {

            PlayerMarketData.OnRefreshPutaway -= OnRefreshPutaway;

            PackModel.RefreshItemCountAct -= ItemRefreshEvent;

            packModel.RefreshItemCountAct -= ItemRefreshEvent;

        }

        #endregion



@@ -122,27 +109,34 @@


        private void InitBagData()

        {

            bagItemCtrl.Refresh();

            m_BagItemController.Refresh();

            model.bagItems.Clear();

            SinglePackModel packTypeModel = PackModel.GetSinglePackModel(PackType.rptItem);

            SinglePackModel packTypeModel = packModel.GetSinglePackModel(PackType.rptItem);

            if (packTypeModel != null)

            {

                Dictionary<int, ItemModel> dic = packTypeModel.GetPackModelIndexDict();

                if (dic != null && dic.Count > 0)

                if (dic != null)

                {

                    model.bagItems.AddRange(dic.Values.ToList());

                    foreach (var item in dic.Values)

                    {

                        if (model.CheckItemPutaway(item, false, true))

                        {

                            model.bagItems.Add(item);

                        }

                    }

                    model.bagItems.Sort(ComparePutawayItems);

                }

            }

            m_ContainerEmptyItem.gameObject.SetActive(model.bagItems.Count == 0);

            if (model.bagItems.Count > 0)

            {

                int page = Mathf.CeilToInt((float)model.bagItems.Count / 4);

                for (int i = 0; i < page; i++)

                {

                    bagItemCtrl.AddCell(ScrollerDataType.Header, i);

                    m_BagItemController.AddCell(ScrollerDataType.Header, i);

                }

            }

            bagItemCtrl.Restart();

            m_BagItemController.Restart();

        }



        int ComparePutawayItems(ItemModel x, ItemModel y)

@@ -269,8 +263,8 @@
                else

                {

                    var _page = model.m_AchievementIndex / 4;

                    bagItemCtrl.JumpIndex(_page);

                    bagItemCtrl.m_Scorller.RefreshActiveCellViews();

                    m_BagItemController.JumpIndex(_page);

                    m_BagItemController.m_Scorller.RefreshActiveCellViews();

                }

                AchievementGoto.achievementType = 0;

            }