3335 拍卖行修改

client_Zxw

2019-03-19 d1b279cbadffa311e5d989c25b1c64cb18953437

3335 拍卖行修改

 System/Auction/FamilyAuctionWin.cs

@@ -39,7 +39,7 @@
        {
            model.FamilyAuctionItemUpdate += FamilyAuctionReset;

            model.ClearFamilyAuctionUpdate += FamilyAuctionReset;
            model.RefreshAuctionItemUpdate += RefreshAuctionItemUpdate;           
            model.RefreshAuctionItemUpdate += RefreshAuctionItemUpdate;

            model.BiddingItemInfoUpdate += RefreshAuctionItemUpdate;
        }

@@ -49,10 +49,10 @@
            model.ClearFamilyAuctionUpdate -= FamilyAuctionReset;

            model.BiddingItemInfoUpdate -= RefreshAuctionItemUpdate;

            model.RefreshAuctionItemUpdate -= RefreshAuctionItemUpdate;

           


        }



       




        protected override void OnAfterClose()
        {
@@ -67,7 +67,7 @@
        private void RefreshAuctionItemUpdate()

        {

            m_ScrollerControllerItem.m_Scorller.RefreshActiveCellViews();//刷新可见

        }     
        }

        private void OnCreateGridCellItem(ScrollerController gridCtrl)

        {

            gridCtrl.Refresh();

@@ -114,9 +114,9 @@
            {

                return -havex1.CompareTo(havey1);

            }

            bool havex2 = IsAttention(x.ItemID);

            bool havey2 = IsAttention(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否关注

            bool havex2 = IsNeedEquip(x.ItemID);

            bool havey2 = IsNeedEquip(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否需要

            {

                return -havex2.CompareTo(havey2);

            }

@@ -136,7 +136,7 @@
            if (model.BiddingItemInfoDic.ContainsKey(GUID))

            {

                var biddingItemInfo = model.BiddingItemInfoDic[GUID];

                isBool=biddingItemInfo.BidderID == playerId;

                isBool = biddingItemInfo.BidderID == playerId;

            }

            return isBool;

        }

@@ -150,10 +150,15 @@
            }

            return isBool;

        }
        private bool IsAttention(int itemId)

        private bool IsNeedEquip(int itemId)

        {

            bool isBool = false;

            if (model.AttentionAuctionItemIDdic.ContainsKey(itemId))

            var itemConfig = ItemConfig.Get(itemId);

            if (itemConfig == null)

            {

                return false;

            }

            if (!auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace))

            {

                isBool = true;

            }

@@ -169,7 +174,7 @@
            }

            var timeNow = TimeUtility.ServerNow;

            TimeSpan timeSpan = timeNow - auctionItemClass.Time;

            scends= (int)timeSpan.TotalSeconds;

            scends = (int)timeSpan.TotalSeconds;

            return scends;

        }
    }

 System/Auction/FamilyAuctioncell.cs

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

            }

            AuctionItem = auctionItem;

            if (model.AttentionAuctionItemIDdic.ContainsKey(familyAuctionItem.ItemID))//是否关注

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace);

            if (!equipNeedBool)//是否需要

            {

                m_NeedImage.SetActive(true);

            }


 System/Auction/FullServiceAuctioncell.cs

@@ -85,6 +85,11 @@
                return;

            }

            AuctionItem = auctionItem;

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV,itemConfig.EquipPlace);

            if (!equipNeedBool)

            {

                m_NeedImage.SetActive(true);

            }

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

            {

                var biddingItemInfo = model.BiddingItemInfoDic[fullServiceAuction.ItemGUID];


 System/Auction/MyFocusCell.cs

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

            }

            AuctionItem = auctionItem;

            if (model.AttentionAuctionItemIDdic.ContainsKey(myAuction.ItemID))//是否关注

            var equipNeedBool = auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace);

            if (!equipNeedBool)//是否需要

            {

                m_NeedImage.SetActive(true);

            }


 System/Auction/MyFocusWin.cs

@@ -121,9 +121,9 @@
            {

                return -havex1.CompareTo(havey1);

            }

            bool havex2 = IsAttention(x.ItemID);

            bool havey2 = IsAttention(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否关注

            bool havex2 = IsNeedEquip(x.ItemID);

            bool havey2 = IsNeedEquip(y.ItemID);

            if (havex2.CompareTo(havey2) != 0)//是否需要

            {

                return -havex2.CompareTo(havey2);

            }

@@ -157,10 +157,15 @@
            }

            return isBool;

        }
        private bool IsAttention(int itemId)

        private bool IsNeedEquip(int itemId)

        {

            bool isBool = false;

            if (model.AttentionAuctionItemIDdic.ContainsKey(itemId))

            var itemConfig = ItemConfig.Get(itemId);

            if (itemConfig == null)

            {

                return false;

            }

            if (!auctionHelpModel.WhetherEquipped(itemConfig.LV, itemConfig.EquipPlace))

            {

                isBool = true;

            }


 System/Auction/TransactionRecordWin.cs

@@ -118,7 +118,7 @@


            GameObject SuccessfulBiddingObj = cell.transform.Find("SuccessfulBiddingObj").gameObject;//竞拍成功(竞拍成功)

            RichText SuccessfulBiddingText = cell.transform.Find("SuccessfulBiddingObj/SuccessfulBiddingText").GetComponent<RichText>();

            Text JadeMoney= cell.transform.Find("SuccessfulBiddingObj/JadeMoney").GetComponent<Text>();

            Text JadeMoney = cell.transform.Find("SuccessfulBiddingObj/JadeMoney").GetComponent<Text>();



            GameObject AuctionFailedObj = cell.transform.Find("AuctionFailedObj").gameObject;//竞拍失败

            Text JadeMoney_1 = cell.transform.Find("AuctionFailedObj/JadeMoney").GetComponent<Text>();

@@ -132,7 +132,7 @@
                    {

                        transactionStatusText.text = Language.Get("PMH_11");

                    }

                    else if (AuctionType==1)

                    else if (AuctionType == 1)

                    {

                        transactionStatusText.text = Language.Get("PMH_12");

                    }

@@ -161,7 +161,7 @@
                    AuctionFailedObj.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    transactionStatusText.gameObject.SetActive(false);

                    JadeMoney_1.text= auctionRecord.BidderPrice.ToString();

                    JadeMoney_1.text = auctionRecord.BidderPrice.ToString();

                    break;

            }



@@ -226,6 +226,15 @@
                    AuctionRecordList.Add(value);

                }

            }

            AuctionRecordList.Sort(Compare);

        }
        int Compare(AuctionItemClass x, AuctionItemClass y)

        {

            if (x.Time.CompareTo(y.Time) != 0)//根据时间排序

            {

                return -x.Time.CompareTo(y.Time);

            }

            return 1;

        }
    }