成长基金移至精彩活动

client_Zxw

2018-08-28 557922193b06fac92c3912ee3ef0a4e48117dcd3

成长基金移至精彩活动

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -448,6 +448,16 @@
                        WindowCenter.Instance.Open<BossRebornWin>(true);

                    }

                    break;

                case 10:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<FairyJadeInvestmentWin>();

                    }

                    else

                    {

                        WindowCenter.Instance.Open<FairyJadeInvestmentWin>();

                    }

                    break;



            }

        }

@@ -480,6 +490,7 @@
            WindowCenter.Instance.CloseImmediately<BossRebornWin>();

            WindowCenter.Instance.CloseImmediately<OpenServerGiftWin>();

            WindowCenter.Instance.CloseImmediately<LimitedTimePackageWin>();

            WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

        }



        private int Compare(int x, int y)


 System/Vip/FairyJadeInvestmentModel.cs

@@ -16,7 +16,7 @@
    public int NeedLv;//需要等级

    public MonthlyInvestmentModel.MonthlyInvestmentItem FairyJadeInvestmentItem;//奖励

}

public class FairyJadeInvestmentModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class FairyJadeInvestmentModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

{

    public Dictionary<int, FairyJadeInvestmentClass> FairyJadeInvestmentDic = new Dictionary<int, FairyJadeInvestmentClass>();//等级

    public Dictionary<int, int> InfoSeriors = new Dictionary<int, int>();//奖励领取信息//key为索引，Value(0,未领，其他值未领的钱数)

@@ -29,6 +29,67 @@
    public List<int> MultipleList = new List<int>();

    VipInvestModel m_VipInvestModel;

    VipInvestModel VipInvestModel { get { return m_VipInvestModel ?? (m_VipInvestModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }



    public event Action<int> onStateUpate;

    public bool IsOpen

    {

        get

        {

            return IsOpenFeatures();

        }

    }



    public bool priorityOpen

    {

        get

        {

            return IsRedPoint();

        }

    }





    private bool IsRedPoint()//红点

    {



        if (redPointStre1.state == RedPointState.None)

        {

            return false;

        }

        else

        {

            return true;

        }

    }

    private bool IsOpenFeatures()//功能是否开启

    {

        bool isOpen = false;

        if (InvestmentGrade > 0 && InvestmentGrade < 3)

        {

            isOpen = true;

        }

        else

        {

            if (InvestmentGrade == 3)

            {

                foreach (int key in InfoSeriors.Keys)

                {

                    if (InfoSeriors[key] != 3)

                    {

                        isOpen = true;

                    }

                }

            }

        }

        if (PlayerDatas.Instance.baseData.LV >= 300 && !isOpen)

        {

            return false;

        }

        else

        {

            return true;

        }

    }



    private bool IsOk = false;

    public bool IsRedpoint = false;



@@ -36,6 +97,7 @@
    private int DisplayDays = 0;//显示天数

    public override void Init()

    {

        OpenServerActivityCenter.Instance.Register(10, this);

        var InvestRedPoint = Config.Instance.Get<FuncConfigConfig>("InvestRedPoint");

        DisplayLevel = int.Parse(InvestRedPoint.Numerical2);

        DisplayDays = int.Parse(InvestRedPoint.Numerical3);

@@ -202,9 +264,12 @@
        }

    }



    private const int Redpoint_key1 = 20110;

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

    private const int Redpoint_key1 = 20910;

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

    public int JumpInedx = 0;







    private void InvestmentRedPoint()//红点

    {

        JumpInedx = 0;


 System/Welfare/WelfareCenter.cs

@@ -13,8 +13,8 @@


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



        FairyJadeInvestmentModel m_FairyJadeInvestmentModel;

        FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }

        //FairyJadeInvestmentModel m_FairyJadeInvestmentModel;

        //FairyJadeInvestmentModel fairyJadeInvestmentModel { get { return m_FairyJadeInvestmentModel ?? (m_FairyJadeInvestmentModel = ModelCenter.Instance.GetModel<FairyJadeInvestmentModel>()); } }

        /// <summary>

        /// 点击主界面福利按钮打开

        /// </summary>

@@ -63,12 +63,12 @@
                return;

            }



            if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<WelfareWin>(false, 5);

                return;

            }

            //if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)

            //{

            //    WindowCenter.Instance.Close<MainInterfaceWin>();

            //    WindowCenter.Instance.Open<WelfareWin>(false, 5);

            //    return;

            //}

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<WelfareWin>(false, functionOrder);

        }

@@ -110,10 +110,10 @@
                return 3;

            }



            if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)

            {             
                return 5;

            }

            //if (fairyJadeInvestmentModel.redPointStre1.state == RedPointState.Simple || fairyJadeInvestmentModel.redPointStre1.state == RedPointState.GetReward)

            //{             
            //    return 5;

            //}

            return functionOrder;

        }

    }


 System/Welfare/WelfareWin.cs

@@ -19,7 +19,6 @@
        [SerializeField] FunctionButton Btn_InSeven;

        [SerializeField] FunctionButton m_LevelGiftBtn;

        [SerializeField] FunctionButton m_ExchangeBtn;

        [SerializeField] FunctionButton m_FairyJadeInvestment;

        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] Button closeBtn;



@@ -41,7 +40,6 @@
            m_LevelGiftBtn.onClick.AddListener(OnLevelGift);

            m_ExchangeBtn.onClick.AddListener(OnExchange);

            closeBtn.onClick.AddListener(CloseClick);

            m_FairyJadeInvestment.AddListener(FairyJade);

        }



        private void OnPrayer()

@@ -85,21 +83,6 @@
            }

            functionOrder = 3;

        }



        private void FairyJade()

        {

            CloseChildWin();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<FairyJadeInvestmentWin>();

            }

            else

            {

                WindowCenter.Instance.Open<FairyJadeInvestmentWin>();

            }



            functionOrder = 5;

        }

        private void OnExchange()

        {

            CloseChildWin();

@@ -139,34 +122,6 @@
            else

            {

                Btn_InSeven.gameObject.SetActive(true);

            }



            bool isOpen = false;

            if (fairyJadeInvestmentModel.InvestmentGrade > 0 && fairyJadeInvestmentModel.InvestmentGrade < 3)

            {

                isOpen = true;

            }

            else

            {

                if (fairyJadeInvestmentModel.InvestmentGrade == 3)

                {

                    foreach (int key in fairyJadeInvestmentModel.InfoSeriors.Keys)

                    {

                        if (fairyJadeInvestmentModel.InfoSeriors[key] != 3)

                        {

                            isOpen = true;

                        }

                    }

                }

            }



            if (PlayerDatas.Instance.baseData.LV >= 300 && !isOpen)

            {

                m_FairyJadeInvestment.gameObject.SetActive(false);

            }

            else

            {

                m_FairyJadeInvestment.gameObject.SetActive(true);

            }

            CheckOperationOpen();



@@ -225,10 +180,6 @@
            if (WindowCenter.Instance.CheckOpen<AwardExchangeWin>())

            {

                WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();

            }

            if (WindowCenter.Instance.CheckOpen<FairyJadeInvestmentWin>())

            {

                WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            }

        }