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

client_linchunjie

2019-03-26 291ccee6cdf1812f8b3b1f7b0e52c1ebd70cfe4c

 System/Auction/AuctionInquiryModel.cs

@@ -101,7 +101,7 @@
            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;

        }



       


        public override void UnInit()

        {



@@ -109,7 +109,7 @@


        private void OnRefreshFairyMine()//用于被提出仙盟清除仙盟拍品

        {

            if (PlayerDatas.Instance.baseData.FamilyId==0)

            if (PlayerDatas.Instance.baseData.FamilyId == 0)

            {

                FamilyAuctionItemDic.Clear();

                if (ClearFamilyAuctionUpdate != null)

@@ -132,7 +132,11 @@
                playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;

                playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;

                playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);

                playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);

                var str = UIHelper.ServerStringTrim(PlayerAuctionItem.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    playerAuctionItemClass.TimeEnd = DateTime.Parse(str);

                }

                playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;

                playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;

                var index = FullServiceAuctionList.FindIndex((x) => { return x.ItemGUID == PlayerAuctionItem.ItemGUID; });

@@ -153,7 +157,7 @@
                {

                    FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);

                }

               


            }

            else if (info.QueryDir == 2)//往前查询

            {

@@ -171,7 +175,7 @@
                    FullServiceAuctionList.InsertRange(FullServiceAuctionList.Count - 1, fullServiceAuctionList);

                }

                LocationQuery = true;

                WindowCenter.Instance.Open<AuctionHouseWin>(true,0);//定位查询

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);//定位查询

            }



            if (FullServiceAuctionUpdate != null)

@@ -192,7 +196,11 @@
                playerAuctionItemClass.ItemCount = (int)PlayerAuctionItem.ItemCount;

                playerAuctionItemClass.TimeStr = PlayerAuctionItem.AddTime;

                playerAuctionItemClass.Time = DateTime.Parse(PlayerAuctionItem.AddTime);

                playerAuctionItemClass.TimeEnd= DateTime.Parse(PlayerAuctionItem.BiddingTime);

                var str = UIHelper.ServerStringTrim(PlayerAuctionItem.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    playerAuctionItemClass.TimeEnd = DateTime.Parse(str);

                }

                playerAuctionItemClass.BidderPrice = PlayerAuctionItem.BidderPrice;

                playerAuctionItemClass.UserData = PlayerAuctionItem.UserData;

                if (PlayerAuctionItemInfoDic.ContainsKey(playerAuctionItemClass.ItemGUID))

@@ -280,7 +288,11 @@
                familyAuctionItemClass.ItemCount = (int)FamilyAuctionItem.ItemCount;

                familyAuctionItemClass.TimeStr = FamilyAuctionItem.AddTime;

                familyAuctionItemClass.Time = DateTime.Parse(FamilyAuctionItem.AddTime);

                familyAuctionItemClass.TimeEnd= DateTime.Parse(FamilyAuctionItem.BiddingTime);

                var str = UIHelper.ServerStringTrim(FamilyAuctionItem.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    familyAuctionItemClass.TimeEnd = DateTime.Parse(str);

                }

                familyAuctionItemClass.BidderPrice = FamilyAuctionItem.BidderPrice;

                familyAuctionItemClass.UserData = FamilyAuctionItem.UserData;

                familyAuctionItemClass.FamilyPlayerIDInfo = FamilyAuctionItem.FamilyPlayerIDInfo;

@@ -327,7 +339,11 @@
                playerAuctionItemClass.ItemCount = (int)AttentionAuctionItem.ItemCount;

                playerAuctionItemClass.TimeStr = AttentionAuctionItem.AddTime;

                playerAuctionItemClass.Time = DateTime.Parse(AttentionAuctionItem.AddTime);

                playerAuctionItemClass.TimeEnd= DateTime.Parse(AttentionAuctionItem.BiddingTime);

                var str = UIHelper.ServerStringTrim(AttentionAuctionItem.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    playerAuctionItemClass.TimeEnd = DateTime.Parse(str);

                }

                playerAuctionItemClass.BidderPrice = AttentionAuctionItem.BidderPrice;

                playerAuctionItemClass.UserData = AttentionAuctionItem.UserData;

                if (AttentionAuctionItemDic.ContainsKey(playerAuctionItemClass.ItemGUID))

@@ -378,7 +394,11 @@
                    {

                        FamilyAuctionItem.TimeStr = RefreshAuctionItem.AddTime;

                        FamilyAuctionItem.Time = DateTime.Parse(RefreshAuctionItem.AddTime);

                        FamilyAuctionItem.TimeEnd= DateTime.Parse(RefreshAuctionItem.BiddingTime);

                        var str = UIHelper.ServerStringTrim(RefreshAuctionItem.BiddingTime);

                        if (!str.Equals(string.Empty))

                        {

                            FamilyAuctionItem.TimeEnd = DateTime.Parse(str);

                        }

                        FamilyAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;

                        FamilyAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                        FamilyAuctionItemDic[RefreshAuctionItem.ItemGUID] = FamilyAuctionItem;

@@ -464,7 +484,11 @@
                BiddingItemClass.FamilyID = (int)BiddingItem.FamilyID;

                BiddingItemClass.TimeStr = BiddingItem.AddTime;

                BiddingItemClass.Time = DateTime.Parse(BiddingItem.AddTime);

                BiddingItemClass.TimeEnd= DateTime.Parse(BiddingItem.BiddingTime);

                var str = UIHelper.ServerStringTrim(BiddingItem.BiddingTime);

                if (!str.Equals(string.Empty))

                {

                    BiddingItemClass.TimeEnd = DateTime.Parse(str);

                }

                BiddingItemClass.BidderPrice = BiddingItem.BidderPrice;//竞拍玩家出价

                BiddingItemClass.BidderID = (int)BiddingItem.BidderID;//竞拍玩家ID，也就是当前最高竞价玩家ID

                BiddingItemClass.UserData = BiddingItem.UserData;

@@ -483,9 +507,9 @@
            }

        }



        private  void SetRedPoint()

        private void SetRedPoint()

        {

             int GetDayOfYear = DateTime.Now.DayOfYear;

            int GetDayOfYear = DateTime.Now.DayOfYear;

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

            int day = LocalSave.GetInt(strKey);

            if (day != GetDayOfYear)