From ff2fb9cb0f741b37dffaa4de5b6393e0178bb6c6 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期二, 28 八月 2018 16:26:32 +0800
Subject: [PATCH] [3001]成长基金新添加一个档位

---
 System/Vip/FairyJadeInvestmentWin.cs    |    4 ++++
 System/Vip/FairyJadeInvestmentTipWin.cs |   33 +++++++++++++++++++++++++++------
 System/Vip/FairyJadeInvestmentModel.cs  |   11 ++++++-----
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/System/Vip/FairyJadeInvestmentModel.cs b/System/Vip/FairyJadeInvestmentModel.cs
index 6b3e6bd..1de1990 100644
--- a/System/Vip/FairyJadeInvestmentModel.cs
+++ b/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);
         }
     }
 
diff --git a/System/Vip/FairyJadeInvestmentTipWin.cs b/System/Vip/FairyJadeInvestmentTipWin.cs
index 2effea9..97ab6a8 100644
--- a/System/Vip/FairyJadeInvestmentTipWin.cs
+++ b/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();
+        }
     }
 
 }
diff --git a/System/Vip/FairyJadeInvestmentWin.cs b/System/Vip/FairyJadeInvestmentWin.cs
index 245eb34..98d83b2 100644
--- a/System/Vip/FairyJadeInvestmentWin.cs
+++ b/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

--
Gitblit v1.8.0