Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-24 6ce4ae16561fd205c8bb3f530d5a20033f207f4f

 System/WorldMap/WorldMapWin.cs

@@ -56,6 +56,10 @@


        protected override void OnAfterClose()

        {

            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }



        protected override void OnActived()

@@ -67,11 +71,6 @@
        public override void CloseClick()

        {

            base.CloseClick();



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }



        void Init()