Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2018-08-24 1d24fbd1655e724eebb2e717c9f0ed80e881b582

 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()