diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 98854621..8f2b1f7c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -531,6 +531,56 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} +--- !u!114 &55686910 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &55686911 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + m_PrefabInstance: {fileID: 55686909} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &70687868 +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: 55686911} +--- !u!114 &729722332 +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: 55686910} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 9c1b88f3..79f3d5c1 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1836,6 +1836,7 @@ GameObject: - component: {fileID: 2660639677480706696} - component: {fileID: 2660639677480706702} - component: {fileID: 2660639677480706697} + - component: {fileID: 5515268777843647333} m_Layer: 5 m_Name: Text_time m_TagString: Untagged @@ -1903,6 +1904,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u66F4\u65B0\u307E\u3067\uFF1A18\u6642\u959355\u520657\u79D2" +--- !u!114 &5515268777843647333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2660639677480706699} + 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 &2660639677505249334 GameObject: m_ObjectHideFlags: 0 @@ -6754,6 +6794,11 @@ PrefabInstance: propertyPath: m_Name value: detail_Mission_daily objectReference: {fileID: 0} + - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5efec1563da076e43b72d4631cb86748, type: 3} --- !u!224 &5306379771047912363 stripped diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab index 25fc64f8..9a1b7424 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab @@ -1197,6 +1197,7 @@ GameObject: - component: {fileID: 1628107520295442143} - component: {fileID: 1628107520295442137} - component: {fileID: 1628107520295442136} + - component: {fileID: 3865786429578348080} m_Layer: 5 m_Name: Text_detail m_TagString: Untagged @@ -1264,6 +1265,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u7C92\u3092\u53CE\u7A6B\u3057\u3088\u3046" +--- !u!114 &3865786429578348080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1628107520295442142} + 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 &1628107520490624917 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab index f7df74d5..166a1082 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission_daily.prefab @@ -197,6 +197,7 @@ GameObject: - component: {fileID: 1004344214501541983} - component: {fileID: 4326752688744740501} - component: {fileID: 1565904717471002110} + - component: {fileID: 8610769905762339287} m_Layer: 5 m_Name: Text_detail m_TagString: Untagged @@ -264,6 +265,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210" +--- !u!114 &8610769905762339287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2045890951522121715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/MissionAllDailyMissionAchieved + 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 &2047377427564795143 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index eb0d3cdf..b420393f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using I2.Loc; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -10,7 +11,6 @@ public class MissionManager : MonoBehaviour public static readonly string MissionDataTag = "MissionData"; private static readonly string CallbackTag = "MissionManagerCallback"; private static readonly string AchievedCallbackTag = "MissionManagerAchievedCallback"; - private static readonly string TimeFormat = "更新まで：{0}時間{1}分{2}秒"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); private static readonly int dailyMissionCompleteRewardCoin = 50; @@ -52,18 +52,18 @@ public class MissionManager : MonoBehaviour var limitTime = gameData.GetDailyMissionLimitTime(); if (limitTime.TotalSeconds > 0) { - timeLimitText.text = String.Format(TimeFormat, limitTime.Hours, limitTime.Minutes, limitTime.Seconds); + timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, limitTime.Hours, limitTime.Minutes, limitTime.Seconds); } else { - timeLimitText.text = String.Format(TimeFormat, 0, 0, 0); + timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, 0, 0, 0); } Observable.Timer(TimeSpan.Zero, TimeSpan.FromSeconds(1f)) .Select(x => gameData.GetDailyMissionLimitTime()) .TakeWhile(x => x.TotalSeconds > 0) .Subscribe(x => { - timeLimitText.text = String.Format(TimeFormat, x.Hours, x.Minutes, x.Seconds); + timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, x.Hours, x.Minutes, x.Seconds); }).AddTo(this); // ミッション読み込み diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 212b3f40..87f85b91 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -283,6 +283,22 @@ MonoBehaviour: - Flags: 0000 Languages_Touch: [] + - Term: UI/MissionAllDailyMissionAchieved + TermType: 0 + Description: + Languages: + - "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u5168\u3066\u5B8C\u4E86\u3067\u9054\u6210" + - + Flags: 0000 + Languages_Touch: [] + - Term: UI/MissionDailyTimeLimit + TermType: 0 + Description: + Languages: + - "\u66F4\u65B0\u307E\u3067\uFF1A{0}\u6642\u9593{1}\u5206{2}\u79D2" + - + Flags: 0000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 1 mTerm_AppName: diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index 18640c29..57949e76 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -29,6 +29,7 @@ namespace I2.Loc public static string ManagementTankEmpty { get{ return LocalizationManager.GetTranslation ("UI/ManagementTankEmpty"); } } public static string ManagementTankQuantityUnit { get{ return LocalizationManager.GetTranslation ("UI/ManagementTankQuantityUnit"); } } public static string ManagementTankTankNumber { get{ return LocalizationManager.GetTranslation ("UI/ManagementTankTankNumber"); } } + public static string MissionDailyTimeLimit { get{ return LocalizationManager.GetTranslation ("UI/MissionDailyTimeLimit"); } } } } @@ -59,6 +60,7 @@ namespace I2.Loc public const string ManagementTankEmpty = "UI/ManagementTankEmpty"; public const string ManagementTankQuantityUnit = "UI/ManagementTankQuantityUnit"; public const string ManagementTankTankNumber = "UI/ManagementTankTankNumber"; + public const string MissionDailyTimeLimit = "UI/MissionDailyTimeLimit"; } } } \ No newline at end of file