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

client_Wu Xijin

2019-03-16 892d7e89a432d922967aaf86e6d29870952c8a90

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

 System/Auction/AuctionHouseWin.cs

@@ -43,11 +43,18 @@
         

            m_AttentionButton.AddListener(OnClickAttentionButton);
            m_TransactionRecordButton.AddListener(OnClickTransactionRecordButton);
        }

        }

        AuctionInquiryModel model { get { return ModelCenter.Instance.GetModel<AuctionInquiryModel>(); } }
        protected override void OnPreOpen()
        {
            m_MoneyText.text = UIHelper.GetMoneyCnt(1).ToString();
            if (model.redPointStre1.state == RedPointState.Simple)

            {

                int GetDayOfYear = DateTime.Now.DayOfYear;

                string strKey = "AuctionRedPoint" + PlayerDatas.Instance.baseData.PlayerID;

                LocalSave.GetInt(strKey, GetDayOfYear);

                model.redPointStre1.state = RedPointState.None;

            }
        }

        protected override void OnActived()

        {


 System/Auction/AuctionInquiryModel.cs

@@ -53,9 +53,7 @@


        public Dictionary<string, AuctionItemClass> FamilyAuctionItemDic = new Dictionary<string, AuctionItemClass>();// 拍卖行仙盟拍卖中的物品信息





        public Dictionary<string, AuctionItemClass> PlayerAuctionRecordDic = new Dictionary<string, AuctionItemClass>();//拍卖行玩家拍卖记录





        public Dictionary<int, AddAuctionItemInfoClass> AddAuctionItemInfoDic = new Dictionary<int, AddAuctionItemInfoClass>();//关注的拍品的上架提醒（弹框显示）

        public event Action AddAuctionItemInfoUpdate;

@@ -68,6 +66,9 @@


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

        public QueryRemainingClass QueryRemaining = new QueryRemainingClass();



        private const int Redpointkey1 = 217;

        public Redpoint redPointStre1 = new Redpoint(2, Redpointkey1);//集市红点

        public override void Init()

        {



@@ -75,12 +76,19 @@


        public void OnBeforePlayerDataInitialize()

        {



            PlayerAuctionItemInfoDic.Clear();

            FullServiceAuctionList.Clear();

            FamilyAuctionItemDic.Clear();

            PlayerAuctionRecordDic.Clear();

            AddAuctionItemInfoDic.Clear();

            BiddingItemInfoDic.Clear();

            AttentionAuctionItemDic.Clear();

            AttentionAuctionItemIDdic.Clear();

        }



        public void OnPlayerLoginOk()

        {



            SetRedPoint();

        }



        public override void UnInit()

@@ -436,6 +444,21 @@
                BiddingItemInfoUpdate();

            }

        }



        private  void SetRedPoint()

        {

            int GetDayOfYear = DateTime.Now.DayOfYear;

            string strKey = "AuctionRedPoint" + PlayerDatas.Instance.baseData.PlayerID;

            int day = LocalSave.GetInt(strKey);

            if (day != GetDayOfYear)

            {

                redPointStre1.state = RedPointState.Simple;

            }

            else

            {

                redPointStre1.state = RedPointState.None;

            }

        }

    }

}