From fa5761f9f85eb18da4386af674cc224c17ca9645 Mon Sep 17 00:00:00 2001
From: kimura <kimura@usaya.jp>
Date: Tue, 28 Dec 2021 12:43:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E8=AA=AD=E3=81=BF?=
 =?UTF-8?q?=E8=BE=BC=E3=81=BF=E3=81=8B=E3=82=89=E3=81=AELocalize=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs | 2 +-
 popcorn/Assets/MyGame/Scenes/Main/Mission.unity               | 4 ++--
 popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs   | 1 -
 popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs      | 2 +-
 popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs    | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
index f64099bd..90938307 100644
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs
@@ -145,7 +145,7 @@ public class CookingResult : MonoBehaviour
         popcornTextPerfect.text = recipe.name;
         quantityText.text = string.Format(QuantityTextFormat, recipe.volume);
         coinView.SetPrice(recipe.GetRarityPrice(ProductRarity.Normal), recipe.GetRarityPrice(rarity.Rarity));
-        var rarityFormat = viewType == ProductViewType.Default ? rarity.text : ScriptLocalization.UI.CookingResultsBulkOrderPerfect;
+        var rarityFormat = viewType == ProductViewType.Default ? rarity.Text : ScriptLocalization.UI.CookingResultsBulkOrderPerfect;
         rarityText.text = rarityFormat;
         rarityView.SetRarity(rarity.Rarity);
         popcornTarget.DestroyAllChildrens();
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity
index 8f2b1f7c..66e2b5e5 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity
@@ -555,7 +555,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &70687868
+--- !u!114 &71960277
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -568,7 +568,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mTarget: {fileID: 55686911}
---- !u!114 &729722332
+--- !u!114 &1558266571
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
index b420393f..22630458 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs
@@ -80,7 +80,6 @@ public class MissionManager : MonoBehaviour
             {
                 count = gameData.dailyMissionIdArray.Length,
                 reward = dailyMissionCompleteRewardCoin,
-                text = "デイリーミッションを達成しよう",
                 category = (int)MissionCategory.Daily,
             };
             var progressValue = gameData.dailyMissionAchievedIdArray.Length;
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs
index 45f65507..1407b907 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs
+++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs
@@ -20,7 +20,7 @@ public class MissionView : MonoBehaviour
     public void SetData(MissionData missionData, int curentValue)
     {
         coinText.text = missionData.reward.ToString();
-        missionText.text = missionData.text;
+        missionText.text = missionData.Text;
         progressBar.value = Mathf.InverseLerp(0, missionData.count, curentValue);
         progressText.text = string.Format(progressFormat, curentValue, missionData.count);
     }
diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
index 262afa80..fbab8344 100644
--- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
+++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/PanSelector.cs
@@ -54,8 +54,8 @@ public class PanSelector : MonoBehaviour
 
     private void SetData(PanData data)
     {
-        panName.text = data.name;
-        panText.text = data.text;
+        panName.text = data.Name;
+        panText.text = data.Text;
         panIconTarget.DestroyAllChildrens();
         Instantiate(data.GetIconPrefab(), panIconTarget);
     }