diff --git a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity index ad755fa9..54ad9161 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity @@ -1890,6 +1890,7 @@ GameObject: - component: {fileID: 813962579} - component: {fileID: 813962581} - component: {fileID: 813962580} + - component: {fileID: 813962582} m_Layer: 0 m_Name: text m_TagString: Untagged @@ -1959,6 +1960,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 813962578} m_CullTransparentMesh: 1 +--- !u!114 &813962582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 813962578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 912011110} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &825821311 GameObject: m_ObjectHideFlags: 0 @@ -2212,6 +2252,7 @@ GameObject: - component: {fileID: 907682418} - component: {fileID: 907682420} - component: {fileID: 907682419} + - component: {fileID: 907682421} m_Layer: 0 m_Name: text m_TagString: Untagged @@ -2281,6 +2322,58 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 907682417} m_CullTransparentMesh: 1 +--- !u!114 &907682421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 907682417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1779971173} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text +--- !u!114 &912011110 +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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 813962580} --- !u!1 &1005692089 GameObject: m_ObjectHideFlags: 0 @@ -4234,6 +4327,19 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1764080009} m_PrefabAsset: {fileID: 0} +--- !u!114 &1779971173 +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: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 907682419} --- !u!1 &1787010080 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs index 8af3e03f..ea4e8468 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/PartTimerDialog.cs @@ -86,7 +86,7 @@ namespace MyGame.Scenes.Main.Scripts private void SetMaxLevel() { maxLevelFillObject.SetActive(true); - tipsText.text = "最大レベルに達しました"; + tipsText.text = ScriptLocalization.UI.LevelMax; heartMaxObject.SetActive(true); SetButtonActive(false); amountText.text = "--"; @@ -97,7 +97,7 @@ namespace MyGame.Scenes.Main.Scripts var progress = (float)GameDataUtils.GetPartTimerHeart(cityData.id) / nextPartTimerData.needHeart; var isHeartMax = progress >= 1f; heartSlider.value = progress; - tipsText.text = isHeartMax ? "レベルアップすることができます" : "新店舗でハートを集めよう"; + tipsText.text = isHeartMax ? ScriptLocalization.UI.EmployMentLevelUpTips : ScriptLocalization.UI.EmployMentHeart; heartMaxObject.SetActive(isHeartMax); SetButtonActive(isHeartMax); amountText.text = nextPartTimerData.needAmount.ToString(); diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_icon.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_icon.prefab index f66155f1..9c4996e1 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_icon.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/Country_icon.prefab @@ -132,6 +132,7 @@ MonoBehaviour: m_EditorClassIdentifier: cityIcon: {fileID: 498716710821908371} cityId: 1 + cityNameText: {fileID: 498716711008981475} pin: {fileID: 498716709849429620} lockIcon: {fileID: 498716710438122542} notifyIcon: {fileID: 8888824836673155761} @@ -300,6 +301,7 @@ GameObject: - component: {fileID: 498716711008981472} - component: {fileID: 498716711008981474} - component: {fileID: 498716711008981475} + - component: {fileID: 1898392177487003913} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -369,6 +371,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30A8\u30C3\u30B0\u5CF6" +--- !u!114 &1898392177487003913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498716711008981473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: '-' + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &498716711025342638 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab index 4aa64981..46994f25 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/pop_Earnings.prefab @@ -1553,6 +1553,7 @@ GameObject: - component: {fileID: 8128429140534431677} - component: {fileID: 129872631082926031} - component: {fileID: 6211934893408175171} + - component: {fileID: 4008743735582259633} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1622,6 +1623,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5144\u5F1F\u30E1\u30A4\u30F3\u3067\u50CD\u3044\u3066\u3044\u308B\u3088" +--- !u!114 &4008743735582259633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7748622141052424828} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/WorldMapBrotherMain + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8891951417021859415 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs index 8084d148..eaef2969 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Scripts/CityIcon.cs @@ -2,6 +2,7 @@ using System; using UniRx; using UniRx.Triggers; using UnityEngine; +using UnityEngine.UI; namespace MyGame.Scenes.WorldMap.Scripts { @@ -15,6 +16,7 @@ namespace MyGame.Scenes.WorldMap.Scripts { [SerializeField] private Transform cityIcon; [SerializeField] private int cityId; + [SerializeField] private Text cityNameText; private readonly ReactiveProperty cityState = new(); public int CityId => cityId; public IObservable OnClick => @@ -36,6 +38,7 @@ namespace MyGame.Scenes.WorldMap.Scripts lockIcon.SetActive(cityState.Value == Scripts.CityState.Lock); cityIcon.gameObject.SetActive(cityState.Value is Scripts.CityState.Lock or Scripts.CityState.Release); }).AddTo(this); + cityNameText.text = new CityData { id = cityId }.Name; } public void SetState(CityState state) => cityState.Value = state; diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index 0fc0aa6c..8d445509 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -637,8 +637,7 @@ public sealed class CityData { public int id; public string prefabName; - public string Name => name; - public string name; + public string Name => LocalizationManager.GetTranslation($"Item/CityName{id:0000}"); public Transform GetIconPrefab() { diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 88eb338a..be5e379c 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -14202,6 +14202,50 @@ MonoBehaviour: - Material_en/UI/ui_button_SpeechBalloon_EmploymentList_en[ui_button_SpeechBalloon_EmploymentList_en] Flags: 0000000000 Languages_Touch: [] + - Term: UI/WorldMapBrotherMain + TermType: 0 + Description: + Languages: + - "\u5144\u5F1F\u30E1\u30A4\u30F3\u3067\u50CD\u3044\u3066\u3044\u308B\u3088" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/EmployMentLevelUpTips + TermType: 0 + Description: + Languages: + - "\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/EmployMentHeart + TermType: 0 + Description: + Languages: + - "\u65B0\u5E97\u8217\u3067\u30CF\u30FC\u30C8\u3092\u96C6\u3081\u3088\u3046" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: UI/LevelMax + TermType: 0 + Description: + Languages: + - "\u6700\u5927\u30EC\u30D9\u30EB\u306B\u9054\u3057\u307E\u3057\u305F" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index c45dee8b..3adb03a6 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -45,6 +45,9 @@ namespace I2.Loc public static string CookingResultsBulkOrderPerfect { get{ return LocalizationManager.GetTranslation ("UI/CookingResultsBulkOrderPerfect"); } } public static string MissionAllDailyMissionAchieved { get{ return LocalizationManager.GetTranslation ("UI/MissionAllDailyMissionAchieved"); } } public static string RemainingTime { get{ return LocalizationManager.GetTranslation ("UI/RemainingTime"); } } + public static string EmployMentHeart { get{ return LocalizationManager.GetTranslation ("UI/EmployMentHeart"); } } + public static string EmployMentLevelUpTips { get{ return LocalizationManager.GetTranslation ("UI/EmployMentLevelUpTips"); } } + public static string LevelMax { get{ return LocalizationManager.GetTranslation ("UI/LevelMax"); } } } public static class Unit @@ -98,6 +101,9 @@ namespace I2.Loc public const string CookingResultsBulkOrderPerfect = "UI/CookingResultsBulkOrderPerfect"; public const string MissionAllDailyMissionAchieved = "UI/MissionAllDailyMissionAchieved"; public const string RemainingTime = "UI/RemainingTime"; + public const string EmployMentHeart = "UI/EmployMentHeart"; + public const string EmployMentLevelUpTips = "UI/EmployMentLevelUpTips"; + public const string LevelMax = "UI/LevelMax"; } public static class Unit