3318 仙盟联赛时间修改

client_linchunjie

2018-09-07 55cbc7f370d731494aabbb1232fe40d38934bf80

3318 仙盟联赛时间修改

 System/FairyAu/FairyLeagueModel.cs

@@ -75,7 +75,7 @@
            DTCA003_tagUniversalGameRecInfo.onGetUniversalGameInfo += OnGetUniversalGameInfo;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

            GlobalTimeEvent.Instance.minuteEvent += MinuteEvent;

            TimeMgr.Instance.OnMinuteEvent += MinuteEvent;

            TimeMgr.Instance.OnDayEvent += DayEvent;

            fairyLeagueHelp = new FairyLeagueHelp();

        }

@@ -83,7 +83,7 @@
        public override void UnInit()

        {

            DTCA003_tagUniversalGameRecInfo.onGetUniversalGameInfo -= OnGetUniversalGameInfo;

            GlobalTimeEvent.Instance.minuteEvent -= MinuteEvent;

            TimeMgr.Instance.OnMinuteEvent -= MinuteEvent;

            TimeMgr.Instance.OnDayEvent -= DayEvent;

        }



@@ -136,6 +136,7 @@
                {

                    OnRefreshFairyLeagueEvent();

                }

                DebugEx.LogFormat("进入{0}阶段", fairyLeagueStage);

            }

        }



@@ -555,21 +556,24 @@
                    break;

                case 5:

                    var _session = fairyLeagueSession;

                    var isNextWeek = IsNextWeek;

                    FairyLeagueWeekTime.Session session;

                    currentWeekTime.TryGetSession(fairyLeagueRing, _session, out session);

                    var weekTime = isNextWeek ? nextWeekTime : currentWeekTime;

                    weekTime.TryGetSession(fairyLeagueRing, 1 - _session, out session);

                    var fightStage = session.stages.Find((x) =>

                    {

                        return x.stage == FairyLeagueStage.Fight;

                    });

                    if (_session == 0)

                    {

                        var _param = StringUtility.Contact(Language.Get(StringUtility.Contact("Weekday", currentWeekTime.GetDayOfWeek(fairyLeagueRing))),

                        var _param = StringUtility.Contact(Language.Get(StringUtility.Contact("Weekday", weekTime.GetDayOfWeek(fairyLeagueRing))),

                            fightStage.startHour.ToString("D2"), ":", fightStage.startMinute.ToString("D2"));

                        SysNotifyMgr.Instance.ShowTip("LeagueCannotGo1", _param);

                    }

                    else

                    {

                        var _param = StringUtility.Contact(Language.Get("Next"), Language.Get(StringUtility.Contact("Weekday", currentWeekTime.GetDayOfWeek(fairyLeagueRing))),

                        var _param = StringUtility.Contact(isNextWeek ? Language.Get("Next") : Language.Get("ThisTime"),

                            Language.Get(StringUtility.Contact("Weekday", weekTime.GetDayOfWeek(fairyLeagueRing))),

                            fightStage.startHour.ToString("D2"), ":", fightStage.startMinute.ToString("D2"));

                        SysNotifyMgr.Instance.ShowTip("LeagueCannotGo2", _param);

                    }

@@ -1080,17 +1084,35 @@


            public bool InSession(DateTime time)

            {

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

                var groupStage = stages.Find((x) =>

                {

                    if (stages[i].InStage(time))

                    {

                        return true;

                    }

                    return x.stage == FairyLeagueStage.Grouping;

                });

                var overStage = stages.Find((x) =>

                {

                    return x.stage == FairyLeagueStage.Over;

                });

                var _dayOfWeek = time.DayOfWeek == DayOfWeek.Sunday ? 7 : (int)time.DayOfWeek;

                if (_dayOfWeek != groupStage.dayOfWeek)

                {

                    return false;

                }

                return false;

                if (time.Hour < groupStage.startHour || time.Hour > overStage.endHour)

                {

                    return false;

                }

                if (time.Hour == groupStage.startHour && time.Minute < groupStage.startMinute)

                {

                    return false;

                }

                if (time.Hour == overStage.endHour && time.Minute > overStage.endMinute)

                {

                    return false;

                }

                return true;

            }



            public bool TryGetStage(DateTime time,out Stage stage)

            public bool TryGetStage(DateTime time, out Stage stage)

            {

                stage = default(Stage);

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

@@ -1100,8 +1122,12 @@
                        stage = stages[i];

                        return true;

                    }

                    if (stages[i].IsOver(time))

                    {

                        stage = stages[i];

                    }

                }

                return false;

                return !stage.Equals(default(Stage));

            }



            public bool IsOver(DateTime time)

@@ -1143,7 +1169,7 @@
                {

                    return false;

                }

                if (time.Hour == endHour && time.Minute >= endMinute)

                if (time.Hour == endHour && time.Minute > endMinute)

                {

                    return false;

                }

@@ -1152,10 +1178,6 @@


            public bool IsOver(DateTime time)

            {

                if (InStage(time))

                {

                    return false;

                }

                var _dayOfWeek = time.DayOfWeek == DayOfWeek.Sunday ? 7 : (int)time.DayOfWeek;

                if (_dayOfWeek > dayOfWeek)

                {

@@ -1167,7 +1189,7 @@
                    {

                        return true;

                    }

                    if (time.Hour == endHour && time.Minute >= endMinute)

                    if (time.Hour == endHour && time.Minute > endMinute)

                    {

                        return true;

                    }


 System/FairyAu/FairyLeagueWin.cs

@@ -153,15 +153,6 @@


        private void RefreshPrepare()

        {

            if (TimeUtility.OpenWeekCnt > model.OpenServerWeek)

            {

                m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification");

            }

            else

            {

                m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification2");

            }



            var isNextWeek = model.IsNextWeek;

            var weekTime = isNextWeek ? model.nextWeekTime : model.currentWeekTime;

            var ring = isNextWeek ? 0 : weekTime.currentRing;

@@ -262,6 +253,16 @@
            {

                return;

            }



            if (HasGradeFairy())

            {

                m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification");

            }

            else

            {

                m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification2");

            }



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

            {

                List<PlayerFairyData.FairyData> list = model.frontLeagueFairy;

@@ -282,16 +283,31 @@
                }

            }

        }



        bool HasGradeFairy()

        {

            List<PlayerFairyData.FairyData> list = model.frontLeagueFairy;

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

            {

                if (list[i].WarRank != 0)

                {

                    return true;

                }

            }

            return false;

        }



        private void UpdateFairyLeagueBattle()

        {

            var _session = model.fairyLeagueSession;

            var fairyLeagueStage = model.fairyLeagueStage;

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

            {

                var fairyClash = m_FairyClashList[i];

                List<FairyLeagueBattleData> list = model.GetFairyLeague(model.StepSession(fairyClash.grade) ? 0 : model.fairyLeagueSession, fairyClash.grade);

                fairyClash.SetActive((model.fairyLeagueStage == FairyLeagueStage.Over && _session == 1)

                fairyClash.SetActive((fairyLeagueStage == FairyLeagueStage.Over && _session == 1)

                    || model.StepSession(fairyClash.grade));

                if ((model.fairyLeagueStage == FairyLeagueStage.Over && _session == 1) || model.StepSession(fairyClash.grade))

                if ((fairyLeagueStage == FairyLeagueStage.Over && _session == 1) || model.StepSession(fairyClash.grade))

                {

                    if (list == null || list.Count == 0)

                    {