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

client_Hale

2018-09-29 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3

 System/Vip/LimitedTimePackageModel.cs

@@ -21,7 +21,7 @@
        OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

    }



    




    public bool IsShowPanel = false;

    private const int Redpoint_key1 = 20907;

@@ -63,9 +63,13 @@
    {

        OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;

        OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;

        OperationTimeHepler.Instance.operationAdvanceEvent -= operationAdvanceEvent;

        OperationTimeHepler.Instance.operationAdvanceEvent += operationAdvanceEvent;

        IsShowTip();



    }







    private void operationStartEvent(Operation arg1, int arg2)

    {

@@ -78,7 +82,17 @@
            }

        }

    }



    private void operationAdvanceEvent(Operation obj)

    {

        if (obj == Operation.GiftPackage)

        {

           // IsShowTip();

            if (onStateUpate != null)

            {

                onStateUpate(7);

            }

        }

    }

    private void OperationEndEvent(Operation arg1, int arg2)

    {

        if (arg1 == Operation.GiftPackage && arg2 == 0)

@@ -92,6 +106,10 @@


    public void IsShowTip()

    {

        if (OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage))

        {

            return;

        }

        int GetDayOfYear = DateTime.Now.DayOfYear;

        int day = LocalSave.GetInt("IsOpenLimitedTime");

        bool Isbool = IsExpired();

@@ -143,7 +161,7 @@
    public bool IsExpired()

    {

        bool IsBool = false;

        IsBool =(OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage)|| OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));

        IsBool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage) || OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));

        bool IsBuyBool = false;

        OperationBase operationBase;

        if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase))