From fe3028c009c6eb2c9ff06436b69604270be7f4fb Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 29 三月 2019 18:10:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingTip.cs | 82 +++++++++--------------------------------
1 files changed, 18 insertions(+), 64 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 2b885a9..2bac7fa 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -28,22 +28,16 @@
[SerializeField] UIEffect m_StoreEffect;//鍟嗗煄鐗规晥
[SerializeField] Button storeDesBtn; //鍟嗗煄娲诲姩鎻忚堪淇℃伅
- [SerializeField] HighSettingFadeInFadeOut m_HighSettingFadeInFadeOut;
-
[SerializeField] Button m_HappyXBBtn;//瀵诲疂鍏ュ彛
[SerializeField] Button m_FindHostBtn;//浠欏疂瀵讳富
[SerializeField] RechargeBtnBehaviour m_RechargetBtnBehaviour;
- [SerializeField] Button m_LimitedTimePBtn;//闄愭椂绀煎寘
[SerializeField] Button m_ElfFestivalBtn;//浠欑晫鐩涘吀
-
- [SerializeField] Button m_FlashSaleBtn;//闄愭椂鐗规儬
- [SerializeField] Button m_AllThePeopleBtn;//鍏ㄦ皯鍐叉
- [SerializeField] Button m_FlashRushBtn;//闄愭椂鎶㈣喘
[SerializeField] Button m_CrossServerBtn;//璺ㄦ湇1V1鎸夐挳
[SerializeField] Button m_OpenServiceBtn;//鍛ㄧ媯娆㈡寜閽�
[SerializeField] Button m_NewYearBtn;//鏂板勾鐩涘吀
+
private bool isNeedTip = true;
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
@@ -53,32 +47,27 @@
private void Start()
{
isNeedTip = true;
+ storeDesBtn.SetListener(() => { storeDesBtn.gameObject.SetActive(false); });
+ m_LootPrecious.SetListener(LootPreciousButton);
+ _MarketBtn.SetListener(MarketButton);
+ _ShoppingBtn.SetListener(ShoppingButton);
+ _WelfareBtn.SetListener(WelfareButton);
+ _DaTreasureBtn.SetListener(DaTreasureButton);
+ _RechargeBtn.SetListener(RechargeButton);
+ m_HappyXBBtn.SetListener(OnClickHappyXBBtn);
+ m_FindHostBtn.SetListener(OnClickFindHostBtn);
+ m_OpenService.SetListener(OpenService);
+ _RuneTaBtn.SetListener(RuneTaButton);
+ m_ElfFestivalBtn.SetListener(OnClickElfFestivalBtn);
+ m_CrossServerBtn.SetListener(OnClickCrossServerBtn);
+ m_OpenServiceBtn.SetListener(OnClickOpenServiceBtn);
+ m_NewYearBtn.SetListener(OnClickNewYearBtn);
}
public void Init()
{
OpenServerActivityStateChange();
m_RechargetBtnBehaviour.Init();
- m_HighSettingFadeInFadeOut.Init();
- storeDesBtn.AddListener(() => { storeDesBtn.gameObject.SetActive(false); });
- m_LootPrecious.AddListener(LootPreciousButton);
- _MarketBtn.AddListener(MarketButton);
- _ShoppingBtn.AddListener(ShoppingButton);
- _WelfareBtn.AddListener(WelfareButton);
- _DaTreasureBtn.AddListener(DaTreasureButton);
- _RechargeBtn.AddListener(RechargeButton);
- m_HappyXBBtn.AddListener(OnClickHappyXBBtn);
- m_FindHostBtn.AddListener(OnClickFindHostBtn);
- m_OpenService.AddListener(OpenService);
- _RuneTaBtn.onClick.AddListener(RuneTaButton);
- m_LimitedTimePBtn.AddListener(OnCliCkLimitedTimePBtn);
- m_ElfFestivalBtn.AddListener(OnClickElfFestivalBtn);
- m_FlashSaleBtn.AddListener(OnClickmFlashSaleBtn);
- m_AllThePeopleBtn.AddListener(OnClickmAllThePeopleBtn);
- m_FlashRushBtn.AddListener(OnClickFlashRushBtn);
- m_CrossServerBtn.AddListener(OnClickCrossServerBtn);
- m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn);
- m_NewYearBtn.AddListener(OnClickNewYearBtn);
storeModel.StoreFuncOpenAct += OnStoreFuncOpen;
OpenServerActivityCenter.Instance.openServerActivityStateChange += OpenServerActivityStateChange;
@@ -86,24 +75,8 @@
public void UnInit()
{
- m_LootPrecious.RemoveAllListeners();
- _MarketBtn.RemoveAllListeners();
- _ShoppingBtn.RemoveAllListeners();
- _WelfareBtn.RemoveAllListeners();
- _DaTreasureBtn.RemoveAllListeners();
- _RechargeBtn.RemoveAllListeners();
- m_OpenService.RemoveAllListeners();
- m_HappyXBBtn.RemoveAllListeners();
- m_FindHostBtn.RemoveAllListeners();
- m_LimitedTimePBtn.RemoveAllListeners();
- _RuneTaBtn.onClick.RemoveAllListeners();
- m_FlashSaleBtn.RemoveAllListeners();
- m_AllThePeopleBtn.RemoveAllListeners();
- m_NewYearBtn.RemoveAllListeners();
storeModel.StoreFuncOpenAct -= OnStoreFuncOpen;
OpenServerActivityCenter.Instance.openServerActivityStateChange -= OpenServerActivityStateChange;
- CoroutineMgr.Instance.OnMainStopCorUP();
- m_HighSettingFadeInFadeOut.UnInit();
m_RechargetBtnBehaviour.UnInit();
}
@@ -180,6 +153,7 @@
SysNotifyMgr.Instance.ShowTip("FuncNoOpen_Nowaday");
return;
}
+
switch (m_RechargetBtnBehaviour.state)
{
case 1:
@@ -195,6 +169,7 @@
break;
}
}
+
void RuneTaButton()//绗﹀嵃濉�
{
WindowCenter.Instance.Close<MainInterfaceWin>();
@@ -212,34 +187,13 @@
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<TreasureFindHostWin>();
}
- void OnCliCkLimitedTimePBtn()//闄愭椂绀煎寘
- {
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<OpenServerActivityWin>(false, 7);
- }
void OnClickElfFestivalBtn()
{
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>();
- OpenServerActivityCenter.Instance.selectFuncOrder = (int)OpenServerActivityCenter.OSActivityType.ImpactRank;
- WindowCenter.Instance.Open<OpenServerActivityWin>();
- }
- void OnClickFlashRushBtn()//闄愭椂鎶㈣喘
- {
- WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<OpenServerActivityWin>(false, 14);
- }
void OnClickCrossServerBtn()//璺ㄦ湇PK
{
int limitlv = FuncOpenLVConfig.Get(157).LimitLV;
--
Gitblit v1.8.0