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

client_Zxw

2018-08-13 498ec5c5d03765bbd87c3f75cbe68dd0d413baf9

 System/MainInterfacePanel/HighSettingTip.cs

@@ -197,7 +197,7 @@
        {

            int _order = 0;

            m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));

            m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");

            //m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");

        }



        private void OnMainHighTipCdTime()