Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/Chat/ChatCenter.cs

@@ -605,7 +605,7 @@


        private void AutoPlayVoice()

        {

            if (voicePlaying || WindowCenter.Instance.CheckOpen<LoadingWin>()

            if (voicePlaying || WindowCenter.Instance.IsOpen<LoadingWin>()

                || !(StageManager.Instance.CurrentStage is DungeonStage))

            {

                return;

@@ -716,17 +716,17 @@


        private void CheckChatFloatOpen()

        {

            if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.CheckOpen<LoadingWin>()

                && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.CheckOpen<TreasureLevelUpWin>())

            if (WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !WindowCenter.Instance.IsOpen<LoadingWin>()

                && StageManager.Instance.CurrentStage is DungeonStage && !WindowCenter.Instance.IsOpen<TreasureLevelUpWin>())

            {

                if (!WindowCenter.Instance.CheckOpen<ChatFloatWin>())

                if (!WindowCenter.Instance.IsOpen<ChatFloatWin>())

                {

                    WindowCenter.Instance.Open<ChatFloatWin>();

                }

            }

            else

            {

                if (WindowCenter.Instance.CheckOpen<ChatFloatWin>())

                if (WindowCenter.Instance.IsOpen<ChatFloatWin>())

                {

                    WindowCenter.Instance.CloseImmediately<ChatFloatWin>();

                }

@@ -762,7 +762,7 @@
            {

                return;

            }

            if (!WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()

                || StageManager.Instance.isLoading

                || NewBieCenter.Instance.inGuiding)

@@ -770,7 +770,7 @@
                return;

            }

            openChatAfterCollect = false;

            if (!WindowCenter.Instance.CheckOpen<ChatWin>())

            if (!WindowCenter.Instance.IsOpen<ChatWin>())

            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

                WindowCenter.Instance.Open<ChatWin>();