From fe615495617cbaea5ab0d5866aa8c49c1714575c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 05 九月 2018 15:42:26 +0800
Subject: [PATCH] 3289 【前端】【1.0.15】主界面法宝快捷入口增加显示法宝百分百进度
---
System/Treasure/TreasureCollectBriefInfoBehaviour.cs | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
index a17e2d5..91036e6 100644
--- a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
+++ b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -18,6 +18,7 @@
[SerializeField] RectTransform m_NormalContainer;
[SerializeField] Image m_Icon;
[SerializeField] Image m_TreasureName;
+ [SerializeField] Text m_Progress;
[SerializeField] Text m_Description;
[SerializeField] Button m_Goto;
[SerializeField] UIEffect m_ChallengeEffect;
@@ -287,19 +288,28 @@
Treasure treasure;
model.TryGetTreasure(displayTreasureId, out treasure);
+ var progress = 1f;
+ if (treasure != null && config.PreferredStage != 0)
+ {
+ progress = (float)treasure.stage / config.PreferredStage;
+ }
switch (displayState)
{
case DisplayState.Challenge:
+ DisplayProgress(false, progress);
m_Description.text = Language.Get("FabaoState_Text_1");
break;
case DisplayState.AwakenAble:
+ DisplayProgress(true, progress);
m_Description.text = Language.Get("FabaoState_Text_2");
break;
case DisplayState.CollectSoul:
+ DisplayProgress(true, progress);
m_Description.text = Language.Get("FabaoState_Text_3");
break;
case DisplayState.AwakenUnderway:
+ DisplayProgress(true, progress);
DisplayTreasureUpStage(treasure.GetStageId(treasure.stage + 1));
break;
case DisplayState.WaitUnLock:
@@ -320,14 +330,18 @@
{
m_Description.text = Language.Get("FabaoState_Text_5");
}
+ DisplayProgress(false, progress);
break;
case DisplayState.PotentialUpAble:
+ DisplayProgress(false, progress);
m_Description.text = Language.Get("FabaoState_Text_9");
break;
case DisplayState.PotentialUp:
+ DisplayProgress(false, progress);
m_Description.text = Language.Get("FabaoState_Text_6");
break;
case DisplayState.AllCompleted:
+ DisplayProgress(false, progress);
m_NormalContainer.gameObject.SetActive(false);
m_AllCompletedContainer.gameObject.SetActive(true);
break;
@@ -535,6 +549,19 @@
}
}
+
+ private void DisplayProgress(bool _show, float _progress)
+ {
+ if (_show)
+ {
+ m_Progress.text = Language.Get("FabaoState_Text_4", Mathf.RoundToInt(_progress * 100f));
+ }
+ else
+ {
+ m_Progress.text = "";
+ }
+ }
+
private void DisplayTreasureUpStage(int _stage)
{
var config = Config.Instance.Get<TreasureUpConfig>(_stage);
--
Gitblit v1.8.0