From ddf1a89cd290398b09d58d19ac1b4f01cc2e63f1 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 30 八月 2018 11:14:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonBreifInfo.cs | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/System/Dungeon/DungeonBreifInfo.cs b/System/Dungeon/DungeonBreifInfo.cs
index 0fd6ca8..e8fe590 100644
--- a/System/Dungeon/DungeonBreifInfo.cs
+++ b/System/Dungeon/DungeonBreifInfo.cs
@@ -21,6 +21,7 @@
[SerializeField] Text m_Description;
[SerializeField] Button m_AddCntBtn;
[SerializeField] ItemBehaviour[] m_Rewards;
+ [SerializeField] Text[] m_RewardCounts;
Dungeon dungeon;
DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -106,7 +107,7 @@
if (dungeon.mapId == 31160)
{
var dungeonLevelMin = model.DungeonMap(dungeon.mapId, 0);
- var dungeonMinConfig= Config.Instance.Get<DungeonConfig>(dungeonLevelMin);
+ var dungeonMinConfig = Config.Instance.Get<DungeonConfig>(dungeonLevelMin);
if (dungeonMinConfig != null)
{
levelLimitMin = dungeonMinConfig.LVLimitMin;
@@ -124,7 +125,7 @@
if (i < dungeonConfig.Rewards.Length)
{
behaviour.gameObject.SetActive(true);
- behaviour.showCount = true;
+ behaviour.showCount = false;
behaviour.SetItem(dungeonConfig.Rewards[i], 0);
}
else
@@ -133,6 +134,23 @@
}
}
+ if (m_RewardCounts != null)
+ {
+ for (int i = 0; i < m_RewardCounts.Length; i++)
+ {
+ var behaviour = m_RewardCounts[i];
+ if (i < dungeonConfig.RewardCountDescriptions.Length)
+ {
+ behaviour.gameObject.SetActive(true);
+ behaviour.text = dungeonConfig.RewardCountDescriptions[i];
+ }
+ else
+ {
+ behaviour.gameObject.SetActive(false);
+ }
+ }
+ }
+
CheckAchievementGuide();
}
--
Gitblit v1.8.0