Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Chat/ChatCenter.cs

@@ -708,7 +708,7 @@
            CheckChatFloatOpen();

            if (win is MainInterfaceWin)

            {

                CheckOpenChatAfterCollect();

                SnxxzGame.Instance.StartCoroutine(Co_CheckAfterCollect());

            }

        }



@@ -744,6 +744,12 @@
            CheckOpenChatAfterCollect();

        }



        IEnumerator Co_CheckAfterCollect()

        {

            yield return null;

            CheckOpenChatAfterCollect();

        }



        void CheckOpenChatAfterCollect()

        {

            if (!openChatAfterCollect)

@@ -754,7 +760,7 @@
            {

                return;

            }

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

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

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()

                || StageManager.Instance.isLoading

                || NewBieCenter.Instance.inGuiding)

@@ -766,7 +772,7 @@
            {

                ChatCtrl.Inst.presentChatType = ChatInfoType.Fairy;

                WindowCenter.Instance.CloseImmediately<MainInterfaceWin>();

                WindowCenter.Instance.Open<SocialWin>(false, 2);

                WindowCenter.Instance.Open<SocialWin>();

            }

        }

        #endregion