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

client_Wu Xijin

2018-08-28 efb28f41e4c1d54ba2f1951ec9ff1bf2b7774796

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

 System/Vip/FairyJadeInvestmentModel.cs

@@ -23,7 +23,7 @@
    public Dictionary<int, int> InvestmentAmountDic = new Dictionary<int, int>();//投资金额

    public static Action FairyJadeInfoSeriorsUpdate;

    public int InvestGold = 0; // 投资额度

    public int InvestmentGrade = 0;//0未投，1档，2，档，3，档

    public int InvestmentGrade = 0;//0未投，1档，2，档，3，档,4档

    public int SelectNumber = 0;//记录想要投资的钱数

    public int RecordSelectNumberMax = 0;//用来标记最大可投资额度

    public List<int> MultipleList = new List<int>();

@@ -63,17 +63,17 @@
    private bool IsOpenFeatures()//功能是否开启

    {

        bool isOpen = false;

        if (InvestmentGrade > 0 && InvestmentGrade < 3)

        if (InvestmentGrade > 0 && InvestmentGrade < 4)

        {

            isOpen = true;

        }

        else

        {

            if (InvestmentGrade == 3)

            if (InvestmentGrade == 4)

            {

                foreach (int key in InfoSeriors.Keys)

                {

                    if (InfoSeriors[key] != 3)

                    if (InfoSeriors[key] != 4)

                    {

                        isOpen = true;

                    }

@@ -260,7 +260,8 @@
            InvestmentAmountDic.Add(VipInvestModel.GetInvestGold(3, 0), 1);

            InvestmentAmountDic.Add(VipInvestModel.GetInvestGold(3, 1), 2);

            InvestmentAmountDic.Add(VipInvestModel.GetInvestGold(3, 2), 3);

            RecordSelectNumberMax = VipInvestModel.GetInvestGold(3, 2);

            InvestmentAmountDic.Add(VipInvestModel.GetInvestGold(3, 3), 4);

            RecordSelectNumberMax = VipInvestModel.GetInvestGold(3, 3);

        }

    }




 System/Vip/FairyJadeInvestmentTipWin.cs

@@ -24,6 +24,8 @@
        [SerializeField] Text m_Text_2;
        [SerializeField] Button m_AmountOfChoice_3;
        [SerializeField] Text m_Text_3;
        [SerializeField] Button m_AmountOfChoice_4;
        [SerializeField] Text m_Text_4;
        #region Built-in
        protected override void BindController()
        {
@@ -34,21 +36,23 @@
            m_AmountOfChoice_1.AddListener(AmountOfChoice_1);
            m_AmountOfChoice_2.AddListener(AmountOfChoice_2);
            m_AmountOfChoice_3.AddListener(AmountOfChoice_3);
            m_AmountOfChoice_4.AddListener(AmountOfChoice_4);
        }

        protected override void OnPreOpen()
        {
            m_Text_1.text = VipInvestModel.GetInvestGold(3,2).ToString();
            m_Text_1.text = VipInvestModel.GetInvestGold(3,0).ToString();
            m_Text_2.text= VipInvestModel.GetInvestGold(3,1).ToString();
            m_Text_3.text = VipInvestModel.GetInvestGold(3,0).ToString();
            m_Text_3.text = VipInvestModel.GetInvestGold(3,2).ToString();
            m_Text_4.text = VipInvestModel.GetInvestGold(3, 3).ToString();
            m_AmountOfChoice_2.gameObject.SetActive(true);
            if (fairyJadeInvestmentModel.InvestGold >= VipInvestModel.GetInvestGold(3,0))
            {
                m_AmountOfChoice_3.gameObject.SetActive(false);
                m_AmountOfChoice_1.gameObject.SetActive(false);
            }
            else
            {
                m_AmountOfChoice_3.gameObject.SetActive(true);
                m_AmountOfChoice_1.gameObject.SetActive(true);
            }
            if (fairyJadeInvestmentModel.InvestGold >= VipInvestModel.GetInvestGold(3,1))
            {
@@ -57,6 +61,14 @@
            else
            {
                m_AmountOfChoice_2.gameObject.SetActive(true);
            }
            if (fairyJadeInvestmentModel.InvestGold >= VipInvestModel.GetInvestGold(3, 2))
            {
                m_AmountOfChoice_3.gameObject.SetActive(false);
            }
            else
            {
                m_AmountOfChoice_3.gameObject.SetActive(true);
            }
        }

@@ -74,7 +86,7 @@
        #endregion
        public void AmountOfChoice_1()
        {
            fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3,2);
            fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3,0);
            if (SelectNumberRefresh != null)
            {
                SelectNumberRefresh();
@@ -92,13 +104,22 @@
        }
        public void AmountOfChoice_3()
        {
            fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3,0);
            fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3,2);
            if (SelectNumberRefresh != null)
            {
                SelectNumberRefresh();
            }
            Close();
        }
        public void AmountOfChoice_4()

        {

            fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 3);
            if (SelectNumberRefresh != null)
            {
                SelectNumberRefresh();
            }
            Close();

        }
    }

}

 System/Vip/FairyJadeInvestmentWin.cs

@@ -60,6 +60,10 @@
                {

                    fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 2);

                }

                else if (fairyJadeInvestmentModel.InvestGold < VipInvestModel.GetInvestGold(3, 3))

                {

                    fairyJadeInvestmentModel.SelectNumber = VipInvestModel.GetInvestGold(3, 3);

                }

                m_SelectButton.gameObject.SetActive(true);

            }

            else