From b90395cba00d7dd7c79d6e1d5ecbf2270dd920fe Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 28 Dec 2021 13:00:55 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=9D=E3=81=AE=E4=BB=96=E3=81=BE=E3=81=A8?= =?UTF-8?q?=E3=82=81=E3=81=A6Localize=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs | 2 +- .../MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs | 2 +- .../Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs | 2 +- .../Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs | 2 +- popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs | 2 +- .../Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs | 2 +- .../MyGame/Scenes/marketing/Scripts/BrotherConversation.cs | 2 +- popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs | 2 +- .../MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs | 4 ++-- .../MyGame/Scenes/shopping/Scripts/ShopItemExchangeView.cs | 2 +- .../MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs | 4 ++-- popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs index 1e334546..da6804eb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrder.cs @@ -49,7 +49,7 @@ public class BulkOrder : MonoBehaviour var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); var bulkOrderData = bulkOrderList.First(data => data.id == gameData.OrderIdInProgress); - messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; + messageText.text = messageList.First(data => data.id == gameData.OrderTextId).RequestText; coinText.text = bulkOrderData.rewardCoin.ToString(); heartText.text = bulkOrderData.rewardHeart.ToString(); orderCharacterImage.sprite = bulkOrderCharacter.GetNormalIcon(gameData.OrderIconIndex); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs index 3dbe924e..b149613a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderAchievedView.cs @@ -30,7 +30,7 @@ public class BulkOrderAchievedView : MonoBehaviour heartText.text = orderData.rewardHeart.ToString(); coinText.text = orderData.rewardCoin.ToString(); bonusCoinText.text = bonus.ToString(); - messageText.text = messageList.First(data => data.id == gameData.OrderTextId).thanksText; + messageText.text = messageList.First(data => data.id == gameData.OrderTextId).ThanksText; orderCharacterImage.sprite = bulkOrderCharacter.GetThanksIcon(gameData.OrderIconIndex); } closeButton.OnClickAsObservable().Take(1).Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs index 5d0c319f..48758116 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/BulkOrderNotifyView.cs @@ -28,7 +28,7 @@ public class BulkOrderNotifyView : MonoBehaviour { var gameData = GameDataManager.GameData; var messageList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderTextDataSheet); - messageText.text = messageList.First(data => data.id == gameData.OrderTextId).requestText; + messageText.text = messageList.First(data => data.id == gameData.OrderTextId).RequestText; coinText.text = orderData.rewardCoin.ToString(); heartText.text = orderData.rewardHeart.ToString(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs index a2e2f2ee..4486eafd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs @@ -14,7 +14,7 @@ public class HasMaterialItemView : MonoBehaviour public void SetData(ShopData shopData, int amount) { amountText.text = $"{amount}{ScriptLocalization.Unit.Amount}"; - nameText.text = shopData.name; + nameText.text = shopData.Name; materialTarget.DestroyAllChildrens(); Instantiate(shopData.GetIconPrefab(), materialTarget); } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index 106dbd33..de6e112d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -76,7 +76,7 @@ public class Information : MonoBehaviour totalDayText.text = $"{gameData.dailyLoginCount}{ScriptLocalization.Unit.Day}"; totalSalesText.text = $"{gameData.TotalSales}{ScriptLocalization.Unit.Amount}"; totalCoinText.text = gameData.TotalAddCoin.ToString(); - achievementText.text = shopLevelData.achievement; + achievementText.text = shopLevelData.Achievement; shopLevelText.text = String.Format(shopLevelFormat, gameData.ViewedShopLevel.ToString()); progressText.text = String.Format(progressFormat, Mathf.Min(gameData.Heart, nextLevelHeart), nextLevelHeart); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs index c31c2819..f22bb3ca 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs @@ -14,7 +14,7 @@ public class ShopHistoryItemView : MonoBehaviour public IObservable PlayButton => playButton.OnClickAsObservable().TakeUntilDestroy(this); public void SetData(ShopLevelData levelData) { - achievementText.text = String.Format(acivementFormat, levelData.shopLevel, levelData.achievement); + achievementText.text = String.Format(acivementFormat, levelData.shopLevel, levelData.Achievement); } public void SetUnreleased(bool active) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs index caba453f..b2e5ecbe 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/BrotherConversation.cs @@ -62,7 +62,7 @@ public class BrotherConversation : MonoBehaviour private void SetData(BrotherScriptData scriptData) { - brotherText.text = scriptData.text; + brotherText.text = scriptData.Text; switch (scriptData.Brother) { case BrotherType.Blue: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs index b0652cd4..774819a4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ShopLevelUp.cs @@ -33,7 +33,7 @@ public class ShopLevelUp : MonoBehaviour var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); var productData = productList.FirstOrDefault(data => data.shopLevel == shopLevel); shopLevelText.text = shopLevel.ToString(); - achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.achievement ?? ""; + achievementText.text = shopLevelList.FirstOrDefault(data => data.shopLevel == shopLevel)?.Achievement ?? ""; recipeNameText.text = productData?.Name ?? ""; closeButton.OnClickAsObservable().Take(1).Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs index 0fb0102a..3d468d5a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemDetailView.cs @@ -32,8 +32,8 @@ public class ShopItemDetailView : MonoBehaviour private void SetData(ShopData shopData) { - name.text = shopData.name; - text.text = shopData.text; + name.text = shopData.Name; + text.text = shopData.Text; iconTarget.DestroyAllChildrens(); Instantiate(shopData.GetPrefab(), iconTarget); } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemExchangeView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemExchangeView.cs index 78ce73d0..cd7f6a2f 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemExchangeView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemExchangeView.cs @@ -36,7 +36,7 @@ public class ShopItemExchangeView : MonoBehaviour private void SetData(ShopData shopData) { - name.text = shopData.name; + name.text = shopData.Name; iconTarget.DestroyAllChildrens(); Instantiate(shopData.GetPrefab(), iconTarget); } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs index ac57e34d..8acb67be 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemPurchaseView.cs @@ -109,10 +109,10 @@ public class ShopItemPurchaseView : MonoBehaviour private void SetData(ShopData shopData, int count) { - name.text = shopData.name; + name.text = shopData.Name; price.text = $"{shopData.price}"; stockCount.text = $"{ScriptLocalization.UI.RecipeChoiceMyStockPrefix}{count}"; - text.text = shopData.text; + text.text = shopData.Text; iconTarget.DestroyAllChildrens(); Instantiate(shopData.GetPrefab(), iconTarget); } diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs index f5ef1697..5842a8c0 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/ShopItemView.cs @@ -29,7 +29,7 @@ public class ShopItemView : MonoBehaviour public void SetData(ShopData shopData) { - itemName.text = shopData.name; + itemName.text = shopData.Name; price.text = $"{shopData.price}"; if (shopData.ConsumeType == ShopItemType.NonConsumable) {