From efb28f41e4c1d54ba2f1951ec9ff1bf2b7774796 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 28 八月 2018 16:29:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Vip/FairyJadeInvestmentTipWin.cs | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
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();
+ }
}
}
--
Gitblit v1.8.0