Merge branch 'master' into Rune

client_linchunjie

2019-03-21 0780d6f78efd25030fdbb0701a14d43d73a0ebe2

 System/Auction/FullServiceAuctioncell.cs

@@ -55,7 +55,7 @@
            if (index < 5)

            {

                var sendNumber = AuctionInquiry.Instance.GetSendNumber();

                if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool)

                if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.UpBool && !auctionHelpModel.isOpenPanel)

                {

                    AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 2);

                    auctionHelpModel.Wait = false;

@@ -64,7 +64,7 @@
            else if (index >= model.FullServiceAuctionList.Count - 3)

            {

                var sendNumber = AuctionInquiry.Instance.GetSendNumber();

                if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool)

                if (sendNumber != 0 && auctionHelpModel.Wait && model.QueryRemaining.DownBool && !auctionHelpModel.isOpenPanel)

                {

                    AuctionInquiry.Instance.SendQueryAuction(fullServiceAuction.ItemGUID, sendNumber, 1);

                    auctionHelpModel.Wait = false;