From 2ca5e5d62e58e9dfee480b64cb6d49c3553202ea Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 27 三月 2019 18:02:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingTip.cs | 47 +----------------------------------------------
1 files changed, 1 insertions(+), 46 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index 34e3941..d8d24a1 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -20,12 +20,10 @@
[SerializeField] Button _ShoppingBtn;//鍟嗗煄鎸夐挳
[SerializeField] Button _RechargeBtn;//鍏呭�兼寜閽�
[SerializeField] Button _WelfareBtn;//绂忓埄鎸夐挳
- [SerializeField] Button _TreasureBtn;//瀵诲疂鎸夐挳
[SerializeField] Button m_OpenService;//寮�鏈嶆椿鍔ㄦ寜閽�
[SerializeField] Button _RuneTaBtn;//绗﹀嵃鎸夐挳
[SerializeField] Image m_OpenServerTitle;
-
[SerializeField] Transform m_HighSettingTip;//鍒ゅ畾
@@ -38,7 +36,6 @@
[SerializeField] Button storeDesBtn; //鍟嗗煄娲诲姩鎻忚堪淇℃伅
[SerializeField] HighSettingFadeInFadeOut m_HighSettingFadeInFadeOut;
- [SerializeField] Button m_Treasure;//娉曞疂鍏ュ彛
[SerializeField] Button m_HappyXBBtn;//瀵诲疂鍏ュ彛
[SerializeField] Button m_FindHostBtn;//浠欏疂瀵讳富
@@ -79,11 +76,9 @@
m_LootPrecious.AddListener(LootPreciousButton);
_MarketBtn.AddListener(MarketButton);
_ShoppingBtn.AddListener(ShoppingButton);
- _TreasureBtn.AddListener(TreasureButton);
_WelfareBtn.AddListener(WelfareButton);
_DaTreasureBtn.AddListener(DaTreasureButton);
_RechargeBtn.AddListener(RechargeButton);
- m_Treasure.AddListener(OpenTreasure);
_ShowBtn.AddListener(ShowButton);
_ColseBtn.AddListener(ColseButton);
m_HappyXBBtn.AddListener(OnClickHappyXBBtn);
@@ -139,11 +134,9 @@
m_LootPrecious.RemoveAllListeners();
_MarketBtn.RemoveAllListeners();
_ShoppingBtn.RemoveAllListeners();
- _TreasureBtn.RemoveAllListeners();
_WelfareBtn.RemoveAllListeners();
_DaTreasureBtn.RemoveAllListeners();
_RechargeBtn.RemoveAllListeners();
- m_Treasure.RemoveAllListeners();
_ShowBtn.RemoveAllListeners();
_ColseBtn.RemoveAllListeners();
m_OpenService.RemoveAllListeners();
@@ -209,7 +202,6 @@
{
int _order = 0;
m_OpenService.gameObject.SetActive(OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _order));
- //m_OpenServerTitle.SetSprite(OpenServerActivityCenter.Instance.IsFlashSaleTitle() ? "WZ_ZJM_29" : "W_HuoDong");
}
private void OnMainHighTipCdTime()
@@ -243,10 +235,6 @@
}
}
- void TreasureButton()//瀵诲疂鎸夐挳
- {
-
- }
void WelfareButton()//绂忓埄鎸夐挳
{
WelfareCenter.Instance.OpenWelfare();
@@ -297,35 +285,6 @@
{
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<TowerWin>(false, 0);
- }
- void OpenTreasure()
- {
- var _model = ModelCenter.Instance.GetModel<TreasureModel>();
- if (!_model.SatisfyEntranceOpen())
- {
- _model.DisplayEntranceLimitHint();
- return;
- }
- WindowCenter.Instance.Close<MainInterfaceWin>();
- if (_model.IsRequireUnlockAnim(TreasureCategory.Human) != 0)
- {
- _model.currentCategory = TreasureCategory.Human;
- }
- else if (_model.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)
- {
- _model.currentCategory = TreasureCategory.Demon;
- }
- else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])
- == RedPointState.Simple)
- {
- _model.currentCategory = TreasureCategory.Human;
- }
- else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])
- == RedPointState.Simple)
- {
- _model.currentCategory = TreasureCategory.Demon;
- }
- WindowCenter.Instance.Open<TreasureSelectWin>();
}
void OnClickHappyXBBtn()//瀵诲疂
@@ -434,19 +393,15 @@
CoroutineMgr.Instance.OnMainStopCorUP();
}
}
+
public void ShowButtonNow()//鍚戜笂锛堢珛鍒诲嚭鐜帮級
{
-
_ColseBtn.gameObject.SetActive(true);
_ShowBtn.gameObject.SetActive(false);
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && m_HighSettingTip.gameObject.activeSelf)
{
m_HighSettingFadeInFadeOut.PositionNow();//绔嬪埢鍑虹幇
}
- //if (!mainModel.IsRedPointShowPanel())
- //{
- // CoroutineMgr.Instance.OnMainStartCorUp(swicthCdTime);
- //}
}
private void RefreshOSCEffect()
--
Gitblit v1.8.0