Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-04-09 f58b982abb974dbc9d6b88ac1868317d062e52df

 System/DailyQuest/DailyQuestWin.cs

@@ -61,6 +61,7 @@


        protected override void OnAfterOpen()

        {

            model.currentActiveValueUpdateEvent += OnUpdateCurrentActive;

        }



        protected override void OnPreClose()

@@ -69,6 +70,8 @@
            model.currentDailyQuest = 0;

            m_HangTimeBehaviour.Dispose();

            m_QuestScroll.Dispose();



            model.currentActiveValueUpdateEvent -= OnUpdateCurrentActive;

        }



        protected override void OnAfterClose()

@@ -153,7 +156,8 @@
        private void ShowQuestGroups(List<int> _quests)

        {

            m_HangTimeBehaviour.Display();

            m_DailyQuestActiveSlider.UpdateActiveValue( model.currentActiveValue,  model.dailyQuestTotalActiveValue);

            m_DailyQuestActiveSlider.Initialize();

            m_DailyQuestActiveSlider.UpdateCurrentActiveValue(model.currentActiveValue, model.dailyQuestTotalActiveValue);

            var groupDatas = new List<DailyQuestGroup.GroupData>();

            var max = _quests.Count;

            for (int i = 0; i < max; i++, i++)

@@ -180,6 +184,11 @@
        private void ShowCalendar()

        {

            WindowCenter.Instance.Open<DailyQuestCalendarWin>();

        }



        private void OnUpdateCurrentActive()

        {

            m_DailyQuestActiveSlider.UpdateCurrentActiveValue(model.currentActiveValue, model.dailyQuestTotalActiveValue);

        }



        public void GotoDailyQuest(int _id)

@@ -287,10 +296,6 @@
                    GotoTreasureCollectSoul();

                    break;

                case DailyQuestType.DungeonAssist:

                    //WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    //ChatCtrl.Inst.presentChatType = ChatInfoType.World;

                    //ChatCtrl.Inst.openFromDaily = true;

                    //WindowCenter.Instance.Open<ChatWin>();

                    WindowCenter.Instance.Open<DungeonAssistWin>();

                    break;

                case DailyQuestType.FairyGrabBoss:

@@ -317,14 +322,6 @@
                case DailyQuestType.AllianceBoss2:

                    GotoAllianceBoss(_id, 1);

                    break;

                //case DailyQuestType.JadeDynastyBoss:

                //    WindowCenter.Instance.Close<DailyQuestWin>();

                //    WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 3);

                //    break;

                //case DailyQuestType.JadeDynastyTower:

                //    WindowCenter.Instance.Close<DailyQuestWin>();

                //    WindowCenter.Instance.Open<TowerWin>(false, 1);

                //    break;

                default:

                    CSharpCallLua.GotoLuaDailyQuest(_id);

                    break;