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

client_Wu Xijin

2019-04-01 c42f5edb65cec58b8fe6a617dbd5188fc0de2b16

 System/Auction/AuctionModel.cs

@@ -87,12 +87,14 @@


        public void LocationItemByGuid(string guid)

        {

            if (model.FamilyAuctionItemDic.ContainsKey(guid))

            AuctionItem item;

            if (model.TryGetFairyAuctionItem(guid, out item)

                && item.auctionType == 1)

            {

                locationItemGuid = guid;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 1);

            }

            else if (model.BiddingItemInfoDic.ContainsKey(guid))

            else if (model.TryGetMyBiddingAuctionItem(guid, out item))

            {

                locationItemGuid = guid;

                WindowCenter.Instance.Open<AuctionHouseWin>(true, 0);