Merge branch 'master' into 技能升级修改

client_linchunjie

2019-04-28 befbbfa399d03b62bc10959597c42fe9f1c52edb

 System/WindowBase/WindowCenter.cs

@@ -553,6 +553,7 @@
        float checkTimer = 0f;

        private void LateUpdate()

        {

            var checkMainWinImmedidately = closeCommands.Count + openCommands.Count > 0;

            while (closeCommands.Count > 0)

            {

                var command = closeCommands[0];

@@ -594,7 +595,7 @@


            }



            checkTimer += Time.deltaTime;

            checkTimer += checkMainWinImmedidately ? 1f : Time.deltaTime;

            if (checkTimer > 0.5f)

            {

                checkTimer = 0f;

@@ -609,15 +610,15 @@
                        && !IsOpen("HazyRegionDialogueWin")

                        && !IsOpen("NormalDialogueWin");



                    if (exceptOpen != IsOpen("MainInterfaceWin"))

                    if (exceptOpen != IsOpen("MainInterfaceWin") && windows.ContainsKey("MainInterfaceWin"))

                    {

                        if (exceptOpen)

                        {

                            Open("MainInterfaceWin", true);

                            windows["MainInterfaceWin"].Open();

                        }

                        else

                        {

                            Close("MainInterfaceWin");

                            windows["MainInterfaceWin"].CloseImmediately();

                        }

                    }

                }