diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 90938307..1cd5a492 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -141,8 +141,8 @@ public class CookingResult : MonoBehaviour private void SetData(ProductData recipe, RarityData rarity, ProductViewType viewType) { // popcornImage - popcornText.text = recipe.name; - popcornTextPerfect.text = recipe.name; + popcornText.text = recipe.Name; + 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; diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs index 0875ca0d..a17bc028 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderItemView.cs @@ -33,7 +33,7 @@ public class BulkOrderItemView : MonoBehaviour public void SetData(ProductData data) { stockText.text = data.volume.ToString(); - nameText.text = data.name; + nameText.text = data.Name; cornText.text = string.Format(amountFormat, data.MaterialList[0].amount); packageIconTarget.DestroyAllChildrens(); Instantiate(data.GetIconPrefab(), packageIconTarget); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs index bb8c649f..5d0c319f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -39,7 +39,7 @@ public class BulkOrderNotifyView : MonoBehaviour var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); if (productList.FirstOrDefault(data => data.id == orderData.productId1) is ProductData data1) { - itemView1.SetData(data1.name, orderData.count1, data1.GetIconPrefab()); + itemView1.SetData(data1.Name, orderData.count1, data1.GetIconPrefab()); itemView1.SetActive(true); } else @@ -48,7 +48,7 @@ public class BulkOrderNotifyView : MonoBehaviour } if (productList.FirstOrDefault(data => data.id == orderData.productId2) is ProductData data2) { - itemView2.SetData(data2.name, orderData.count2, data2.GetIconPrefab()); + itemView2.SetData(data2.Name, orderData.count2, data2.GetIconPrefab()); itemView2.SetActive(true); } else @@ -57,7 +57,7 @@ public class BulkOrderNotifyView : MonoBehaviour } if (productList.FirstOrDefault(data => data.id == orderData.productId3) is ProductData data3) { - itemView3.SetData(data3.name, orderData.count3, data3.GetIconPrefab()); + itemView3.SetData(data3.Name, orderData.count3, data3.GetIconPrefab()); itemView3.SetActive(true); } else diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs index 3e953b08..3efe3b03 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs @@ -14,7 +14,7 @@ public class HasProductItemView : MonoBehaviour public void SetData(ProductData productData, int amount) { amountText.text = $"{amount}{ScriptLocalization.Unit.Amount}"; - nameText.text = productData.name; + nameText.text = productData.Name; productTarget.DestroyAllChildrens(); Instantiate(productData.GetIconPrefab(), productTarget); } diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index 690aeb5b..b0652cd4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -34,7 +34,7 @@ public class ShopLevelUp : MonoBehaviour var productData = productList.FirstOrDefault(data => data.shopLevel == shopLevel); shopLevelText.text = shopLevel.ToString(); achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.achievement ?? ""; - recipeNameText.text = productData?.name ?? ""; + recipeNameText.text = productData?.Name ?? ""; closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs index 3b962aa6..6339326d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TankDetailView.cs @@ -39,8 +39,8 @@ public class TankDetailView : MonoBehaviour totalStock.text = $"{ScriptLocalization.UI.RecipeChoiceMyStockPrefix}{data.totalStock}"; tankStock.text = string.Format(ScriptLocalization.UI.ManagementTankTankNumber, data.tankNum, data.tankData.Stock); price.text = $"{data.productData.price}"; - name.text = $"{data.productData.name}"; - text.text = data.productData.text; + name.text = $"{data.productData.Name}"; + text.text = data.productData.Text; popcornImageTarget.DestroyAllChildrens(); Instantiate(data.productData.GetIconPrefab(), popcornImageTarget); raritySummaryView.SetHasRarity(data.raritySummaryData); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs index 51e7d4e5..1a02c385 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/TastingView.cs @@ -21,7 +21,7 @@ public class TastingView : MonoBehaviour var data = LocalCacheManager.Load<(IObservable<(int tankNum, ProductData productData)> selectedObservable, Action closeButtonAction, Action tastingButtonAction)>(TastingDataTag); data.selectedObservable.Subscribe(x => { - popcornName.text = x.productData.name; + popcornName.text = x.productData.Name; packageImageTarget.DestroyAllChildrens(); Instantiate(x.productData.GetIconPrefab(), packageImageTarget); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs index 37f3ce72..e4694c56 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeData.cs @@ -21,7 +21,7 @@ public class RecipeData return SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet).Select(data => new RecipeData { RecipeId = data.id, - Name = data.name, + Name = data.Name, Price = data.price, Volume = data.volume, CornAmount = data.MaterialList[0].amount, diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index 4d1ac51e..4c073292 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -118,10 +118,10 @@ public class RecipeDetailView : MonoBehaviour var shopStock = gameData.ShopStock.Count(stockData => stockData.FlavorId == data.id); var tankStock = gameData.StorageTanks.FindAll(x => x.FlavorId == data.id).Sum(x => x.Stock); flavorStock.text = $"{ScriptLocalization.UI.RecipeChoiceMyStockPrefix}{shopStock + tankStock}"; - flavorName.text = data.name; + flavorName.text = data.Name; flavorPrice.text = data.price.ToString(); flavorVolume.text = data.volume.ToString(); - flavorText.text = data.text; + flavorText.text = data.Text; flavorImageTarget.DestroyAllChildrens(); Instantiate(data.GetIconPrefab(), flavorImageTarget); cornAmountText.text = string.Format(cornAmountFormat, gameData.CornSeed, data.MaterialList[0].amount); diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs index 10eaf3bf..d33b517f 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeView.cs @@ -30,7 +30,7 @@ public class RecipeView : MonoBehaviour public void SetRecipe(ProductData data) { - flavorName.text = data.name; + flavorName.text = data.Name; flavorPrice.text = data.price.ToString(); flavorImageTarget.DestroyAllChildrens(); Instantiate(data.GetIconPrefab(), flavorImageTarget);