Merge branch '3442运营活动修改'

client_linchunjie

2018-09-17 db0192c0e911dc86d828ec650e995282e6eacdf2

 System/Welfare/MultipleExpModel.cs

@@ -45,7 +45,7 @@
                    {

                        for (int i = 0; i < operationBase.times.Count; i++)

                        {

                            if (operationBase.times[i].SideOfTime(TimeUtility.ServerNow) == -1)

                            if (operationBase.times[i].CompareTime(TimeUtility.ServerNow) == -1)

                            {

                                SysNotifyMgr.Instance.ShowTip("ExpActivity_Ready",

                                    operation.GetMultipleCHS(),

@@ -128,6 +128,14 @@
            }

        }



        public bool IsAdvance

        {

            get

            {

                return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.MultipleExp);

            }

        }



        public void SetDayRemind()

        {

            if (multipleExpRedpoint.state == RedPointState.Simple)