0312 月卡和vip投资移到福利界面

hch

2019-10-09 bcd479c5deddb2a798ea126579ed111ce76e4a21

0312 月卡和vip投资移到福利界面

 System/OpenServerActivity/InSevenDayModel.cs

@@ -25,7 +25,7 @@
    public Dictionary<int, int> RewardForDic = new Dictionary<int, int>();//0,可领，1已领，-1不可领

    public int DayCnt = 0;//累计登陆天数

    public bool IsOpenSevenDay = false;

    private const int Redpoint_key1 = 20103;//七天登陆红点

    private const int Redpoint_key1 = 20106;//七天登陆红点

    public  Redpoint redPointStre1 = new Redpoint(201, Redpoint_key1);

    public bool IsMainGo = false;//是否显示主界面入口

    public override void Init()


 System/Vip/VipInvest/MonthWeekInvestModel.cs

@@ -55,8 +55,8 @@
        public event Action onSelectUpdate;

        public event Action onInvestUpdate;



        public readonly Redpoint redpoint = new Redpoint(209, 20922);



        public readonly Redpoint redpoint = new Redpoint(201, 20103);

        public readonly Redpoint redpoint2 = new Redpoint(201, 20104);

        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }



        public override void Init()

@@ -96,7 +96,10 @@
            {

                var type = int.Parse(typeKey);

                m_InvestRechargeIds[type] = new List<int>(LitJson.JsonMapper.ToObject<int[]>(json[typeKey].ToJson()));

                m_Redpoints.Add(type, new Redpoint(redpoint.id, redpoint.id * 100 + type));

                if (type == 8)

                    m_Redpoints.Add(type, new Redpoint(redpoint.id, redpoint.id * 100 + type));

                else if (type == 7)

                    m_Redpoints.Add(type, new Redpoint(redpoint2.id, redpoint2.id * 100 + type));

            }

            investTypes = m_InvestRechargeIds.Keys.ToList();




 System/Vip/VipInvest/VipInvestModel.cs

@@ -451,8 +451,8 @@
        ServerInvestInfo InvestInfo;

        int cycle = 0;

        private List<InvestConfig> configlist;

        private const int Redpoint_key1 = 20911;

        public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//Vip 投资红点

        private const int Redpoint_key1 = 20105;

        public Redpoint redPointStre1 = new Redpoint(201, Redpoint_key1);//Vip 投资红点

        public int JumpIndex = 0;

        private void VipInvestRedPoint()//Vip 投资红点

        {


 System/Welfare/LevelGiftModel.cs

@@ -185,7 +185,7 @@
        }



        #region 红点

        public Redpoint redpoint = new Redpoint(201, 20104);

        public Redpoint redpoint = new Redpoint(201, 20107);

        public void UpdateRedpoint()

        {

            redpoint.state = RedPointState.None;


 System/Welfare/WelfareWin.cs

@@ -19,9 +19,15 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;



        [SerializeField] FunctionButton m_Month1;

        [SerializeField] FunctionButton m_Month2;

        [SerializeField] FunctionButton m_Vip;



        [SerializeField] FunctionButtonGroup buttonGroup;



        InSevenDayModel inSevenDay { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }

        MonthWeekInvestModel monthWeekInvestModel { get { return ModelCenter.Instance.GetModel<MonthWeekInvestModel>(); } }



        public Button close { get; set; }



@@ -44,8 +50,31 @@
            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            close.onClick.AddListener(CloseClick);

        }



            m_Month1.onClick.AddListener(OnMonthCard1);

            m_Month2.onClick.AddListener(OnMonthCard2);

            m_Vip.onClick.AddListener(OnVip);

        }

        private void OnMonthCard1()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<MonthWeekInvestWin>();

            functionOrder = 2;

            monthWeekInvestModel.selectType = 8;

        }

        private void OnMonthCard2()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<MonthWeekInvestWin>();

            functionOrder = 3;

            monthWeekInvestModel.selectType = 7;

        }

        private void OnVip()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<VipInvestWin>();

            functionOrder = 4;

        }

        private void OnPrayer()

        {

            CloseChildWin();

@@ -57,20 +86,20 @@
        {

            CloseChildWin();

            WindowCenter.Instance.Open<InSevenDayWin>();

            functionOrder = 2;

            functionOrder = 5;

        }



        private void OnLevelGift()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<LevelGiftWin>();

            functionOrder = 3;

            functionOrder = 6;

        }

        private void OnExchange()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<AwardExchangeWin>();

            functionOrder = 4;

            functionOrder = 7;

        }

        private void OnSignIn()

        {