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/DailyQuest/DailyQuestBehaviour.cs | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/System/DailyQuest/DailyQuestBehaviour.cs b/System/DailyQuest/DailyQuestBehaviour.cs
index 8a540ee..6262cdd 100644
--- a/System/DailyQuest/DailyQuestBehaviour.cs
+++ b/System/DailyQuest/DailyQuestBehaviour.cs
@@ -15,6 +15,7 @@
{
[SerializeField] Text m_Title;
[SerializeField] RectTransform m_ContainerTimes;
+ [SerializeField] Text m_TimesUnit;
[SerializeField] TextEx m_Times;
[SerializeField] Text m_PracticePoint;
[SerializeField] Text m_UnLockCondition;
@@ -189,6 +190,17 @@
else
{
m_ContainerTimes.gameObject.SetActive(true);
+
+ switch ((DailyQuestType)this.data.id)
+ {
+ case DailyQuestType.KillMonster:
+ m_TimesUnit.text = Language.Get("DailyQuestMonster");
+ break;
+ default:
+ m_TimesUnit.text = Language.Get("DailyQuestTimes");
+ break;
+ }
+
m_Times.text = StringUtility.Contact(completedTimes, "/", totalTimes);
m_Times.colorType = completedTimes >= totalTimes ? TextColType.DarkGreen : TextColType.NavyBrown;
}
@@ -318,6 +330,9 @@
switch ((DailyQuestType)data.id)
{
+ case DailyQuestType.KillMonster:
+ m_PracticePoint.text = Language.Get("DailyQuestPerPoint2", config.OnceActivity, config.OnceActivityTime);
+ break;
case DailyQuestType.BlastStove:
m_PracticePoint.text = Language.Get("DailyQuestLiandan", config.OnceActivity);
break;
--
Gitblit v1.8.0