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

client_linchunjie

2019-03-27 41ea225e0b334aa9c28e95d42ef9f9dbe1919675

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

 System/Auction/AuctionInquiryModel.cs

@@ -530,6 +530,20 @@
                redPointStre1.state = RedPointState.None;

            }

        }



        public bool IsFamilyQuit()//可否退出仙盟

        {

            bool isbool = true;

            int playerId = (int)PlayerDatas.Instance.baseData.PlayerID;

            foreach (var key in FamilyAuctionItemDic.Keys)//判断玩家是否有在竞价仙盟拍品(且是最高价)

            {

                if (BiddingItemInfoDic.ContainsKey(key) && BiddingItemInfoDic[key].BidderID== playerId)

                {

                    isbool = false;

                }

            }

            return isbool;

        }

    }

}

 System/Auction/FamilyAuctioncell.cs

@@ -199,7 +199,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.FamilySaleMinutes)//拍卖中

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FamilyAuctionItem.ItemCount;


 System/Auction/FullServiceAuctioncell.cs

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

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

                }

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

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * FullServiceAuction.ItemCount;


 System/Auction/MyAuctionCell.cs

@@ -164,7 +164,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.FamilySaleMinutes)//拍卖中

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

                {

                    m_OverTime.gameObject.SetActive(false);

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


 System/Auction/MyFocusCell.cs

@@ -232,7 +232,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.FamilySaleMinutes)//拍卖中

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

                {

                    m_OverTime.gameObject.SetActive(false);

                    var maxMoney = AuctionItem.BuyoutPrice * MyFocusItem.ItemCount;