From fddfc335126c8e408f573449659ad5bd79811eed Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 09 十月 2018 17:05:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welfare/WelfareWin.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/System/Welfare/WelfareWin.cs b/System/Welfare/WelfareWin.cs
index 038a721..0ef5a12 100644
--- a/System/Welfare/WelfareWin.cs
+++ b/System/Welfare/WelfareWin.cs
@@ -19,6 +19,7 @@
[SerializeField] FunctionButton Btn_InSeven;
[SerializeField] FunctionButton m_LevelGiftBtn;
[SerializeField] FunctionButton m_ExchangeBtn;
+ [SerializeField] FunctionButton m_TurntableBtn;
[SerializeField] FunctionButtonGroup buttonGroup;
[SerializeField] Button closeBtn;
@@ -39,6 +40,7 @@
Btn_InSeven.AddListener(InSeven);
m_LevelGiftBtn.onClick.AddListener(OnLevelGift);
m_ExchangeBtn.onClick.AddListener(OnExchange);
+ m_TurntableBtn.onClick.AddListener(OnTurntableBtn);
closeBtn.onClick.AddListener(CloseClick);
}
@@ -96,7 +98,20 @@
}
functionOrder = 4;
}
+ private void OnTurntableBtn()
+ {
+ CloseChildWin();
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<WheelOfFortuneWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<WheelOfFortuneWin>();
+ }
+ functionOrder = 5;
+ }
private void OnSignIn()
{
CloseChildWin();
@@ -181,6 +196,10 @@
{
WindowCenter.Instance.CloseImmediately<AwardExchangeWin>();
}
+ if (WindowCenter.Instance.IsOpen<WheelOfFortuneWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<WheelOfFortuneWin>();
+ }
}
private void OperationStartEvent(Operation arg1, int arg2)
--
Gitblit v1.8.0