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

client_linchunjie

2019-03-26 291ccee6cdf1812f8b3b1f7b0e52c1ebd70cfe4c

 System/Auction/FullServiceAuctioncell.cs

@@ -201,8 +201,10 @@
            if (AuctionItem != null && FullServiceAuction != null)

            {

                var timeNow = TimeUtility.ServerNow;

                TimeSpan timeSpan = timeNow - FullServiceAuction.Time;

                TimeSpan timeSpan = timeNow - FullServiceAuction.Time;              
                int minute = (int)timeSpan.TotalMinutes;



                DateTime extensionTime = FullServiceAuction.TimeEnd.AddSeconds(auctionHelpModel.ExtensionTime);

                if (minute < AuctionItem.NoticeSaleMinutes)//预热中

                {

                    if (m_PriceButton.interactable)

@@ -218,7 +220,7 @@
                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

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

                }

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

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

                {

                    var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;

                    var needMoney = 0;

@@ -248,6 +250,13 @@
                    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)

                {

                    m_TimeText.text = Language.Get("PMH_04",0);

                    TimeSpan timeSpan2 = extensionTime - timeNow;

                    int timeSeconds = (int)timeSpan2.TotalSeconds;

                    DebugEx.LogError(Language.Get("PMH_04", TimeUtility.SecondsToHMS(timeSeconds)));

                }

            }

        }

    }