From 44b5b3201f08c119429f5ec6da982677e47569a2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 27 三月 2019 17:58:13 +0800
Subject: [PATCH] Merge branch 'MainWinAdjust'
---
System/MainInterfacePanel/LowSettingTip.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/LowSettingTip.cs b/System/MainInterfacePanel/LowSettingTip.cs
index e0cc117..ad2e2b9 100644
--- a/System/MainInterfacePanel/LowSettingTip.cs
+++ b/System/MainInterfacePanel/LowSettingTip.cs
@@ -16,10 +16,9 @@
[SerializeField] Button _SkillBtn;//鎶�鑳芥寜閽�
[SerializeField] Button _Pet1Btn;//瀹犵墿鎸夐挳
[SerializeField] Button _Synthesis1Btn;//鍚堟垚鎸夐挳
- // [SerializeField] Button _RealmBtn;//澧冪晫
+
[SerializeField] Button _Rune1Btn;//绗﹀嵃鎸夐挳
[SerializeField] Button _SetUp1Btn;//璁剧疆鎸夐挳
-
[SerializeField] Button _RankingListBtn;//鎺掕姒滄寜閽�
[SerializeField] Button _Strengthen1Btn;//寮哄寲鎸夐挳
@@ -29,7 +28,9 @@
[SerializeField] Button m_TreasureSoulBtn;//瑙夐啋鎸夐挳
[SerializeField] Button m_GodBeastBtn;//绁炲吔鎸夐挳
[SerializeField] Button m_JadeDynastyBtn;//璇涗粰瑁呭鎸夐挳
- FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
+
+ TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
+
public void Init()
{
_Role1Btn.onClick.AddListener(Role1Button);
@@ -43,7 +44,7 @@
_SetUp1Btn.onClick.AddListener(SetUp1Btn);
_RankingListBtn.onClick.AddListener(RankingListButton);
m_BagualuBtn.AddListener(OnClickBagualuBtn);
- m_TreasureSoulBtn.AddListener(OnClickTreasureSoul);
+ m_TreasureSoulBtn.AddListener(OpenTreasure);
m_GodBeastBtn.AddListener(GodBeastBtn);
m_JadeDynastyBtn.AddListener(OpenEquip);
}
@@ -57,7 +58,6 @@
_Synthesis1Btn.onClick.RemoveAllListeners();
_Rune1Btn.onClick.RemoveAllListeners();
_Pet1Btn.onClick.RemoveAllListeners();
- // _RealmBtn.onClick.RemoveAllListeners();
_SetUp1Btn.onClick.RemoveAllListeners();
_RankingListBtn.onClick.RemoveAllListeners();
m_BagualuBtn.RemoveAllListeners();
@@ -73,7 +73,6 @@
}
void OnClickBagualuBtn()
{
- //DesignDebug.Log("寰烽緳鐨勫叓鍗︾倝");
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<BlastFurnaceWin>();
}
@@ -102,12 +101,39 @@
WindowCenter.Instance.Open<SkillWin>();
}
- //DesignDebug.Log("鎶�鑳芥寜閽�");
}
- void OnClickTreasureSoul()
+
+ void OpenTreasure()
{
+ if (!treasureModel.SatisfyEntranceOpen())
+ {
+ treasureModel.DisplayEntranceLimitHint();
+ return;
+ }
+
WindowCenter.Instance.Close<MainInterfaceWin>();
+ if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Human) != 0)
+ {
+ treasureModel.currentCategory = TreasureCategory.Human;
+ }
+ else if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)
+ {
+ treasureModel.currentCategory = TreasureCategory.Demon;
+ }
+ else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])
+ == RedPointState.Simple)
+ {
+ treasureModel.currentCategory = TreasureCategory.Human;
+ }
+ else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])
+ == RedPointState.Simple)
+ {
+ treasureModel.currentCategory = TreasureCategory.Demon;
+ }
+
+ WindowCenter.Instance.Open<TreasureSelectWin>();
}
+
private void GodBeastBtn()
{
WindowCenter.Instance.Close<MainInterfaceWin>();
--
Gitblit v1.8.0