From 8c1184fced045f133de6cc7fe55deb38e1884812 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 13 四月 2019 11:30:50 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion
---
System/WorldMap/WorldMapUnLockTip.cs | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/System/WorldMap/WorldMapUnLockTip.cs b/System/WorldMap/WorldMapUnLockTip.cs
index 97a6cf0..25c93ee 100644
--- a/System/WorldMap/WorldMapUnLockTip.cs
+++ b/System/WorldMap/WorldMapUnLockTip.cs
@@ -12,28 +12,36 @@
public class WorldMapUnLockTip : MonoBehaviour
{
- [SerializeField] Image m_LevelConditionSign;
- [SerializeField] Image m_TreasureConditionSign;
- [SerializeField] Text m_LevelCondtion;
- [SerializeField] Text m_TreasureCondition;
-
- TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
+ [SerializeField] Image m_ConditionSign1;
+ [SerializeField] Image m_ConditionSign2;
+ [SerializeField] Text m_Condtion1;
+ [SerializeField] Text m_Condition2;
public void Display(int _mapId)
{
var config = MapConfig.Get(_mapId);
- m_LevelCondtion.text = Language.Get("WorldMap_LV", config.LV);
- m_LevelCondtion.color = PlayerDatas.Instance.baseData.LV >= config.LV ? UIHelper.GetUIColor(TextColType.Green) : UIHelper.GetUIColor(TextColType.Red);
- if (string.IsNullOrEmpty(config.MapTaskText))
+ if (config.realmLevel > 0)
{
- m_TreasureConditionSign.gameObject.SetActive(false);
- m_TreasureCondition.text = "";
+ var realmConfig = RealmConfig.Get(config.realmLevel);
+ m_Condtion1.text = Language.Get("WorldMap_Realm", realmConfig.Name);
+ m_Condtion1.color = UIHelper.GetUIColor(PlayerDatas.Instance.baseData.realmLevel >= config.realmLevel ? TextColType.Green : TextColType.Red);
}
else
{
- m_TreasureConditionSign.gameObject.SetActive(true);
- m_TreasureCondition.text = config.MapTaskText;
+ m_Condtion1.text = Language.Get("WorldMap_LV", config.LV);
+ m_Condtion1.color = UIHelper.GetUIColor(PlayerDatas.Instance.baseData.LV >= config.LV ? TextColType.Green : TextColType.Red);
+ }
+
+ if (string.IsNullOrEmpty(config.MapTaskText))
+ {
+ m_ConditionSign2.gameObject.SetActive(false);
+ m_Condition2.text = "";
+ }
+ else
+ {
+ m_ConditionSign2.gameObject.SetActive(true);
+ m_Condition2.text = config.MapTaskText;
}
}
--
Gitblit v1.8.0