Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -102,11 +102,11 @@


        private void IsCloseWindow()

        {

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

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

            {

                WindowCenter.Instance.CloseImmediately<DungeonFightWin>();

            }

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

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

            {

                WindowCenter.Instance.CloseImmediately<DungeonMissionDetailsWin>();

            }

@@ -162,7 +162,7 @@
            {

                WindowCenter.Instance.Open<DungeonFightWin>();

            }

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

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

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

@@ -176,7 +176,7 @@
                return;

            }



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

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

            {

                return;

            }