From b69617efa48b2a6370120aab6ce1f7bd8e66e092 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 2 Feb 2022 12:42:25 +0900 Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E5=87=A6=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs | 2 +- popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs | 4 ++-- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index 22630458..baff2073 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -83,7 +83,7 @@ public class MissionManager : MonoBehaviour category = (int)MissionCategory.Daily, }; var progressValue = gameData.dailyMissionAchievedIdArray.Length; - missionView.SetData(missionData, progressValue); + missionView.SetData(missionData, progressValue, ScriptLocalization.UI.MissionAllDailyMissionAchieved); missionView.SetButtonActive(missionData.count <= progressValue); if (gameData.dailyMissionCompleted) // 達成済み { diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs index 1407b907..a6a8ffa0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs @@ -17,10 +17,10 @@ public class MissionView : MonoBehaviour [SerializeField] private Slider progressBar; public IObservable RewardButton => rewardButton.OnClickAsObservable().TakeUntilDestroy(this); - public void SetData(MissionData missionData, int curentValue) + public void SetData(MissionData missionData, int curentValue, string specialText = null) { coinText.text = missionData.reward.ToString(); - missionText.text = missionData.Text; + missionText.text = specialText ?? missionData.Text; progressBar.value = Mathf.InverseLerp(0, missionData.count, curentValue); progressText.text = string.Format(progressFormat, curentValue, missionData.count); } diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 06f4c8e5..a3f821be 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -157,7 +157,7 @@ public sealed class MissionData public MissionCategory Category => (MissionCategory) category; public MissionCondition Condition => (MissionCondition) condition; public MissionRewardType RewardType => (MissionRewardType) rewardType; - public string Text => LocalizationManager.TryGetTranslation($"Mission/MissionText{id:0000}", out var t) ? t : ScriptLocalization.UI.MissionAllDailyMissionAchieved; + public string Text => LocalizationManager.GetTranslation($"Mission/MissionText{id:0000}"); } [Serializable]