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

client_Wu Xijin

2019-03-26 8bd3fbaf12d283d8e93daf41316b0ca88b36a357

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

 System/Auction/AttentionWin.cs

@@ -21,7 +21,8 @@
        [SerializeField] Button m_CloseButton;

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

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
        List<AuctionItemConfig> auctionItemList = new List<AuctionItemConfig>();
        List<AuctionItemConfig> auctionItemList = new List<AuctionItemConfig>();

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        int ItemType = 1;
        #region Built-in
        enum AttentionType

@@ -111,6 +112,11 @@
                    }

                    ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1);

                    itemCell.Init(cellModel);

                    itemCell.button.SetListener(() =>

                    {

                        ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1);

                        itemTipsModel.SetItemTipsModel(attrData);

                    });

                    textName.text = itemConfig.ItemName;

                    if (model.AttentionAuctionItemIDdic.ContainsKey(auctionItem.ItemID))

                    {


 System/Auction/AuctionHouseWin.cs

@@ -68,7 +68,7 @@

        protected override void OnPreClose()
        {
            CloseChild();

            CloseImmediately();

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>())

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();


 System/Auction/MyFocusWin.cs

@@ -42,7 +42,7 @@
        {
            model.AttentionAuctionItemUdate += Reset;
            model.ClearAuctionUpdate += Reset;

            model.RefreshAuctionItemUpdate -= Update;//刷新
            model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新
            model.FamilyAuctionItemUpdate += Reset;
        }



@@ -52,9 +52,10 @@
        {

            model.AttentionAuctionItemUdate -= Reset;

            model.ClearAuctionUpdate -= Reset;

            model.RefreshAuctionItemUpdate -= Update;//刷新

            model.RefreshAuctionItemUpdate -= AuctionItemUpdate;//刷新

            model.FamilyAuctionItemUpdate -= Reset;
        }







        protected override void OnAfterClose()
@@ -68,10 +69,12 @@
            ListSotr();

            OnCreateGridLineCell(m_ScrollerController);

        }

        private void Update()



        private void AuctionItemUpdate()

        {

            m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

        }

        private void OnCreateGridLineCell(ScrollerController gridCtrl)

        {

            gridCtrl.Refresh();


 System/Auction/TransactionRecordWin.cs

@@ -25,6 +25,7 @@
        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }
        private List<AuctionItemClass> AuctionRecordList = new List<AuctionItemClass>();
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        int AuctionType = 0;
        int MaxCount = 0;
        #region Built-in
@@ -174,6 +175,11 @@
            }



            itemCell.Init(cellModel);

            itemCell.button.SetListener(() =>

            {

                ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1);

                itemTipsModel.SetItemTipsModel(attrData);

            });

            textName.text = itemConfig.ItemName;

            timeText.text = auctionRecord.TimeStr;

        }