From 9b32dc3c38cfb64f2fda0e7d2ac74bb64211dc10 Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 29 Jun 2022 18:54:23 +0900 Subject: [PATCH] =?UTF-8?q?add=20=E7=BF=BB=E8=A8=B3=20text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/MiniGame/MiniGame.unity | 64 +++++++++++---- .../MiniGame/Scripts/StageSelectItemView.cs | 7 +- .../MiniGame/Scripts/StageSelectView.cs | 11 +-- .../Assets/MyGame/Scripts/SpreadsheetData.cs | 1 + popcorn/Assets/Resources/I2Languages.asset | 77 +++++++++++++++++++ 5 files changed, 138 insertions(+), 22 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity index a85e76ad..5283119a 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/MiniGame.unity @@ -152,6 +152,31 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &169743260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 175614541} +--- !u!114 &175614541 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7322157960569866670, guid: 041c0f3d96c90d64094cc76c5c87c26f, + type: 3} + m_PrefabInstance: {fileID: 4559813503860727169} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &275350936 GameObject: m_ObjectHideFlags: 0 @@ -880,6 +905,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 4559813503860727175} +--- !u!114 &1464096862 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5034752975584991938, guid: 199214813202e5f478789161b538685b, + type: 3} + m_PrefabInstance: {fileID: 5034752974072861411} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1657044091 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1030,7 +1067,6 @@ GameObject: - component: {fileID: 1736734473} - component: {fileID: 1736734472} - component: {fileID: 1736734471} - - component: {fileID: 1736734474} m_Layer: 5 m_Name: Reset Score Button (2) m_TagString: Untagged @@ -1138,19 +1174,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1736734469} m_CullTransparentMesh: 0 ---- !u!114 &1736734474 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1736734469} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3} - m_Name: - m_EditorClassIdentifier: - debugOptionButton: {fileID: 0} --- !u!114 &1808582153 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1164,6 +1187,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 4559813503860727174} +--- !u!114 &1834858121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1464096862} --- !u!1 &1870432532 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs index c18cee30..7f64cd79 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectItemView.cs @@ -1,4 +1,5 @@ using System; +using I2.Loc; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -19,7 +20,7 @@ namespace MyGame.Scenes.MiniGame.Scripts hiScore.AddTo(this); hiScore.Subscribe(val => { - stageHiScore.text = $"ハイスコア：{val}"; + stageHiScore.text = $"{LocalizationManager.GetTranslation("UI/HiScore")}{val}"; }).AddTo(this); } @@ -32,10 +33,10 @@ namespace MyGame.Scenes.MiniGame.Scripts switch (stageData.Difficulty) { case ScrollGameDifficulty.Easy: - lockText.text = $"初級のハイスコア\n{stageData.needScore}以上で開放"; + lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockNormal"), stageData.needScore); break; case ScrollGameDifficulty.Normal: - lockText.text = $"中級のハイスコア\n{stageData.needScore}以上で開放"; + lockText.text = string.Format(LocalizationManager.GetTranslation("UI/ScrollGameStageLockHard"), stageData.needScore); break; case ScrollGameDifficulty.Hard: lockText.text = string.Empty; diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs index 903ed991..515016f6 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/StageSelectView.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using I2.Loc; using UnityEngine; using UnityEngine.UI; @@ -20,11 +21,11 @@ namespace MyGame.Scenes.MiniGame.Scripts public ScrollRect ScrollRect => scrollRect; public StageSelectItemView[] ItemViewList => itemViewList; - public void SetScore(int num) => totalScore.text = $"累計スコア：{num}"; + public void SetScore(int num) => totalScore.text = $"{LocalizationManager.GetTranslation("UI/TotalScore")}{num}"; public void SetPlaceData(ScrollGamePlaceData[] placeDataList) { - // titleText.text = placeDataList[0].placeId.ToString(); + titleText.text = placeDataList[0].StageName; var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); var productDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); foreach (var placeData in placeDataList) @@ -32,13 +33,13 @@ namespace MyGame.Scenes.MiniGame.Scripts if (placeData.itemId != 0) { var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.itemId && data.Category == ItemCategory.Material); - itemText.text = $"貰える材料：　{shopData.Name}"; + itemText.text = $"{LocalizationManager.GetTranslation("UI/EarnItem")}{shopData.Name}"; // itemNeedScoreText.text = placeData.needScore.ToString(); }else if (placeData.recipeId != 0) { var productData = productDataList.FirstOrDefault(data => data.id == placeData.recipeId); - recipeText.text = $"達成報酬：　{productData.Name}"; - recipeNeedScoreText.text = $"必要スコア：{placeData.needScore}"; + recipeText.text = $"{LocalizationManager.GetTranslation("UI/RewardItem")}{productData.Name}"; + recipeNeedScoreText.text = $"{LocalizationManager.GetTranslation("UI/NeedScore")}{placeData.needScore}"; } } } diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 41901aeb..00449ca2 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -544,6 +544,7 @@ public sealed class ScrollGamePlaceData public int itemId; public int recipeId; public int customizeId; + public string StageName => LocalizationManager.GetTranslation($"Item/ScrollGamePlaceName{id:0000}"); } [Serializable] diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index cfd09414..2c275391 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -13345,6 +13345,83 @@ MonoBehaviour: - Flags: 0000000000 Languages_Touch: [] + - Term: UI/ScrollGameStageLockHard + TermType: 0 + Description: + Languages: + - "\u4E2D\u7D1A\u306E\u30CF\u30A4\u30B9\u30B3\u30A2\n{0}\u4EE5\u4E0A\u3067\u958B\u653E" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/ScrollGameStageLockNormal + TermType: 0 + Description: + Languages: + - "\u521D\u7D1A\u306E\u30CF\u30A4\u30B9\u30B3\u30A2\n{0}\u4EE5\u4E0A\u3067\u958B\u653E" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/HiScore + TermType: 0 + Description: + Languages: + - "\u30CF\u30A4\u30B9\u30B3\u30A2\uFF1A" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/TotalScore + TermType: 0 + Description: + Languages: + - "\u7D2F\u8A08\u30B9\u30B3\u30A2\uFF1A" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/NeedScore + TermType: 0 + Description: + Languages: + - "\u5FC5\u8981\u30B9\u30B3\u30A2\uFF1A" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/EarnItem + TermType: 0 + Description: + Languages: + - "\u8CB0\u3048\u308B\u6750\u6599\uFF1A\u3000" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/RewardItem + TermType: 0 + Description: + Languages: + - "\u9054\u6210\u5831\u916C\uFF1A\u3000" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: