From 37fe958376a003a36154bf9e4b456397f5c254b1 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 12 四月 2019 19:46:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/DemonJarWin.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/System/FindPrecious/DemonJarWin.cs b/System/FindPrecious/DemonJarWin.cs
index 0baf954..dc93d1d 100644
--- a/System/FindPrecious/DemonJarWin.cs
+++ b/System/FindPrecious/DemonJarWin.cs
@@ -25,6 +25,7 @@
[SerializeField] TimerBehaviour m_CountRemainTime;
[SerializeField] Button m_Goto;
[SerializeField] Transform m_SurpassLevel;
+ [SerializeField] RectTransform m_NoDamageTip;
[SerializeField] ToggleButton m_Subscribe;
[SerializeField] RectTransform m_ContainerDouble;
@@ -134,13 +135,13 @@
DemonJarBossData bossData;
model.TryGetBossData(model.selectedBoss, out bossData);
- var npcDropConfig = NPCDropItemConfig.Get(bossData.id);
- m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);
m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(model.selectedBoss);
m_BossIntroduce.Display(model.selectedBoss, true);
m_Bosses.Init(bosses);
m_Bosses.MoveToCenter(bosses.IndexOf(model.selectedBoss));
+
+ DisplayTip(model.selectedBoss);
}
private void ShowSkillRecord()
@@ -378,19 +379,18 @@
return true;
}
- private void OnBossSelected(int _bossId)
+ private void OnBossSelected(int bossId)
{
- m_BossIntroduce.Display(_bossId, false);
- m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(_bossId);
+ m_BossIntroduce.Display(bossId, false);
+ m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(bossId);
DemonJarBossData bossData;
- model.TryGetBossData(_bossId, out bossData);
- var npcDropConfig = NPCDropItemConfig.Get(bossData.id);
- m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);
+ model.TryGetBossData(bossId, out bossData);
- var demonJarConfig = DemonJarConfig.Get(model.selectedBoss);
- m_RewardDescription.text = Language.Get(demonJarConfig.RewardDescription);
+ var config = DemonJarConfig.Get(model.selectedBoss);
+ m_RewardDescription.text = Language.Get(config.RewardDescription);
+ DisplayTip(bossId);
DisplayAutoAndDoubleTitle();
}
@@ -434,6 +434,26 @@
}
}
+ private void DisplayTip(int bossId)
+ {
+ var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
+ var config = NPCConfig.Get(bossId);
+
+ if (config.Realm > realmLevel)
+ {
+ m_NoDamageTip.gameObject.SetActive(true);
+ m_SurpassLevel.gameObject.SetActive(false);
+ }
+ else
+ {
+ m_NoDamageTip.gameObject.SetActive(false);
+ var dropConfig = NPCDropItemConfig.Get(bossId);
+ var noDrop = dropConfig == null || (dropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > dropConfig.MaxLV);
+ m_SurpassLevel.gameObject.SetActive(noDrop);
+ }
+ }
+
+
}
}
--
Gitblit v1.8.0