Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝

client_linchunjie

2018-12-26 a4f28fbd46f23514eed3c03e64cfc9e4010670ca

 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

@@ -115,7 +115,7 @@


        private void SecondEvent()

        {

            if(!inDateNotify && InDay(TimeUtility.ServerNow))

            if(!inDateNotify && InPkSeason(TimeUtility.ServerNow))

            {

                inDateNotify = true;

                stepDateNotify = false;

@@ -124,7 +124,7 @@
                    activityStartEvent();

                }

            }

            else if(!stepDateNotify && !InDay(TimeUtility.ServerNow))

            else if(!stepDateNotify && !InPkSeason(TimeUtility.ServerNow))

            {

                inDateNotify = false;

                stepDateNotify = true;

@@ -220,7 +220,7 @@
            return true;

        }



        public bool InDay(DateTime time)

        public bool InPkSeason(DateTime time)

        {

            OperationDate date = new OperationDate()

            {

@@ -246,7 +246,7 @@


        public int IndexOfDays(DateTime time)

        {

            if (!InDay(time))

            if (!InPkSeason(time))

            {

                return -1;

            }

@@ -267,7 +267,7 @@
            if(isSeason)

            {

                if (!seasonInfo.StartDate.Equals(default(OperationDate))

                    && InDay(TimeUtility.ServerNow))

                    && InPkSeason(TimeUtility.ServerNow))

                {

                    return Language.Get("CrossServer106", ToDisplayTime(seasonInfo.StartDate, seasonInfo.EndDate));

                }