From 67486af4048fc07e079ab80a08ec400e80a6f90d Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 12 Nov 2021 10:48:40 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B6=E3=83=AB=E3=83=88=E3=83=91?= =?UTF-8?q?=E3=83=BC=E3=83=95=E3=82=A7=E3=82=AF=E3=83=88=E6=99=82=E3=81=AE?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/RarityData.txt | 2 +- .../Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs | 5 ++--- popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 48e0c545..26897b64 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -oZHfCs7SEPFZ7PATuTmLLCXSyHiCLqSbOQJqvzKURGDSKRP9QoHAwCQ2BfWEN7Ta \ No newline at end of file +fCqn3xSyJAbOiUdLXsQdrJ6xHuV+b97Wp3UnP5NejTyX6wIQzkAz64YCYTdBIIJc \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/RarityData.txt b/popcorn/Assets/MyGame/Resources/Data/RarityData.txt index 072f5486..a7066d73 100644 --- a/popcorn/Assets/MyGame/Resources/Data/RarityData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/RarityData.txt @@ -1 +1 @@ -y9xqDZPojFZWMIzo/qYLur4UDA7BM8IF4MiH82qjgcU6R3OCZ35fS8DeGRuvSHJ8u97svxcv1dhnSGIXUnXjr1synR1Ah8LtkYS65R6CwYbVbw4vIWl2C8BVN9asmnsjlfIqpJ7DqUUKdgpsaGN7XO4EzOwcNbtl/LHzzAwc+QITRFYyQiCPyZuqU9x9NSF2AXYffSdA9Lq0+1KYgIbkM6gCXW42DpgPBwR2zC2TUSdFji7jGBbBcFbprvkQIbG009xhN2fz2ZXRC6kmoqKJS6bj4qP73BtGN9XmEFooGmkr1q4fuhYDJz+4EKw9zEwENcX0fZWAm4ctdROpLUI0EQ== \ No newline at end of file ++zGxRrfpc+ne+VVFrMKdo77oO6dguySjNSusUyULBUH6/Hbf2e/PCW1P3u0rf0seEB6wBkgHBEonQPBgSDnWCW7TpYBkf5wATErjCNUx5VjOAKwJ8KOLeVvEKrlAeHYuw8jW8KO/iVLZTREEmywMNfAcfZLQfziqlKDka7VB7tD6WKQym3nBbdr1b6HEU7PJstoTyuT1z+whqior9eQitgq3thWBhhLunzHMOlFli3doaEuqkR0Ow5txzphm4cRrg6irFkFRWYv6/GBiG+UCP3H23gA7eCmCJF7YGBWRoQ8d+X3QSyjWDJs6pcfmTyXS1vlk4mi715HDGEO7ocBKdBqUWOthHUYbU6Dd9FABGpESJbSGif2cy2z4WC6ztEuiMKKyDU2lt7wIYv9FskBtw9iBmM/fzyveGeH3SRXJ9cyaBBn1/2FkcLl0f/FRjyOTCYuQIBDSlago5RzahLYdL6L1vLBgTHXcXN2wnTaD+GNTZNgRArIcEBXiEUD7zjbeh+pAciZKkmNUyNyYdLpdXPb0pojMqIrsPeLEX6eOfait9kxVcPr7vHh2fgNZC8yyhpGY6J/pb0qvpwq7uVi1lA== \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 8a3f1392..750b6edd 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -8,7 +8,6 @@ using UnityEngine.UI; public class CookingResult : MonoBehaviour { - private static readonly string RarityTextFormat = "売値 +{0}% UP"; private static readonly string BulkOrderRarityTextFormat = "大成功ボーナス獲得"; private static readonly string QuantityTextFormat = "x{0}"; [SerializeField] private GameObject smokeEffect; @@ -145,8 +144,8 @@ public class CookingResult : MonoBehaviour popcornText.text = recipe.name; popcornTextPerfect.text = recipe.name; quantityText.text = string.Format(QuantityTextFormat, recipe.volume); - var rarityFormat = viewType == ProductViewType.Default ? RarityTextFormat : BulkOrderRarityTextFormat; - rarityText.text = string.Format(rarityFormat, rarity.rate - 100); + var rarityFormat = viewType == ProductViewType.Default ? rarity.text : BulkOrderRarityTextFormat; + rarityText.text = rarityFormat; rarityView.SetRarity(rarity.Rarity); popcornTarget.DestroyAllChildrens(); Instantiate(recipe.GetLargePrefab(), popcornTarget); diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index d7151992..8fb7a6c5 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -162,8 +162,8 @@ public sealed class MissionData public sealed class RarityData { public int id; - public int rate; public int bulkOrderBonus; + public string text; public ProductRarity Rarity => (ProductRarity)id; }