3090 【BUG】【2.0】拍卖，竞价按钮没有置灰​

client_Zxw

2019-03-21 f24c3bb57026379aa18cd722464ca855f4273b4b

3090 【BUG】【2.0】拍卖，竞价按钮没有置灰​

 System/Auction/FamilyAuctioncell.cs

@@ -102,6 +102,10 @@
            {

                needJade = familyAuctionItem.BidderPrice + auctionItem.BiddingAdd * familyAuctionItem.ItemCount;

            }

            if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//竞价价格永远不能大于最高价

            {

                needJade = priceMax;

            }

            m_JadeNumber.text = familyAuctionItem.BidderPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

@@ -176,16 +180,31 @@
                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount;

                    var needMoney = 0;

                    if (FamilyAuctionItem.BidderPrice == 0)

                    {

                        needMoney = AuctionItem.BasePrice * FamilyAuctionItem.ItemCount;

                    }

                    else

                    {

                        needMoney = FamilyAuctionItem.BidderPrice + AuctionItem.BiddingAdd * FamilyAuctionItem.ItemCount;

                    }

                    if (!m_PriceButton.interactable || m_PriceImage.gray)

                    {

                        m_PriceButton.interactable = true;

                        m_PriceImage.gray = false;

                    }

                    if (!m_BiddingButton.interactable || m_BiddingImage.gray)

                    if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

                    if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)

                    {

                        m_PriceButton.interactable = false;

                        m_PriceImage.gray = true;

                    }

                    if (!m_BiddingTextObj.activeSelf)

                    {

                        m_BiddingTextObj.SetActive(true);


 System/Auction/FullServiceAuctioncell.cs

@@ -85,7 +85,7 @@
                return;

            }

            AuctionItem = auctionItem;

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV,itemConfig.EquipPlace);

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace);

            if (!equipNeedBool)

            {

                m_NeedImage.SetActive(true);

@@ -123,6 +123,10 @@
            else

            {

                needJade = fullServiceAuction.BidderPrice + auctionItem.BiddingAdd * fullServiceAuction.ItemCount;

            }

            if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//竞价价格永远不能大于最高价

            {

                needJade = priceMax;

            }

            m_JadeNumber.text = fullServiceAuction.BidderPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

@@ -199,21 +203,36 @@
                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.WorldSaleMinutes)//拍卖中

                {

                    var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;

                    var needMoney = 0;

                    if (FullServiceAuction.BidderPrice == 0)

                    {

                        needMoney = AuctionItem.BasePrice * FullServiceAuction.ItemCount;

                    }

                    else

                    {

                        needMoney = FullServiceAuction.BidderPrice + AuctionItem.BiddingAdd * FullServiceAuction.ItemCount;

                    }

                    if (!m_PriceButton.interactable || m_PriceImage.gray)

                    {

                        m_PriceButton.interactable = true;

                        m_PriceImage.gray = false;

                    }

                    if (!m_BiddingButton.interactable || m_BiddingImage.gray)

                    if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

                    if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)

                    {

                        m_PriceButton.interactable = false;

                        m_PriceImage.gray = true;

                    }

                    if (!m_BiddingTextObj.activeSelf)

                    {

                        m_BiddingTextObj.SetActive(true);

                    }

                    int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);

                    m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));

                }

            }


 System/Auction/MyFocusCell.cs

@@ -113,7 +113,12 @@
            {

                needJade = myAuction.BidderPrice + auctionItem.BiddingAdd * myAuction.ItemCount;

            }

            if (auctionItem.BuyoutPrice != 0 && needJade > priceMax)//竞价价格永远不能大于最高价

            {

                needJade = priceMax;

            }

            m_JadeNumber.text = myAuction.BidderPrice.ToString();

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

            {

                m_PriceButton.gameObject.SetActive(false);

@@ -122,7 +127,6 @@
            {

                m_PriceButton.gameObject.SetActive(true);

            }

            m_JadeNumber1.text = priceMax.ToString();

            m_PriceButton.SetListener(() => //一口价

            {

                int jade = (int)PlayerDatas.Instance.baseData.diamond;

@@ -188,16 +192,31 @@
                }

                else if (minute >= AuctionItem.NoticeSaleMinutes && minute <= AuctionItem.FamilySaleMinutes)//拍卖中

                {

                    var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount;

                    var needMoney = 0;

                    if (MyFocusItem.BidderPrice == 0)

                    {

                        needMoney = AuctionItem.BasePrice * MyFocusItem.ItemCount;

                    }

                    else

                    {

                        needMoney = MyFocusItem.BidderPrice + AuctionItem.BiddingAdd * MyFocusItem.ItemCount;

                    }

                    if (!m_PriceButton.interactable || m_PriceImage.gray)

                    {

                        m_PriceButton.interactable = true;

                        m_PriceImage.gray = false;

                    }

                    if (!m_BiddingButton.interactable || m_BiddingImage.gray)

                    if ((!m_BiddingButton.interactable || m_BiddingImage.gray) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

                    if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)

                    {

                        m_PriceButton.interactable = false;

                        m_PriceImage.gray = true;

                    }

                    if (!m_BiddingTextObj.activeSelf)

                    {

                        m_BiddingTextObj.SetActive(true);