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

client_linchunjie

2019-03-27 13c44c1a084b4d87bec19307ec1bb75d6397f804

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

 System/Auction/FamilyAuctionWin.cs

@@ -93,7 +93,11 @@
            FamilyAuctionList.Clear();

            foreach (var value in model.FamilyAuctionItemDic.Values)

            {

                FamilyAuctionList.Add(value);

                if (value.AuctionType == 1)

                {

                    FamilyAuctionList.Add(value);

                }

               
            }

        }
        private void ListSotr()


 System/Auction/FullServiceAuctionWin.cs

@@ -350,14 +350,17 @@
                    var auctionItem = AuctionItemConfig.Get(vlaue.ItemID);

                    num = sendNumber / 1000;

                    num -= 1;

                    if (num == 0)

                    if (model.FamilyAuctionItemDic.ContainsKey(vlaue.ItemGUID)

                        && model.FamilyAuctionItemDic[vlaue.ItemGUID].AuctionType != 0)//如果存在仙盟拍品且不是全服拍品过滤掉

                    {

                        continue;

                    }

                    bool isBool = (num == 0 || num == auctionItem.ItemType);

                    if (isBool)

                    {

                        FullServiceAuctionListSort.Add(vlaue);

                    }

                    else if (num == auctionItem.ItemType)

                    {

                        FullServiceAuctionListSort.Add(vlaue);

                    }



                }

            }

            FullServiceAuctionListSort.Sort(Compare);


 System/Auction/MyFocusCell.cs

@@ -20,7 +20,7 @@
        [SerializeField] TextEx m_Score;//评分

        [SerializeField] GameObject m_StateIcon;//上升剪头

        [SerializeField] GameObject m_DeclineIcon;//下降剪头

        [SerializeField] GameObject m_BiddingTextObj;//竞价中

        [SerializeField] TextEx m_BiddingText;//竞价中

        [SerializeField] GameObject m_HighestPriceImage;//最高价

        [SerializeField] TextEx m_JadeNumber;//当前价格

        [SerializeField] TextEx m_TimeText;//时间

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

            }

            m_NeedImage.SetActive(false);

            m_ParticipateImage.SetActive(false);

            m_BiddingTextObj.SetActive(false);

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

            m_EquipmentScoreObj.SetActive(false);

            AuctionItemClass myAuction = new AuctionItemClass();

@@ -83,14 +82,25 @@
            {

                m_NeedImage.SetActive(true);

            }

            AuctionItemClass _biddingItemInfo = null;

            if (model.BiddingItemInfoDic.ContainsKey(GUIID))//参与了竞价的物品

            {

                _biddingItemInfo = model.BiddingItemInfoDic[GUIID];

                var biddingItemInfo = model.BiddingItemInfoDic[GUIID];

                m_ParticipateImage.SetActive(true);

                if (biddingItemInfo.BidderID == playerId)//判断是否最高竞价

                {

                    m_HighestPriceImage.SetActive(true);

                }

                else

                {

                    m_HighestPriceImage.SetActive(false);

                    m_BiddingText.text = Language.Get("PMH_06");

                }

            }

            else

            {

                m_BiddingText.text = Language.Get("PMH_05");

            }

            ItemCellModel cellModel = new ItemCellModel(myAuction.ItemID, true, (ulong)myAuction.ItemCount);

            m_ItemCell.Init(cellModel);

@@ -115,19 +125,37 @@
            int needJade = 0;

            int priceMax = 0;

            priceMax = auctionItem.BuyoutPrice * myAuction.ItemCount;



            priceMax = auctionItem.BuyoutPrice * myAuction.ItemCount;

            if (myAuction.BidderPrice == 0)

            {

                needJade = auctionItem.BasePrice * myAuction.ItemCount;

            }

            else

            {

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

                if (_biddingItemInfo == null)

                {

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

                }

                else

                {

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

                }

               
            }

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

            {

                needJade = priceMax;

            }

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



            if (_biddingItemInfo == null)

            {

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

            }

            else

            {

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

            }

            m_JadeNumber1.text = priceMax.ToString();

            if (auctionItem.BuyoutPrice == 0)

            {

@@ -231,10 +259,6 @@
                    {

                        m_BiddingButton.interactable = false;

                        m_BiddingImage.gray = true;

                    }

                    if (!m_BiddingTextObj.activeSelf)

                    {

                        m_BiddingTextObj.SetActive(true);

                    }

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

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