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

client_Wu Xijin

2018-10-08 3c0f3b10322492939bc1a340f31eabffad5eef57

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

 Core/NetworkPackage/DTCFile/ServerPack/HAC_Activity/DTCAC09_tagGCFairyCeremonyInfo.cs

@@ -6,7 +6,8 @@






public class DTCAC09_tagGCFairyCeremonyInfo : DtcBasic {

public class DTCAC09_tagGCFairyCeremonyInfo : DtcBasic

{



    FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } }




 Core/NetworkPackage/ServerPack/HAC_Activity/HAC09_tagGCFairyCeremonyInfo.cs

@@ -8,6 +8,7 @@
    public string EndtDate;    // 结束日期 y-m-d


    public ushort WorldLV;    // 世界等级


    public ushort LimitLV;    // 限制等级


    public byte ResetType;    // 重置类型 0-0点重置 1-5点重置




    public HAC09_tagGCFairyCeremonyInfo () {


        _cmd = (ushort)0xAC09;


@@ -18,6 +19,7 @@
        TransBytes (out EndtDate, vBytes, NetDataType.Chars, 10);


        TransBytes (out WorldLV, vBytes, NetDataType.WORD);


        TransBytes (out LimitLV, vBytes, NetDataType.WORD);


        TransBytes (out ResetType, vBytes, NetDataType.BYTE);

    }





}



 System/KnapSack/New/BatchUseModel.cs

@@ -1,30 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using TableConfig;

namespace Snxxz.UI
{
    public class BatchUseModel : Singleton<BatchUseModel>
using System;

using System.Collections.Generic;

using System.Linq;

using System.Text;

using TableConfig;



namespace Snxxz.UI

{

    public class BatchUseModel : Singleton<BatchUseModel>

    {

        #region 批量使用数据
        public string guid { get; private set; }
        public void SetBatchModel(string guid)
        {
            extraPrams = 0;
            this.maxValue = 0;
            this.guid = guid;
        }

        public int extraPrams { get; private set; }
        public int maxValue { get; private set; }
        public void SetExtraInfo(int extraUseInfo, int maxValue)
        #region 批量使用数据

        public string guid { get; private set; }

        public void SetBatchModel(string guid)

        {

            this.extraPrams = extraUseInfo;
            this.maxValue = maxValue;
            extraPrams = 0;

            this.maxValue = 0;

            this.guid = guid;

        }

        #endregion


        public int extraPrams { get; private set; }

        public int maxValue { get; private set; }

        public void SetExtraInfo(int extraUseInfo, int maxValue)

        {

            this.extraPrams = extraUseInfo;

            this.maxValue = maxValue;

        }

        #endregion



        #region 批量购买数据

        public StoreConfig storeConfig { get; private set; }

@@ -50,6 +50,6 @@
        {

            storeConfig = null;

        }

        #endregion
    }
}
        #endregion

    }

}


 System/Welfare/OperationTimeHepler.cs

@@ -310,6 +310,7 @@
                operation.startDate = ParseOperationDate(package.StartDate);

                operation.endDate = ParseOperationDate(package.EndtDate);

                operation.limitLv = package.LimitLV;

                operation.resetType = package.ResetType;

                if (operationTimeUpdateEvent != null)

                {

                    operationTimeUpdateEvent(Operation.FairyCeremony);