From b13645157326d2c06043c5358426750388dd874e Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 15 八月 2018 15:07:35 +0800
Subject: [PATCH] 单号【2569】主界面上方按钮修改
---
System/MainInterfacePanel/HighSettingTip.cs | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 3909f89..a5f40cf 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -44,10 +44,12 @@
[SerializeField] Button m_FindHostBtn;//浠欏疂瀵讳富
[SerializeField] RechargeBtnBehaviour m_RechargetBtnBehaviour;
- [SerializeField] Button m_OSGiftBtn;
[SerializeField] Button m_LimitedTimePBtn;//闄愭椂绀煎寘
[SerializeField] Button m_ElfFestivalBtn;//浠欑晫鐩涘吀
+
+ [SerializeField] Button m_FlashSaleBtn;//闄愭椂鐗规儬
+ [SerializeField] Button m_AllThePeopleBtn;//鍏ㄦ皯鍐叉
private bool _bool = true;
private int swicthCdTime = 0;
private bool IsFadeOut = true;
@@ -65,7 +67,6 @@
{
swicthCdTime = int.Parse(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("AutomaticSwitch").Numerical1);
OpenServerActivityStateChange();
- CheckOSGift();
m_RechargetBtnBehaviour.Init();
m_HighSettingFadeInFadeOut.Init();
storeDesBtn.AddListener(() => { storeDesBtn.gameObject.SetActive(false); });
@@ -82,10 +83,11 @@
m_HappyXBBtn.AddListener(OnClickHappyXBBtn);
m_FindHostBtn.AddListener(OnClickFindHostBtn);
m_OpenService.AddListener(OpenService);
- m_OSGiftBtn.AddListener(OSGiftBtn);
_RuneTaBtn.onClick.AddListener(RuneTaButton);
m_LimitedTimePBtn.AddListener(OnCliCkLimitedTimePBtn);
m_ElfFestivalBtn.AddListener(OnClickElfFestivalBtn);
+ m_FlashSaleBtn.AddListener(OnClickmFlashSaleBtn);
+ m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn);
if (_bool)
{
ColseButton();
@@ -137,9 +139,10 @@
m_OpenService.RemoveAllListeners();
m_HappyXBBtn.RemoveAllListeners();
m_FindHostBtn.RemoveAllListeners();
- m_OSGiftBtn.RemoveAllListeners();
m_LimitedTimePBtn.RemoveAllListeners();
_RuneTaBtn.onClick.RemoveAllListeners();
+ m_FlashSaleBtn.RemoveAllListeners();
+ m_AllThePeopleBtn.RemoveAllListeners();
CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime;
FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
@@ -266,32 +269,17 @@
WindowCenter.Instance.Open<FirstRechargeWin>(true);
}
break;
- //case 2:
- // WindowCenter.Instance.Open<OpenServerGiftWin>();
- // break;
case 3:
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<VipRechargeWin>(false, 0);
break;
}
}
-
- private void OSGiftBtn()
- {
- //WindowCenter.Instance.Open<OpenServerGiftWin>();
- }
-
void RuneTaButton()//绗﹀嵃濉�
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<RuneTowerWin>();
}
- private void CheckOSGift()
- {
- m_OSGiftBtn.gameObject.SetActive(osGiftModel.activate);
- SwithButtonObj();
- }
-
void OpenTreasure()
{
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -325,6 +313,17 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<FairylandCeremonyWin>();
}
+ void OnClickmFlashSaleBtn()//闄愭椂鐗规儬
+ {
+ WindowCenter.Instance.Close<MainInterfaceWin>();
+ WindowCenter.Instance.Open<OpenServerActivityWin>(false, 4);
+ }
+
+ void OnClickmAllThePeopleBtn()//鍏ㄦ皯鍐叉
+ {
+ WindowCenter.Instance.Close<MainInterfaceWin>();
+ WindowCenter.Instance.Open<OpenServerActivityWin>(false,0);
+ }
public void ShowButton()//鍚戜笂
{
--
Gitblit v1.8.0