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

client_Zxw

2018-09-26 cbe3d7c2cb4fbf96f3a2295351fa03ea14035499

 System/Activity/ActivityModel.cs

@@ -85,7 +85,7 @@
                }

            }

            activityNotifies.Clear();

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

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

            {

                WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();

            }

@@ -136,7 +136,7 @@
                {

                    mainStage = false;

                    activityNotifies.Clear();

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

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

                    {

                        WindowCenter.Instance.CloseImmediately<ActivityNotifyWin>();

                    }

@@ -296,7 +296,7 @@


        private void NotifyActivity()

        {

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

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

            {

                if (!NewBieCenter.Instance.inGuiding)

                {