From 9aa64c680dc2032193229b61da8be8dea3dd73c5 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 11 十月 2018 15:08:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Vip/VipInvest/WheelOfFortuneWin.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/System/Vip/VipInvest/WheelOfFortuneWin.cs b/System/Vip/VipInvest/WheelOfFortuneWin.cs
index 3ae1d5c..af8fc9c 100644
--- a/System/Vip/VipInvest/WheelOfFortuneWin.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneWin.cs
@@ -16,6 +16,7 @@
public class WheelOfFortuneWin : Window
{
[SerializeField] Button m_LotteryBtn;
+ [SerializeField] ImageEx m_LotteryImage;
[SerializeField] RotatePointer m_RotatePointer;
[SerializeField] Toggle m_Toggle;
[SerializeField] CheckDisplay m_CheckDisplay;
@@ -24,6 +25,9 @@
[SerializeField] Text m_Text_remainingTimes;
[SerializeField] Button m_PromotionBtn;
[SerializeField] RotationTween m_RotationTween;
+ [SerializeField] GameObject m_RequiredConsumption;
+ [SerializeField] Text m_NeedMoney_Text;
+ [SerializeField] UIEffectFly m_UIEffectFly;
[Header("婊氬姩鏃堕棿")]
public float RollingTime = 1f;
VipModel m_Vipmodel;
@@ -48,8 +52,11 @@
FairyJade = (int)UIHelper.GetMoneyCnt(2);
Money1_Text.text = FairyJade.ToString();
Money2_Text.text = UIHelper.GetMoneyCnt(1).ToString();
+ m_NeedMoney_Text.text = wheelOfFortuneModel.NeedJade.ToString();
m_RotatePointer.Init();
m_LotteryBtn.interactable = true;
+ m_RequiredConsumption.SetActive(true);
+ m_LotteryImage.gray = false;
RemainingTimes();//鍓╀綑娆℃暟
}
protected override void OnActived()
@@ -86,16 +93,23 @@
{
RemainingTimes();//鍓╀綑娆℃暟
}
+ if (obj == PlayerDataRefresh.Gold)
+ {
+ Money2_Text.text = UIHelper.GetMoneyCnt(1).ToString();
+ }
}
private void EndOfFlashing()
{
TiedJadeChange();
+ m_UIEffectFly.StartFly(wheelOfFortuneModel.Lattice);
}
private void WheelOfFortuneUpdate(float Angel)
{
m_LotteryBtn.interactable = false;
+ m_RequiredConsumption.SetActive(false);
+ m_LotteryImage.gray = true;
m_RotatePointer.SetTime(m_Toggle.isOn);
RemainingTimes();//鍓╀綑娆℃暟
}
@@ -120,6 +134,8 @@
else if (LotteryNumber > wheelOfFortuneModel.Number && (int)UIHelper.GetMoneyCnt(1) >= wheelOfFortuneModel.NeedJade)
{
m_CheckDisplay.CloseAll();
+ FairyJade = (int)UIHelper.GetMoneyCnt(2);
+ Money1_Text.text = FairyJade.ToString();
wheelOfFortuneModel.StartTheDraw();//寮�濮嬫娊濂�
}
}
@@ -141,6 +157,8 @@
private void IsButtonShow(bool _bool)//鏄惁鍙偣鍑绘棆杞�
{
m_LotteryBtn.interactable = _bool;
+ m_RequiredConsumption.SetActive(_bool);
+ m_LotteryImage.gray = !_bool;
}
private Sequence mScoreSequence;
private void TiedJadeChange()//缁戠帀鍙樺寲
--
Gitblit v1.8.0