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

client_linchunjie

2019-03-28 4accfd79b9b44aa456f779abb76bfa808ef80899

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

 System/Auction/AuctionInquiryModel.cs

@@ -394,6 +394,7 @@
                    {

                        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))

                        {

@@ -425,6 +426,7 @@
                    var PlayerAuctionItemInfo = PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID];

                    PlayerAuctionItemInfo.TimeStr = RefreshAuctionItem.AddTime;

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

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

                    PlayerAuctionItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;

                    PlayerAuctionItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    PlayerAuctionItemInfoDic[RefreshAuctionItem.ItemGUID] = PlayerAuctionItemInfo;

@@ -434,6 +436,7 @@
                    var biddingItemInfo = BiddingItemInfoDic[RefreshAuctionItem.ItemGUID];

                    biddingItemInfo.TimeStr = RefreshAuctionItem.AddTime;

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

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

                    biddingItemInfo.BidderID = (int)RefreshAuctionItem.BidderID;

                    biddingItemInfo.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    BiddingItemInfoDic[RefreshAuctionItem.ItemGUID] = biddingItemInfo;

@@ -443,6 +446,7 @@
                    var attentionAuctionItem = AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID];

                    attentionAuctionItem.TimeStr = RefreshAuctionItem.AddTime;

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

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

                    attentionAuctionItem.BidderID = (int)RefreshAuctionItem.BidderID;

                    attentionAuctionItem.BidderPrice = (int)RefreshAuctionItem.BidderPrice;

                    AttentionAuctionItemDic[RefreshAuctionItem.ItemGUID] = attentionAuctionItem;


 System/Auction/FamilyAuctioncell.cs

@@ -183,6 +183,7 @@
                TimeSpan timeSpan = timeNow - FamilyAuctionItem.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime overTime = FamilyAuctionItem.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

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

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

                {

@@ -199,13 +200,13 @@
                    int seconds = AuctionItem.NoticeSaleMinutes * 60 - (int)timeSpan.TotalSeconds;

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

                }

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

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

                {

                    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)//加时中

                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)


 System/Auction/FullServiceAuctioncell.cs

@@ -215,6 +215,7 @@
                TimeSpan timeSpan = timeNow - FullServiceAuction.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime overTime = FullServiceAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

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

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

                {

@@ -237,7 +238,7 @@
                    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)//加时中

                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)


 System/Auction/MyAuctionCell.cs

@@ -96,18 +96,18 @@
                m_BiddingText.text = Language.Get("PMH_06");

                if (type == 0)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                    int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel.

                        AuctionTaxrate1 * myAuction.BidderPrice) / 100);//个人税收

                    int incomeNumber = myAuction.BidderPrice - auctionTaxrate;

                    m_Income.text = incomeNumber.ToString();

                }

                else if (type == 1)

                {

                    int auctionTaxrate = Mathf.CeilToInt((float)(auctionHelpModel.

                    int auctionTaxrate = Mathf.FloorToInt((float)(auctionHelpModel.

                       AuctionTaxrate2 * myAuction.BidderPrice) / 100);//仙盟税收

                    int number = myAuction.BidderPrice - auctionTaxrate;

                    int incomeMax = Mathf.CeilToInt((float)(number * auctionHelpModel.AuctionTaxrate3) / 100);

                    int incomeNumber = Mathf.FloorToInt((float)number / myAuction.FamilyPlayerIDList.Count);

                    int incomeNumber = Mathf.CeilToInt((float)number / myAuction.FamilyPlayerIDList.Count);

                    if (incomeMax >= incomeNumber)

                    {

                        m_Income.text = incomeNumber.ToString();

@@ -145,7 +145,7 @@
            }

            else

            {

                m_JadeNumber.text = auctionItem.BasePrice.ToString();

                m_JadeNumber.text = 0.ToString();

            }



        }

@@ -158,6 +158,7 @@
                TimeSpan timeSpan = timeNow - MyAuction.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime overTime = MyAuction.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

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

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

                {

@@ -169,7 +170,7 @@
                    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)//加时中

                if (overTime < extensionTime)//加时中

                {

                    if (!m_OverTime.gameObject.activeSelf)

                    {


 System/Auction/MyFocusCell.cs

@@ -46,7 +46,7 @@
                return;

            }

            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);            
            m_ParticipateImage.SetActive(false);

            m_HighestPriceImage.SetActive(false);

            m_EquipmentScoreObj.SetActive(false);

            m_OverTime.gameObject.SetActive(false);

@@ -94,7 +94,7 @@
                else

                {

                    m_HighestPriceImage.SetActive(false);

                   


                }

            }

            if (myAuction.BidderPrice != 0)

@@ -136,7 +136,7 @@
            }

            else

            {

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

            }

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

            {

@@ -202,6 +202,7 @@
                TimeSpan timeSpan = timeNow - MyFocusItem.Time;

                int minute = (int)timeSpan.TotalMinutes;



                DateTime overTime = MyFocusItem.Time.AddMinutes(AuctionItem.FamilySaleMinutes + AuctionItem.NoticeSaleMinutes);

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

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

                {

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

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

                }

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

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

                {

                    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)//加时中

                if (overTime < extensionTime)//加时中

                {

                    SetButtonStatus();

                    if (!m_OverTime.gameObject.activeSelf)