8563 【开发】一键整理 - 改成取消拍品支持 取消所有

hch

2020-10-20 3c7f6d12ba9171902cd7e4e5bb597118d8883c75

8563 【开发】一键整理 - 改成取消拍品支持 取消所有

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA308_tagCMItemTimeout.cs

@@ -1,23 +1,22 @@
using UnityEngine;
using System.Collections;

// A3 08 物品过期 #tagCMItemTimeout

public class CA308_tagCMItemTimeout : GameNetPackBasic
{
    public byte PackType;    //背包类型
    public byte ItemIndex;    //物品在背包中索引

    public CA308_tagCMItemTimeout()
    {
        combineCmd = (ushort)0x03FE;
        _cmd = (ushort)0xA308;
    }

    public override void WriteToBytes()
    {
        WriteBytes(PackType, NetDataType.BYTE);
        WriteBytes(ItemIndex, NetDataType.BYTE);
    }

}
using UnityEngine;

using System.Collections;



// A3 08 物品过期 #tagCMItemTimeout



public class CA308_tagCMItemTimeout : GameNetPackBasic {

    public byte PackType;    //背包类型

    public byte ItemIndex;    //物品在背包中索引

    public byte IsAll;    //是否处理所有过期物品



    public CA308_tagCMItemTimeout () {

        combineCmd = (ushort)0x03FE;

        _cmd = (ushort)0xA308;

    }



    public override void WriteToBytes () {

        WriteBytes (PackType, NetDataType.BYTE);

        WriteBytes (ItemIndex, NetDataType.BYTE);

        WriteBytes (IsAll, NetDataType.BYTE);

    }



}


 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -892,7 +892,7 @@
            GameNetSystem.Instance.SendToCrossServer(useItem);
        }

        public void ProcessOverdueItem(string guid)
        public void ProcessOverdueItem(string guid, byte isAll = 0)
        {
            var item = packModel.GetItemByGuid(guid);
            if (item == null)
@@ -903,6 +903,7 @@
            var info = new CA308_tagCMItemTimeout();
            info.PackType = (byte)item.packType;
            info.ItemIndex = (byte)item.gridIndex;
            info.IsAll = isAll;
            GameNetSystem.Instance.SendInfo(info);
        }

@@ -968,6 +969,22 @@
            if (ItemLogicUtility.Instance.IsOverdue(guid))
            {
                //取消拍品

                ConfirmCancel.CancelAuctionPopConfirm(
                Language.Get("Mail101"),
                Language.Get("PopConfirmWin_Auction"),
                (Action<bool>)((bool ok) =>
                {
                    if (ok)
                    {
                        ItemOperateUtility.Instance.ProcessOverdueItem(guid);
                    }
                    else
                    {
                        ItemOperateUtility.Instance.ProcessOverdueItem(guid, 1);
                    }
                })
                );
                ItemOperateUtility.Instance.ProcessOverdueItem(guid);
                return;
            }

 System/Tip/CancelAuctionConfirmWin.cs

New file
@@ -0,0 +1,22 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Monday, November 26, 2018
//--------------------------------------------------------



namespace Snxxz.UI
{

    public class CancelAuctionConfirmWin : PopConfirmWin
    {



    }

}





 System/Tip/CancelAuctionConfirmWin.cs.meta

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

 System/Tip/ConfirmCancel.cs

@@ -84,6 +84,17 @@
            WindowCenter.Instance.Open<RuneTowerConfirmWin>();

        }





        public static void CancelAuctionPopConfirm(string title, string info, Action<bool> func)

        {

            popConfirmTitle = title;

            popConfirmInfo = info;

            OnPopConfirmClickEvent = func;

            OnPopSingleConfirmEvent = null;

            IsSingleConfirm = false;

            WindowCenter.Instance.Open<CancelAuctionConfirmWin>();

        }



        #region 带toggle的确认取消

        public static string generalTitle;

        public static string generalContent;