Merge branch 'feture/update_ver1.1.0' of bitbucket.org:usaya/popcorn into feture/update_ver1.1.0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab

@@ -220,7 +220,8 @@ MonoBehaviour:
   AddSpacesToJoinedLanguages: 0
   AllowLocalizedParameters: 1
   AllowParameters: 1
-  TranslatedObjects: []
+  TranslatedObjects:
+  - {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3}
   LocalizeEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -735,7 +736,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3}
+  m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -771,7 +772,8 @@ MonoBehaviour:
   AddSpacesToJoinedLanguages: 0
   AllowLocalizedParameters: 1
   AllowParameters: 1
-  TranslatedObjects: []
+  TranslatedObjects:
+  - {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3}
   LocalizeEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -1372,7 +1374,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3}
+    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
     m_FontSize: 30
     m_FontStyle: 0
     m_BestFit: 0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab

@@ -318,7 +318,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mTerm: UI/MissionAllDailyMissionAchieved
+  mTerm: '-'
   mTermSecondary: Font/DFHannotateStdN-W7
   PrimaryTermModifier: 0
   SecondaryTermModifier: 0
@@ -1472,7 +1472,7 @@ GameObject:
   - component: {fileID: 1296511795986295264}
   - component: {fileID: 697035924651597310}
   - component: {fileID: 8571419451803588585}
-  - component: {fileID: 5562878249854526551}
+  - component: {fileID: 6987454967426471672}
   m_Layer: 5
   m_Name: Text_purchase
   m_TagString: Untagged
@@ -1536,7 +1536,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &5562878249854526551
+--- !u!114 &6987454967426471672
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1562,7 +1562,8 @@ MonoBehaviour:
   AddSpacesToJoinedLanguages: 0
   AllowLocalizedParameters: 1
   AllowParameters: 1
-  TranslatedObjects: []
+  TranslatedObjects:
+  - {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3}
   LocalizeEvent:
     m_PersistentCalls:
       m_Calls: []

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) // 達成済み
             {

popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionView.cs

@@ -17,10 +17,10 @@ public class MissionView : MonoBehaviour
     [SerializeField] private Slider progressBar;
     public IObservable<Unit> 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);
     }

popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeSelectDialog.cs

@@ -36,9 +36,13 @@ public class RecipeSelectDialog : MonoBehaviour
         var content = scrollRect.content;
         content.transform.DestroyAllChildrens();
         var productDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
-        var shopData = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
+        var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
-        var shopRecipes = shopData.Where(data => data.Category == ItemCategory.Recipe).Select(data => data.itemId);
+        var ownedRecipesList = shopDataList.Where(data => data.Category == ItemCategory.Recipe).Select(data => data.itemId).ToList();
-        var targetList = productDataList.Where(data => data.shopLevel != Const.SpecialShopLevel || shopRecipes.Contains(data.id)).ToList();
+        var targetList = productDataList
+            .Where(data => data.shopLevel != Const.SpecialShopLevel || ownedRecipesList.Contains(data.id))
+            .OrderByDescending(data => gameData.MyRecipes.Contains(data.id))
+            .ThenBy(data => ownedRecipesList.Contains(data.id))
+            .ToList();
         
         foreach (var productData in targetList)
         {

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]