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

client_linchunjie

2018-11-10 3ea9edc13df124b2d64bc35dbb93adafb9509575

 System/MainInterfacePanel/FeatureNoticeTip.cs

@@ -20,6 +20,7 @@
        [SerializeField] GameObject m_FeatureNoticeTipObj;

        [SerializeField] Text m_Information_reward;//有奖励可领取

        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }

        List<FunctionForecastConfig> configs = new List<FunctionForecastConfig>();

        public GameObject FeatureNoticeTipObj

        {

            get { return m_FeatureNoticeTipObj; }

@@ -31,7 +32,11 @@
        }

        void DataAssignment()

        {

            var configs = Config.Instance.GetAllValues<FunctionForecastConfig>();

            if (configs.Count <= 0)

            {

                configs= Config.Instance.GetAllValues<FunctionForecastConfig>();

            }

           // var configs = Config.Instance.GetAllValues<FunctionForecastConfig>();

            foreach (var config in configs)

            {

                if (!FuncOpen.Instance.IsFuncOpen(config.FuncId)