From 568150682019c8e13cb72210066548e2c90c2dd0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 29 一月 2019 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into FestivalRedpack
---
System/MainInterfacePanel/HighSettingTip.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 0c8667f..e3f90f5 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -53,6 +53,7 @@
[SerializeField] Button m_FlashRushBtn;//闄愭椂鎶㈣喘
[SerializeField] Button m_CrossServerBtn;//璺ㄦ湇1V1鎸夐挳
[SerializeField] Button m_OpenServiceBtn;//鍛ㄧ媯娆㈡寜閽�
+ [SerializeField] Button m_NewYearBtn;//鏂板勾鐩涘吀
private bool _bool = true;
private int swicthCdTime = 0;
private bool IsFadeOut = true;
@@ -96,6 +97,7 @@
m_FlashRushBtn.AddListener(OnClickFlashRushBtn);
m_CrossServerBtn.AddListener(OnClickCrossServerBtn);
m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn);
+ m_NewYearBtn.AddListener(OnClickNewYearBtn);
if (_bool)
{
ColseButton();
@@ -151,6 +153,7 @@
_RuneTaBtn.onClick.RemoveAllListeners();
m_FlashSaleBtn.RemoveAllListeners();
m_AllThePeopleBtn.RemoveAllListeners();
+ m_NewYearBtn.RemoveAllListeners();
CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime;
FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
@@ -390,6 +393,12 @@
WindowCenter.Instance.Open<AchievementActivityWin>();
}
+
+ void OnClickNewYearBtn()
+ {
+ WindowCenter.Instance.Close<MainInterfaceWin>();
+ WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>();
+ }
public void ShowButton()//鍚戜笂
{
--
Gitblit v1.8.0