From e1948b512daae156f7878b665f3e804206ad677f Mon Sep 17 00:00:00 2001 From: kimura Date: Wed, 29 Jun 2022 18:04:57 +0900 Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E8=A8=B3=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/MiniGameNotReleased.unity | 2 +- .../Main/Scripts/ScrollGameLockDialog.cs | 2 +- .../Scripts/ScrollGameWatchVideoDialog.cs | 6 +- .../Scenes/MiniGame/WatchMovieMiniGame.unity | 86 +------------------ popcorn/Assets/Resources/I2Languages.asset | 44 ++++++++++ 5 files changed, 52 insertions(+), 88 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity b/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity index 337917bf..deac8f75 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity @@ -527,7 +527,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB\uFF18\u3067\u89E3\u653E\u3055\u308C\u308B\u3088\n\u7279\u5225\u306A\u30EC\u30B7\u30D4\u3084\u6750\u6599\u304C\u624B\u306B\u5165\u308B\u304B\u3082\u2026\uFF1F" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB{0}\u3067\u89E3\u653E\u3055\u308C\u308B\u3088\n\u7279\u5225\u306A\u30EC\u30B7\u30D4\u3084\u6750\u6599\u304C\u624B\u306B\u5165\u308B\u304B\u3082\u2026\uFF1F" --- !u!222 &575189314 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs index a5e61bbf..ec23ab40 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs @@ -30,7 +30,7 @@ namespace MyGame.Scenes.Main.Scripts }); }).AddTo(this); - messageText.text = string.Format("店舗レベル{0}で解放されるよ\n特別なレシピや材料が手に入るかも…？", Const.ScrollGameAvailableLevel); + messageText.text = string.Format(LocalizationManager.GetTranslation("System/ScrollGameNotReleaseDialog"), Const.ScrollGameAvailableLevel); } public static void ShowDialog(Action onClose = null){ diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs index abeec096..0573cfdf 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ScrollGameWatchVideoDialog.cs @@ -34,15 +34,15 @@ namespace MyGame.Scenes.MiniGame.Scripts watchMovieObject.SetActive(canWatch); waitObject.SetActive(!canWatch); - playCountText.text = $"{count}"; + playCountText.text = string.Format(LocalizationManager.GetTranslation("System/LeftCount"), count.ToString()); var limitTime = gameData.GetScrollGameLimitTime(); if (limitTime.TotalSeconds > 0) { - timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, limitTime.Hours, limitTime.Minutes, limitTime.Seconds); + timeLimitText.text = string.Format(ScriptLocalization.UI.MissionDailyTimeLimit, limitTime.Hours, limitTime.Minutes, limitTime.Seconds); } else { - timeLimitText.text = String.Format(ScriptLocalization.UI.MissionDailyTimeLimit, 0, 0, 0); + timeLimitText.text = string.Format(ScriptLocalization.UI.MissionDailyTimeLimit, 0, 0, 0); } closeButton.OnClickAsObservable().Merge(closeButton2.OnClickAsObservable()).Take(1).Subscribe(_ => diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity b/popcorn/Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity index e01337c5..feae6388 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity @@ -368,7 +368,6 @@ GameObject: - component: {fileID: 62056724} - component: {fileID: 62056727} - component: {fileID: 62056726} - - component: {fileID: 62056725} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -395,45 +394,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -1} m_SizeDelta: {x: 350, y: 70} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &62056725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 62056723} - 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: 1063352196} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &62056726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1295,7 +1255,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 0} + mTarget: {fileID: 2130390881} --- !u!1 &743514211 GameObject: m_ObjectHideFlags: 0 @@ -1360,7 +1320,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: '-' + mTerm: System/ScrollGamePlayLimitMessage mTermSecondary: Font/DFHannotateStdN-W7 PrimaryTermModifier: 0 SecondaryTermModifier: 0 @@ -2200,7 +2160,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} m_Name: m_EditorClassIdentifier: - mTerm: '-' + mTerm: System/ScrollGameMessage mTermSecondary: Font/DFHannotateStdN-W7 PrimaryTermModifier: 0 SecondaryTermModifier: 0 @@ -2386,7 +2346,6 @@ GameObject: - component: {fileID: 2013893993} - component: {fileID: 2013893996} - component: {fileID: 2013893995} - - component: {fileID: 2013893994} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -2413,45 +2372,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -1} m_SizeDelta: {x: 200, y: 70} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2013893994 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013893992} - 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: 1063352196} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &2013893995 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 918d08d3..1f46e4bd 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -13158,6 +13158,50 @@ MonoBehaviour: - Flags: 0000000000 Languages_Touch: [] + - Term: System/ScrollGameNotReleaseDialog + TermType: 0 + Description: + Languages: + - "\u5E97\u8217\u30EC\u30D9\u30EB{0}\u3067\u89E3\u653E\u3055\u308C\u308B\u3088\n\u7279\u5225\u306A\u30EC\u30B7\u30D4\u3084\u6750\u6599\u304C\u624B\u306B\u5165\u308B\u304B\u3082\u2026\uFF1F" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: System/ScrollGamePlayLimitMessage + TermType: 0 + Description: + Languages: + - "\u660E\u65E5\u306B\u306A\u3063\u305F\u3089\u307E\u305F\u904A\u3079\u308B\u3088" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: System/ScrollGameMessage + TermType: 0 + Description: + Languages: + - "\u52D5\u753B\u3092\u898B\u308B\u3068\u6750\u6599\u8ABF\u9054\u304C\u3067\u304D\u307E\u3059\n\u52D5\u753B\u3092\u898B\u3066\u6750\u6599\u8ABF\u9054\u306B\u884C\u304D\u307E\u3059\u304B\uFF1F" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] + - Term: System/LeftCount + TermType: 0 + Description: + Languages: + - "\u3042\u3068{0}\u56DE" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: