Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -86,7 +86,6 @@
            recordPositionBool = true;

            TaskSwithBool = true;

            m_MainPositionTween.SetTaskPos(true);

            m_MainPositionTween.SetFunctionForecastPos(true);

            m_MailObj.SetActive(true);       

            ListBossMapId.Clear();

            string strBoss = FuncConfigConfig.Get("TaskRetract").Numerical1;

@@ -250,7 +249,7 @@
            m_TeamInvitationEntrance.UnInit();

            m_FairyCallBehaviour.UnInit();

            m_FairyLeagueRemind.UnInit();

            m_MainButtonMisc.Unit();

            m_MainButtonMisc.UnInit();



            PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;

            FunctionUnlockFlyObject.functionUnLockShowBeginEvent -= UnFlodFunctionArea;

@@ -488,27 +487,20 @@


        void TaskSwithButton()

        {

            var inDungeon = IsDungeon();            
            if (TaskSwithBool)//隐藏

            {

                m_MainPositionTween.SetTaskPosTween(false);

                if (!inDungeon)

                {

                    m_MainPositionTween.SetFunctionForecastPosTween(false);

                }

            }

            else//显示

            {

                m_MainPositionTween.SetTaskPosTween(true);

                if (!inDungeon)

                {

                    m_MainPositionTween.SetFunctionForecastPosTween(true);

                }

            }



            if (onMainModel.IsBossAreaTask)

            {

                onMainModel.IsBossAreaTask = false;

            }



            TaskSwithBool = !TaskSwithBool;

        }



@@ -709,10 +701,6 @@
        {

            bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();

            m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            if (!_chatWinOpen)

            {

                m_ChatTip.CheckRealmSfx();

            }

        }



        private void WindowAfterEvent(Window _win)

@@ -820,7 +808,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(true, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(true, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = true;

                if (_isTween)

@@ -840,7 +828,7 @@
                }

                if (Event_Duplicates != null && inDungeon)

                {

                    Event_Duplicates(false, m_MainPositionTween.CopyOfThePanelSpeed);

                    Event_Duplicates(false, m_MainPositionTween.rightTopSwitchTime);

                }

                onMainModel.MainTopPanelShow = false;

                if (_isTween)