3318 仙盟联赛时间修改

client_linchunjie

2018-09-07 36abc2dde086a89553574b026ec9751a94d2f203

3318 仙盟联赛时间修改

 System/FairyAu/FairyLeagueModel.cs

@@ -13,12 +13,12 @@
    {

        public event Action OnRefreshFairyLeagueEvent;



        FairyLeagueWeekTime currentWeekTime

        public FairyLeagueWeekTime currentWeekTime

        {

            get { return fairyLeagueWeekTime; }

        }



        FairyLeagueWeekTime nextWeekTime

        public FairyLeagueWeekTime nextWeekTime

        {

            get { return fairyLeagueWeekTime; }

        }

@@ -38,6 +38,14 @@
            get

            {

                return currentWeekTime.currentSession;

            }

        }



        public int fairyLeagueRing

        {

            get

            {

                return currentWeekTime.currentRing;

            }

        }



@@ -547,18 +555,23 @@
                    break;

                case 5:

                    var _session = fairyLeagueSession;

                    _session = fairyLeagueStage == FairyLeagueStage.Fight || fairyLeagueStage == FairyLeagueStage.Over ? 1 - _session : _session;

                    if (_session == 1)

                    FairyLeagueWeekTime.Session session;

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

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

                    {

                        //var _param = StringUtility.Contact(Language.Get(StringUtility.Contact("Weekday", groupTimes[_ring].dayOfWeek)),

                        //    fightTimes[1].startHour.ToString("D2"), ":", fightTimes[1].startMinute.ToString("D2"));

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

                        return x.stage == FairyLeagueStage.Fight;

                    });

                    if (_session == 0)

                    {

                        var _param = StringUtility.Contact(Language.Get(StringUtility.Contact("Weekday", currentWeekTime.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", groupTimes[_ring].dayOfWeek)),

                        //    fightTimes[0].startHour.ToString("D2"), ":", fightTimes[0].startMinute.ToString("D2"));

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

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

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

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

                    }

                    break;

                case 6:

@@ -688,7 +701,7 @@
            return null;

        }



        public bool StepRing(int _grade = 5)

        public bool StepSession(int _grade = 5)

        {

            if (fairyLeagueSession == 1)

            {

@@ -932,6 +945,20 @@
            return false;

        }



        public bool TryGetSession(int _ring, int _session, out Session session)

        {

            session = null;

            if (_ring >= 0 && _ring < rings.Count)

            {

                if (_session >= 0 && _session < rings[_ring].sessions.Count)

                {

                    session = rings[_ring].sessions[_session];

                    return true;

                }

            }

            return false;

        }



        public class Ring

        {

            public List<Session> sessions = new List<Session>();


 System/FairyAu/FairyLeagueWin.cs

@@ -153,7 +153,6 @@


        private void RefreshPrepare()

        {

            var _session = model.fairyLeagueSession;

            if (TimeUtility.OpenWeekCnt > model.OpenServerWeek)

            {

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

@@ -163,9 +162,20 @@
                m_PrepareTitleTxt.text = Language.Get("FamilyMatchQualification2");

            }



            //m_CutOffTimeTxt.text = Language.Get("FamilyMatchBlockingTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"),

            //    Language.Get(StringUtility.Contact("Weekday", model.groupTimes[_ring].dayOfWeek)), model.groupTimes[_ring].startHour,

            //    model.groupTimes[_ring].startMinute.ToString("D2"));

            var isNextWeek = model.IsNextWeek;

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

            var ring = isNextWeek ? 0 : weekTime.currentRing;

            FairyLeagueWeekTime.Session session;

            if (weekTime.TryGetSession(ring, 0, out session))

            {

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

                {

                    return x.stage == FairyLeagueStage.Grouping;

                });

                m_CutOffTimeTxt.text = Language.Get("FamilyMatchBlockingTime", isNextWeek ? Language.Get("Next") : Language.Get("ThisTime"),

                         Language.Get(StringUtility.Contact("Weekday", weekTime.GetDayOfWeek(ring))), stage.startHour,

                         stage.startMinute.ToString("D2"));

            }



            UpdateFairyLeagueGroup();

            UpdateStageTime();

@@ -194,40 +204,57 @@
            var _session = model.fairyLeagueSession;

            bool _stage1Over = false;

            bool _stage2Over = false;

            //m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", model.groupTimes[_ring].dayOfWeek)));

            //if (_ring > 0 || model.fairyLeagueStage == FairyLeagueStage.Over)

            //{

            //    _stage1Over = true;

            //    m_StageTime1.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_1")), ":   ", Language.Get("FamilyMatchAlreadyEnd"));

            //}

            //if (_ring > 0 && model.fairyLeagueStage == FairyLeagueStage.Over)

            //{

            //    _stage2Over = true;

            //    m_StageTime2.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_2")), ":   ", Language.Get("FamilyMatchAlreadyEnd"));

            //}

            //if (!_stage1Over)

            //{

            //    m_StageTime1.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_1")), ":   ",

            //        Language.Get(StringUtility.Contact("Weekday", model.groupTimes[0].dayOfWeek)), " ", model.fightTimes[0].startHour, ":",

            //        model.fightTimes[0].startMinute.ToString("D2"), "-", model.fightTimes[0].endHour, ":",

            //        model.fightTimes[0].endMinute.ToString("D2"));

            //}

            //if (!_stage2Over)

            //{

            //    m_StageTime2.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_2")), ":   ",

            //        Language.Get(StringUtility.Contact("Weekday", model.groupTimes[1].dayOfWeek)), " ", model.fightTimes[1].startHour, ":",

            //        model.fightTimes[1].startMinute.ToString("D2"), "-", model.fightTimes[1].endHour, ":",

            //        model.fightTimes[1].endMinute.ToString("D2"));

            //}

            //if (_ring == 0 && model.fairyLeagueStage == FairyLeagueStage.Over)

            //{

            //    m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", model.groupTimes[1].dayOfWeek)));

            //}

            //else

            //{

            //    m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", model.groupTimes[_ring].dayOfWeek)));

            //}

            var isNextWeek = model.IsNextWeek;

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

            var ring = isNextWeek ? 0 : weekTime.currentRing;

            var fairyLeagueStage = model.fairyLeagueStage;

            FairyLeagueWeekTime.Session session;

            weekTime.TryGetSession(ring, _session, out session);



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

            {

                return x.stage == FairyLeagueStage.Grouping;

            });

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

            {

                return x.stage == FairyLeagueStage.Fight;

            });



            m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", weekTime.GetDayOfWeek(ring))));

            if (_session > 0 || fairyLeagueStage == FairyLeagueStage.Over)

            {

                _stage1Over = true;

                m_StageTime1.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_1")), ":   ", Language.Get("FamilyMatchAlreadyEnd"));

            }

            if (_session > 0 && fairyLeagueStage == FairyLeagueStage.Over)

            {

                _stage2Over = true;

                m_StageTime2.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_2")), ":   ", Language.Get("FamilyMatchAlreadyEnd"));

            }

            if (!_stage1Over)

            {

                m_StageTime1.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_1")), ":   ",

                    Language.Get(StringUtility.Contact("Weekday", groupStage.dayOfWeek)), " ", fightStage.startHour, ":",

                    fightStage.startMinute.ToString("D2"), "-", fightStage.endHour, ":",

                    fightStage.endMinute.ToString("D2"));

            }

            if (!_stage2Over)

            {

                m_StageTime2.text = StringUtility.Contact(Language.Get("FamilyMatchWhichTurn", Language.Get("Num_CHS_2")), ":   ",

                    Language.Get(StringUtility.Contact("Weekday", groupStage.dayOfWeek)), " ", fightStage.startHour, ":",

                    fightStage.startMinute.ToString("D2"), "-", fightStage.endHour, ":",

                    fightStage.endMinute.ToString("D2"));

            }

            if (_session == 0 && fairyLeagueStage == FairyLeagueStage.Over)

            {

                m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", groupStage.dayOfWeek)));

            }

            else

            {

                m_LeagueStartTime.text = Language.Get("FamilyMatchWeekTime", model.IsNextWeek ? Language.Get("Next") : Language.Get("ThisTime"), Language.Get(StringUtility.Contact("Weekday", groupStage.dayOfWeek)));

            }

        }



        private void UpdateFairyLeagueGroup()

        {

            if (model.fairyLeagueStage != FairyLeagueStage.Prepare)

@@ -260,10 +287,10 @@
            for (int i = 0; i < m_FairyClashList.Count; i++)

            {

                var fairyClash = m_FairyClashList[i];

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

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

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

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

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

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

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

                {

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

                    {