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

client_linchunjie

2018-08-23 3b12092e5bf4cb6484d1ccf806616b6511486cc9

 System/Vip/VipInvest/VipInvestModel.cs

@@ -15,6 +15,11 @@
        public int NeedVipLv { get; private set;}

        private bool IsOkBool = false;

        public bool IsRedpoint = false;



        private int DisplayLevel = 0;//显示等级

        private int DisplayDays = 0;//显示天数

        //----

        private bool IsOneRedPoint = true;

        public override void Init()

        {

            vipInvestDict.Clear();

@@ -22,7 +27,9 @@
            vipInvestLvlimitDict.Clear();

            investGoldDict.Clear();

            investMaxDayDict.Clear();



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

            DisplayLevel = int.Parse(InvestRedPoint.Numerical1);

            DisplayDays = int.Parse(InvestRedPoint.Numerical3);

            FuncConfigConfig vipInvestLv = Config.Instance.Get<FuncConfigConfig>("VIPInvest");

            NeedVipLv = int.Parse(vipInvestLv.Numerical2);

            JsonData vipInvestData = JsonMapper.ToObject(vipInvestLv.Numerical1);

@@ -83,10 +90,10 @@
            VipInvestWin.VipInvestRedPointEvent += VipInvestRedPointEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;

            if (TimeUtility.CreateDays <= 3 && redPointStre1.state==RedPointState.None)

            if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state==RedPointState.None)

            {

                IsRedpoint = true;

                if (PlayerDatas.Instance.baseData.LV >= 30)

                if (PlayerDatas.Instance.baseData.LV >= DisplayLevel)

                {

                    RedPointSate();

                }              

@@ -97,7 +104,7 @@
        {

            if (_tCDBPlayerRefresh == PlayerDataRefresh.LV)

            {

                if (TimeUtility.CreateDays <= 3 && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= 30)

                if (TimeUtility.CreateDays <= DisplayDays && redPointStre1.state == RedPointState.None && PlayerDatas.Instance.baseData.LV >= DisplayLevel)

                {

                    if (IsRedpoint)

                    {

@@ -185,7 +192,6 @@
            {

                return investGoldDict[type][index];

            }



            return 0;

        }



@@ -200,7 +206,6 @@
                    return index;

                }

            }



            return "";

        }



@@ -359,7 +364,6 @@
            {

                cycle = day / 7;

            }



            return cycle;

        }



@@ -381,7 +385,6 @@
        {



        }



        ServerInvestInfo InvestInfo;

        int cycle = 0;

        private List<InvestConfig> configlist;

@@ -437,7 +440,6 @@
                            break;

                        default:

                            break;



                    }

                   // redPointStre1.state = RedPointState.Simple;

                    JumpIndex = i;

@@ -456,7 +458,6 @@
                        return;

                    }

                }



            }

        }



@@ -469,16 +470,17 @@
            }

            if (IsRedpoint)

            {

                redPointStre1.state = RedPointState.Simple;

                if (IsOneRedPoint)

                {

                    redPointStre1.state = RedPointState.Simple;

                    IsOneRedPoint = false;

                }              
            }

            else

            {

                VipInvestRedPoint();

            }



        }





    }



    public struct InvestReward