5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

Client_PangDeRong

2018-12-26 4429ed86c89cd1c80dcc51b64a55fbdee7755948

5398 子 【开发】【1.4】跨服竞技场 / 【前端】【1.4】跨服竞技场开发

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -149,45 +149,31 @@


        private void UpdateActivityState()

        {

            //bool isInTime = CrossServerPKSeason.Instance.InDay(TimeUtility.ServerNow);

            //bool isOpen = CrossServerPKSeason.Instance.InOpenTime();

            //inSeasonTimeObj.SetActive(isInTime);

            //outSeasonTimeObj.SetActive(!isInTime);

            //matchBtn.RemoveAllListeners();

            //if(isInTime)

            //{

            //    matchBtn_Text.text = Language.Get("CrossServer109");

            //    if (isOpen)

            //    {

            //        matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

            //        if (!crossServerRewardModel.IsOpenMatch)

            //        {

            //            matchBtn.AddListener(()=> { ClickMatch(1); });

            //        }

            //        else

            //        {

            //            matchBtn_Text.text = Language.Get("CrossServer110");

            //            matchBtn.AddListener(() => { ClickMatch(0); });

            //        }

            //    }

            //    else

            //    {

            //        matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            //    }

            //}

            inSeasonTimeObj.SetActive(true);

            outSeasonTimeObj.SetActive(false);

            bool isInTime = CrossServerOneVsOnePKSeason.Instance.InPkSeason(TimeUtility.ServerNow);

            bool isOpen = CrossServerOneVsOnePKSeason.Instance.InOpenTime();

            inSeasonTimeObj.SetActive(isInTime);

            outSeasonTimeObj.SetActive(!isInTime);

            matchBtn.RemoveAllListeners();

            matchBtn_Text.text = Language.Get("CrossServer109");

            matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

            if (!crossServerModel.IsMatching)

            if (isInTime)

            {

                matchBtn.AddListener(() => { ClickMatch(1); });

            }

            else

            {

                matchBtn_Text.text = Language.Get("CrossServer110");

                matchBtn.AddListener(() => { ClickMatch(0); });

                matchBtn_Text.text = Language.Get("CrossServer109");

                if (isOpen)

                {

                    matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    if (!crossServerModel.IsMatching)

                    {

                        matchBtn.AddListener(() => { ClickMatch(1); });

                    }

                    else

                    {

                        matchBtn_Text.text = Language.Get("CrossServer110");

                        matchBtn.AddListener(() => { ClickMatch(0); });

                    }

                }

                else

                {

                    matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                }

            }

        }




 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -403,7 +403,7 @@
            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;

            var pkSeason = CrossServerOneVsOnePKSeason.Instance;



            if(pkSeason.InDay(TimeUtility.ServerNow) 
            if(pkSeason.InPkSeason(TimeUtility.ServerNow) 
                && pkSeason.InOpenTime()

                && playerInfo.GetDayRemainNum() > 0)

            {


 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));

                }