snxxz_scripts.git

parent: 9184326c | 补丁 | 提交 | ignore whitespace

client_Zxw

2019-03-28 76e1568688698026911434f91d348f3395682e66

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

4个文件已修改

	System/Auction/FamilyAuctioncell.cs	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/FullServiceAuctioncell.cs	59 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyAuctionCell.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Auction/MyFocusCell.cs	57 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Auction/FamilyAuctioncell.cs

@@ -201,36 +201,13 @@
                }

                else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    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) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

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

                    {

                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    SetButtonStatus();

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

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

                }

                else if (timeNow < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

@@ -242,6 +219,35 @@
                }

            }

        }

        private void SetButtonStatus()

        {

            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) && maxMoney > needMoney)

            {

                m_BiddingButton.interactable = true;

                m_BiddingImage.gray = false;

            }

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

            {

                m_BiddingButton.interactable = false;

                m_BiddingImage.gray = true;

            }

        }
    }

}

 System/Auction/FullServiceAuctioncell.cs

@@ -233,36 +233,13 @@
                }

                else if (minute < (AuctionItem.WorldSaleMinutes + AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    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) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

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

                    {

                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    SetButtonStatus();

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

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

                }

                else if (timeNow < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

@@ -274,6 +251,38 @@
                }

            }

        }





        private void SetButtonStatus()

        {

            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) && maxMoney > needMoney)

            {

                m_BiddingButton.interactable = true;

                m_BiddingImage.gray = false;

            }

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

            {

                m_BiddingButton.interactable = false;

                m_BiddingImage.gray = true;

            }





        }

    }

}

 System/Auction/MyAuctionCell.cs

@@ -182,6 +182,12 @@
                }

            }

        }

        private void SetButtonStatus()

        {





        }
    }

}

 System/Auction/MyFocusCell.cs

@@ -220,36 +220,13 @@
                }

                else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中

                {

                    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) && maxMoney > needMoney)

                    {

                        m_BiddingButton.interactable = true;

                        m_BiddingImage.gray = false;

                    }

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

                    {

                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    SetButtonStatus();

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

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

                }

                else if (timeNow < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)

                    {

                        m_OverTime.gameObject.SetActive(true);

@@ -262,6 +239,36 @@
            }

        }

        private void SetButtonStatus()

        {

            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) && maxMoney > needMoney)

            {

                m_BiddingButton.interactable = true;

                m_BiddingImage.gray = false;

            }

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

            {

                m_BiddingButton.interactable = false;

                m_BiddingImage.gray = true;

            }



        }

    }

}

			@@ -201,36 +201,13 @@
			}
			else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}
			SetButtonStatus();
			int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);
			m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));
			}
			else if (timeNow < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			@@ -242,6 +219,35 @@
			}
			}
			}

			private void SetButtonStatus()
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}
			}
			}

			}

			@@ -233,36 +233,13 @@
			}
			else if (minute < (AuctionItem.WorldSaleMinutes + AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}
			SetButtonStatus();
			int seconds = AuctionItem.WorldSaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);
			m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));
			}
			else if (timeNow < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			@@ -274,6 +251,38 @@
			}
			}
			}


			private void SetButtonStatus()
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}


			}
			}

			}

			@@ -220,36 +220,13 @@
			}
			else if (minute < (AuctionItem.FamilySaleMinutes+ AuctionItem.NoticeSaleMinutes))//拍卖中
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}
			SetButtonStatus();
			int seconds = AuctionItem.FamilySaleMinutes * 60 - ((int)timeSpan.TotalSeconds - AuctionItem.NoticeSaleMinutes * 60);
			m_TimeText.text = Language.Get("PMH_04", TimeUtility.SecondsToHMS(seconds));
			}
			else if (timeNow < extensionTime)//加时中
			{
			SetButtonStatus();
			if (!m_OverTime.gameObject.activeSelf)
			{
			m_OverTime.gameObject.SetActive(true);
			@@ -262,6 +239,36 @@
			}
			}

			private void SetButtonStatus()
			{
			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) && maxMoney > needMoney)
			{
			m_BiddingButton.interactable = true;
			m_BiddingImage.gray = false;
			}
			if (m_BiddingButton.interactable && needMoney >= maxMoney && AuctionItem.BuyoutPrice != 0)
			{
			m_BiddingButton.interactable = false;
			m_BiddingImage.gray = true;
			}

			}

			}

			}