0312 新增充值返利界面

hch

2019-10-25 8ebee5f0749f73133ff165532b91a22569d3e9ef

0312 新增充值返利界面

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -290,10 +290,10 @@
            {

                WindowCenter.Instance.Open<VipRechargeWin>(false, 1);

            }

            else if(ModelCenter.Instance.GetModel<AddUpRechargeModel>().redpoint.state == RedPointState.Simple)

            {

                WindowCenter.Instance.Open<VipRechargeWin>(false, 2);

            }

            //else if(ModelCenter.Instance.GetModel<AddUpRechargeModel>().redpoint.state == RedPointState.Simple)

            //{

            //    WindowCenter.Instance.Open<VipRechargeWin>(false, 2);

            //}

            else

            {

                WindowCenter.Instance.Open<VipRechargeWin>(false, 1);


 System/MainInterfacePanel/HighSettingTip.cs

@@ -165,7 +165,7 @@
                    }

                    break;

                case 2:

                    WindowCenter.Instance.Open<VipRechargeWin>(false, 2);

                    WindowCenter.Instance.Open<AddUpRechargeWin>();

                    break;

                case 3:

                    WindowCenter.Instance.Open<VipRechargeWin>(false, 0);


 System/Vip/AddUpRechargeBehaviour.cs

@@ -12,7 +12,7 @@
        [SerializeField] Text m_Progress;

        [SerializeField] Button m_GetReward;

        [SerializeField] Transform m_Complete;

        [SerializeField] Transform m_UnAchieve;

        [SerializeField] Text m_btnText;



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

        AddUpRechargeModel model { get { return ModelCenter.Instance.GetModel<AddUpRechargeModel>(); } }

@@ -20,7 +20,7 @@
        public void Display(int id)

        {

            var config = AddUpRechargeConfig.Get(id);

            m_Title.text = string.Format("累计充值：{0}元", config.Recharge);

            m_Title.text = string.Format("累计充值<color=#4AF25D>{0}</color>可领取", config.Recharge);



            List<Item> items;

            model.TryGetItems(id, out items);

@@ -44,20 +44,42 @@
            }



            var state = model.GetAddUpRechargeState(id);

            m_Progress.gameObject.SetActive(state == -1);

            m_UnAchieve.gameObject.SetActive(state == -1);

            m_Progress.gameObject.SetActive(true);

            m_Complete.gameObject.SetActive(state == 1);

            m_GetReward.gameObject.SetActive(state == 0);

            m_GetReward.gameObject.SetActive(state != 1);

            m_btnText.text = state == 0 ? "领取" : "前往充值";

            switch (state)

            {

                case -1:

                    m_Progress.text = StringUtility.Contact("进度：", PlayerDatas.Instance.baseData.coinPointTotal * 0.01, "/", config.Recharge);

                    m_Progress.text = StringUtility.Contact(string.Format("（再充值<color=#4AF25D>{0}</color>可达成）", config.Recharge - PlayerDatas.Instance.baseData.coinPointTotal * 0.01));

                    break;

                default:

                    m_Progress.text = StringUtility.Contact("<color=#4AF25D>（已达成）</color>");

                    break;

            }



            m_GetReward.SetListener(() =>

            {

                model.SendGetReward(id);

                if (state == 0)

                    model.SendGetReward(id);

                else

                {

                    if (VersionConfig.Get().isBanShu)

                    {

                        SysNotifyMgr.Instance.ShowTip("FuncNoOpen_Nowaday");

                        return;

                    }

                    if (FuncOpen.Instance.IsFuncOpen(113))

                    {

                        WindowCenter.Instance.Close<AddUpRechargeWin>();

                        ModelCenter.Instance.GetModel<VipModel>().OpenVipPayUI(VipModel.VipWinType.Pay);

                    }

                    else

                    {

                        FuncOpen.Instance.ProcessorFuncErrorTip(113);

                    }

                }



            });

        }

    }


 System/Vip/AddUpRechargeModel.cs

@@ -8,7 +8,7 @@
    {

        Dictionary<int, Dictionary<int, List<Item>>> m_AddUpItems = new Dictionary<int, Dictionary<int, List<Item>>>();



        public readonly Redpoint redpoint = new Redpoint(35, 3506);

        public readonly Redpoint redpoint = new Redpoint(21, 3506);



        public uint rewardRecord { get; private set; }




 System/Vip/AddUpRechargeWin.cs

@@ -15,8 +15,8 @@
    public class AddUpRechargeWin : Window

    {

        [SerializeField] ScrollerController m_Scroller;

        [SerializeField] Button m_Recharge;

        [SerializeField] Text m_GoldValue;

        [SerializeField] Button m_CloseBtn;





        AddUpRechargeModel model { get { return ModelCenter.Instance.GetModel<AddUpRechargeModel>(); } }

        #region Built-in

@@ -27,21 +27,27 @@
        protected override void AddListeners()

        {

            m_Scroller.OnRefreshCell += OnRefreshCell;

            m_Recharge.SetListener(() =>

            //m_Recharge.SetListener(() =>

            //{

            //    if (VersionConfig.Get().isBanShu)

            //    {

            //        SysNotifyMgr.Instance.ShowTip("FuncNoOpen_Nowaday");

            //        return;

            //    }

            //    if (FuncOpen.Instance.IsFuncOpen(113))

            //    {

            //        ModelCenter.Instance.GetModel<VipModel>().OpenVipPayUI(VipModel.VipWinType.Pay);

            //    }

            //    else

            //    {

            //        FuncOpen.Instance.ProcessorFuncErrorTip(113);

            //    }

            //});



            m_CloseBtn.onClick.AddListener(() =>

            {

                if (VersionConfig.Get().isBanShu)

                {

                    SysNotifyMgr.Instance.ShowTip("FuncNoOpen_Nowaday");

                    return;

                }

                if (FuncOpen.Instance.IsFuncOpen(113))

                {

                    ModelCenter.Instance.GetModel<VipModel>().OpenVipPayUI(VipModel.VipWinType.Pay);

                }

                else

                {

                    FuncOpen.Instance.ProcessorFuncErrorTip(113);

                }

                CloseImmediately();

                WindowCenter.Instance.Open<MainInterfaceWin>();

            });

        }



@@ -77,8 +83,6 @@


        void Display()

        {

            m_GoldValue.text = UIHelper.ReplaceLargeNum(PlayerDatas.Instance.baseData.diamond);



            var configs = AddUpRechargeConfig.GetValues();

            var jumpIndex = 0;

            m_Scroller.Refresh();


 System/Vip/VipRechargeWin.cs

@@ -17,7 +17,6 @@
        [SerializeField] Button closeBtn;

        [SerializeField] FunctionButton vipPayTitleBtn;

        [SerializeField] FunctionButton vipTitleBtn;

        [SerializeField] FunctionButton addUpBtn;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Image m_Line;

        [SerializeField] Vector3[] m_LinePositions;

@@ -46,16 +45,16 @@
            closeBtn.onClick.AddListener(OnClose);

            vipPayTitleBtn.onClick.AddListener(OnVipPay);

            vipTitleBtn.onClick.AddListener(OnVip);

            addUpBtn.onClick.AddListener(OnAddUp);

            //addUpBtn.onClick.AddListener(OnAddUp);

        }



        private void OnAddUp()

        {

            CloseChildWin();

            WindowCenter.Instance.Open<AddUpRechargeWin>();

            presentWinType = VipModel.VipWinType.AddUp;

            functionOrder = 2;

        }

        //private void OnAddUp()

        //{

        //    CloseChildWin();

        //    WindowCenter.Instance.Open<AddUpRechargeWin>();

        //    presentWinType = VipModel.VipWinType.AddUp;

        //    functionOrder = 2;

        //}



        public void OnVipPay()

        {

@@ -145,7 +144,7 @@
        void DisplayButtonStates()

        {

            var isAddUpOpen = addUpRechargeModel.SatisfyAnyVipLevel();

            addUpBtn.gameObject.SetActive(isAddUpOpen);

            //addUpBtn.gameObject.SetActive(isAddUpOpen);

            m_Line.rectTransform.localPosition = isAddUpOpen ? m_LinePositions[1] : m_LinePositions[0];

        }



@@ -165,10 +164,10 @@
                    OnVip();

                    vipTitleBtn.state = TitleBtnState.Click;

                    break;

                case VipModel.VipWinType.AddUp:

                    OnAddUp();

                    addUpBtn.state = TitleBtnState.Click;

                    break;

                //case VipModel.VipWinType.AddUp:

                //    OnAddUp();

                //    addUpBtn.state = TitleBtnState.Click;

                //    break;

            }

        }

    }