Merge branch '3442运营活动修改'

client_linchunjie

2018-09-17 db0192c0e911dc86d828ec650e995282e6eacdf2

 System/OpenServerActivity/ImpactRankModel.cs

@@ -670,6 +670,14 @@
                return TimeUtility.OpenDay < openServerRankDays && FuncOpen.Instance.IsFuncOpen(125);

            }

        }



        public bool IsAdvance

        {

            get

            {

                return false;

            }

        }

        #endregion

    }



@@ -716,7 +724,7 @@
            _functionOrder = 0;

            foreach (var _order in openServerActivitys.Keys)

            {

                if (openServerActivitys[_order].IsOpen)

                if (openServerActivitys[_order].IsOpen || openServerActivitys[_order].IsAdvance)

                {

                    _functionOrder = _order;

                    return true;

@@ -729,7 +737,7 @@
        {

            if (openServerActivitys.ContainsKey(_funcOrder))

            {

                return openServerActivitys[_funcOrder].IsOpen;

                return openServerActivitys[_funcOrder].IsOpen || openServerActivitys[_funcOrder].IsAdvance;

            }

            return false;

        }

@@ -765,6 +773,7 @@
    public interface IOpenServerActivity

    {

        bool IsOpen { get; }

        bool IsAdvance { get; }

        bool priorityOpen { get; }



        event Action<int> onStateUpate;