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

popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt

@@ -1 +1 @@
-LhZlT7iqc5Y1fJqNFQ51fTkBxTGgnr15l0pQb7awmIf/IMrrrM/NePVO5frY65cy
+2qnMRdPKwVr8IYeSEFCnSn9irYNhuyVxDnTi9sgB3AYBdNlnJSB3PE4UeirM2gSc

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

@@ -114,7 +114,7 @@ public class BulkOrder : MonoBehaviour
                 // 獲得
                 var rarityList = SpreadsheetDataManager.Instance.GetBaseDataList<RarityData>(Const.RarityDataSheet);
                 var bonus = CalcBonus(rarityList, gameData.CompletedProductList, bulkOrderData.rewardHeart);
-                CoinManager.Instance.AddCoinForBulkOrder(bulkOrderData.retryCondition + bonus, coinPos);
+                CoinManager.Instance.AddCoinForBulkOrder(bulkOrderData.rewardCoin + bonus, coinPos);
                 gameData.Coin = CoinManager.Instance.OwnCoin;
                 /*
                  * アニメーション終了後にハートを加算する
@@ -255,6 +255,6 @@ public class BulkOrder : MonoBehaviour
             var bonusRate = rarityList.FirstOrDefault(data => data.Rarity == progressData.Rarity)?.bulkOrderBonus ?? 0;
             totalBonus += bonusRate * heart;
         }
-        return Mathf.CeilToInt(totalBonus / hasRarityList.Count);
+        return Mathf.CeilToInt(totalBonus / resultData.Count);
     }
 }

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

@@ -91,14 +91,8 @@ public class BulkOrderItemView : MonoBehaviour
     {
         cookingButton.gameObject.SetActive(false);
         disabledObject.SetActive(false);
-        if (rarity == ProductRarity.Normal)
-        {
-            cookedObject.SetActive(true);
-        }
-        else
-        {
-            perfectCookedObject.SetActive(true);
-            rarityView.SetRarity(rarity);
-        }
+        cookedObject.SetActive(rarity == ProductRarity.Normal);
+        perfectCookedObject.SetActive(!cookedObject.activeSelf);
+        rarityView.SetRarity(rarity);
     }
 }