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

client_linchunjie

2019-01-31 4b241f8fe341a7387b2a6e956adaadf9721515b5

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

 System/OpenServerActivity/SpringFestivalModel.cs

@@ -42,7 +42,7 @@
    }

    public override void Init()

    {

       


    }



    public void OnBeforePlayerDataInitialize()

@@ -59,10 +59,10 @@
        OperationTimeHepler.Instance.dayResetEvent += DayResetEvent;

    }



   


    public override void UnInit()

    {

       


    }

    private void DayResetEvent(int obj)

    {

@@ -318,7 +318,7 @@
    }

    private RedPointState SetRedPointState(int day)//红点状态设置

    {

        if (!SpringFestivalDayDic.ContainsKey(day) || !SpringFestivalInfoDic.ContainsKey(day) || day>DayNow)

        if (!SpringFestivalDayDic.ContainsKey(day) || !SpringFestivalInfoDic.ContainsKey(day) || day > DayNow)

        {

            return RedPointState.None;

        }

@@ -370,13 +370,17 @@
        if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.SpringFestival, out operationBase))

        {

            int inday = (operationBase as EventDaysTime).GetInDayNow();

            if (inday >= 0 && inday < SpringFestivalInfoDic.Count)

            if (SpringFestivalInfoDic.Count <= 0 && inday <= 0)

            {

                _DayNow = 0;

            }

            else if (inday >= 0 && SpringFestivalInfoDic.Count > 0 && inday < SpringFestivalInfoDic.Count)

            {

                _DayNow = inday;

            }

            else if (inday >= SpringFestivalInfoDic.Count)

            else if (SpringFestivalInfoDic.Count > 0 && inday >= SpringFestivalInfoDic.Count)

            {

                _DayNow = SpringFestivalInfoDic.Count-1;

                _DayNow = SpringFestivalInfoDic.Count - 1;

            }



        }

@@ -385,7 +389,7 @@
    public bool IsOpenFeatures()

    {

        bool Isbool = false;

        Isbool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.SpringFestival) 
        Isbool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.SpringFestival)

            || OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.SpringFestival));

        return Isbool;

    }