Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 7da5f5b780af330ecda645f5538e0917bd9eeb01

 System/Activity/ActivityNotifyWin.cs

@@ -101,7 +101,7 @@
        {
            presentActivityType = _type;
            m_ActivityNotify.Init(_type, this);
            var _open = WindowCenter.Instance.CheckOpen<MainInterfaceWin>();
            var _open = WindowCenter.Instance.IsOpen<MainInterfaceWin>();
            m_ActivityNotify.gameObject.SetActive(_open);
        }