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

client_Hale

2018-09-29 3a4eb38542bf8cc2cdf7f835a559ade8a8457ea3

 System/OpenServerActivity/FeaturesType.cs

@@ -15,7 +15,9 @@
        [SerializeField] Text m_IconName;//名字
        [SerializeField] Image m_Icon;

        [SerializeField] Button  m_Button;

        [SerializeField] UIEffect m_UIeffect;

        InSevenDayModel m_InSevenDayModel;
        InSevenDayModel inSevenDay { get { return m_InSevenDayModel ?? (m_InSevenDayModel = ModelCenter.Instance.GetModel<InSevenDayModel>()); } }
        public GameObject ImageSelected

        {

            get { return m_ImageSelected; }

@@ -34,6 +36,14 @@
            {

                return;

            }

            if (inSevenDay.RewardForDic.ContainsKey(day) && inSevenDay.RewardForDic[day] == 0)

            {

                m_UIeffect.Play();

            }

            else

            {

                m_UIeffect.Stop();

            }

            DayText(day);

            m_Icon.SetSprite(InsevenConfig.ICON);

            m_IconName.text = InsevenConfig.RewardName;