8256 【前端】【主干】拍品可使用及上下架优化-下架

hch

2019-09-16 6fb36f1acb204afdd119eb0dbf622271cfbb3cb7

8256 【前端】【主干】拍品可使用及上下架优化-下架

 Core/NetworkPackage/ClientPack/ClientToMapServer/CB5_Bourse/CB515_tagCMUnsellAuctionItem.cs

New file
@@ -0,0 +1,18 @@
using UnityEngine;

using System.Collections;



// B5 15 拍卖行下架拍品 #tagCMUnsellAuctionItem



public class CB515_tagCMUnsellAuctionItem : GameNetPackBasic {

    public string ItemGUID;



    public CB515_tagCMUnsellAuctionItem () {

        combineCmd = (ushort)0x03FE;

        _cmd = (ushort)0xB515;

    }



    public override void WriteToBytes () {

        WriteBytes (ItemGUID, NetDataType.Chars, 40);

    }



}


 Core/NetworkPackage/ClientPack/ClientToMapServer/CB5_Bourse/CB515_tagCMUnsellAuctionItem.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 6a3174a9b39b2824db6087f4f5fbc31e
timeCreated: 1568623608
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Auction/AuctionInquiry.cs

@@ -60,6 +60,13 @@
            cb518.ItemID = (uint)itemID;

            cb518.IsAttention = (byte)isAttention;

            GameNetSystem.Instance.SendInfo(cb518);

        }



        public void SendBackAuctionItem(string itemGUID)//下架物品

        {

            CB515_tagCMUnsellAuctionItem cb515 = new CB515_tagCMUnsellAuctionItem();

            cb515.ItemGUID = itemGUID;

            GameNetSystem.Instance.SendInfo(cb515);

        }
    }


 System/Auction/AuctionModel.cs

@@ -852,6 +852,18 @@
            });

        }



        public void SendBackItem(AuctionItem item)

        {

            if (item == null)

            {

                return;

            }



            AuctionInquiry.Instance.SendBackAuctionItem(item.itemGuid);



        }





        #region 定位查询

        public void SendInquiryServerAcution(int inquiryIndex, string guid, int inquiryDir, int inquiryCount = 10)

        {


 System/Auction/MyAuctionCell.cs

@@ -21,6 +21,7 @@
        [SerializeField] TextEx m_JadeNumber;//当前价格

        [SerializeField] TextEx m_TimeText;//时间

        [SerializeField] TextEx m_Income;//收益

        [SerializeField] Button m_BackButton;//下架按钮



        AuctionModel model { get { return ModelCenter.Instance.GetModel<AuctionModel>(); } }

        AuctionHelpModel auctionHelpModel { get { return ModelCenter.Instance.GetModel<AuctionHelpModel>(); } }

@@ -59,8 +60,14 @@
            this.auctionItemGuid = guid;



            m_MyAuction.SetActive(auctionItem.familyId == 0);

            m_BackButton.SetActive(auctionItem.familyId == 0 && auctionItem.biddingPrice == 0);

            m_FamilyImage.SetActive(auctionItem.familyId != 0);



            m_BackButton.SetListener(() =>

            {

                model.SendBackItem(auctionItem);

            });



            var config = AuctionItemConfig.Get(auctionItem.itemId);

            var itemConfig = ItemConfig.Get(auctionItem.itemId);




 System/Auction/TransactionRecordWin.cs

@@ -183,6 +183,13 @@
                    AuctionFailedObj.SetActive(false);

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

                    break;

                case 6://下架

                    transactionStatusText.gameObject.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    AuctionFailedObj.SetActive(false);

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

                    JadeMoney.text = item.biddingPrice.ToString();

                    break;

            }



            itemCell.Init(cellModel);


 System/ItemTip/ItemTipUtility.cs

@@ -1759,7 +1759,6 @@
            if (item.isAuction)
            {
                operates.Add(ItemOperateType.putAway);
                return operates;
            }

            var isEquip = ItemLogicUtility.Instance.IsRealmEquip(item.itemId);