From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Treasure/FairyTreasureCollectPanelPattern5.cs | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/System/Treasure/FairyTreasureCollectPanelPattern5.cs b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
index 8fe4798..573f938 100644
--- a/System/Treasure/FairyTreasureCollectPanelPattern5.cs
+++ b/System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -276,32 +276,43 @@
GetCurrentAchievement();
if (treasure.state != TreasureState.Collected)
{
- int unlocktreasureId = 0;
- var list = model.GetTreasureCategory(TreasureCategory.Human);
- for (int i = 0; i < list.Count; i++)
+ //int unlocktreasureId = 0;
+ //var list = model.GetTreasureCategory(TreasureCategory.Human);
+ //for (int i = 0; i < list.Count; i++)
+ //{
+ // Treasure _treasure;
+ // if(model.TryGetTreasure(list[i], out _treasure))
+ // {
+ // var index = _treasure.treasureStages.FindIndex((x) =>
+ // {
+ // return x.unlockType == TreasureStageUnlock.Treasure && x.treasure == treasure.id;
+ // });
+ // if (index != -1)
+ // {
+ // unlocktreasureId = list[i];
+ // break;
+ // }
+ // }
+ //}
+
+ //var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);
+
+ var config = Config.Instance.Get<TreasureConfig>(treasure.id);
+ var requireCondition = 0;
+ if (config != null)
{
- Treasure _treasure;
- if(model.TryGetTreasure(list[i], out _treasure))
+ var successConfig = Config.Instance.Get<SuccessConfig>(config.Achievements.Length > 0 ? config.Achievements[0] : 0);
+ if (successConfig != null)
{
- var index = _treasure.treasureStages.FindIndex((x) =>
- {
- return x.unlockType == TreasureStageUnlock.Treasure && x.treasure == treasure.id;
- });
- if (index != -1)
- {
- unlocktreasureId = list[i];
- break;
- }
+ requireCondition = successConfig.NeedCnt;
}
}
-
- var unlockTreasureConfig = Config.Instance.Get<TreasureConfig>(unlocktreasureId);
m_AchievementGetBtn.gameObject.SetActive(false);
m_ActiveBtn.gameObject.SetActive(false);
m_GotoGet.gameObject.SetActive(false);
m_ContainerLocked.gameObject.SetActive(true);
- m_LockedDescription.text = Language.Get("BlastFurnaceGet", unlockTreasureConfig == null ? string.Empty : unlockTreasureConfig.Name);
+ m_LockedDescription.text = Language.Get("BlastFurnaceGet", requireCondition);
m_ContainerAchievement.gameObject.SetActive(false);
}
else if (currentAchievement == null || treasure.stage >= 1)
--
Gitblit v1.8.0