From 280e0bb2924a33168587b692c9b16ac1d5ee1700 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 15 Apr 2022 20:28:53 +0900 Subject: [PATCH] =?UTF-8?q?update=E5=BE=85=E3=81=A3=E3=81=A6=E3=81=AD?= =?UTF-8?q?=E3=82=92Format=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/Scripts/UpdateDialog.cs | 4 ++ .../Assets/MyGame/Scenes/Main/update.unity | 56 +------------------ popcorn/Assets/Resources/I2Languages.asset | 6 +- popcorn/Assets/ScriptLocalization.cs | 2 + 4 files changed, 11 insertions(+), 57 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs index 6578cf1b..a9711231 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs @@ -1,4 +1,5 @@ using System; +using I2.Loc; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -13,6 +14,7 @@ namespace MyGame.Scenes.Main.Scripts [SerializeField] private Animator backgroundAnimator; [SerializeField] private Button closeButton; + [SerializeField] private Text updateMessageText; private void Start() { @@ -27,6 +29,8 @@ namespace MyGame.Scenes.Main.Scripts TransitionManager.Instance.UnloadScene(GameScenes.Update); }); }).AddTo(this); + + updateMessageText.text = string.Format(ScriptLocalization.System.LevelUpdateComingSoon, Const.MaxShopLevel + 1); } public static void ShowDialog(Action onClose = null){ diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 52674035..24d8526a 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -387,6 +387,7 @@ MonoBehaviour: m_EditorClassIdentifier: backgroundAnimator: {fileID: 780755706} closeButton: {fileID: 393391861} + updateMessageText: {fileID: 575189313} --- !u!1 &393391858 GameObject: m_ObjectHideFlags: 0 @@ -608,7 +609,6 @@ GameObject: - component: {fileID: 575189312} - component: {fileID: 575189314} - component: {fileID: 575189313} - - component: {fileID: 575189315} m_Layer: 5 m_Name: explanation m_TagString: Untagged @@ -667,7 +667,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB17\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB{0}\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" --- !u!222 &575189314 CanvasRenderer: m_ObjectHideFlags: 0 @@ -676,45 +676,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 575189311} m_CullTransparentMesh: 0 ---- !u!114 &575189315 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575189311} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTerm: System/LevelUpdateComingSoon - 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: 713287033} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &617833401 GameObject: m_ObjectHideFlags: 0 @@ -798,19 +759,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 617833401} m_CullTransparentMesh: 0 ---- !u!114 &713287033 -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: 575189313} --- !u!1 &764676370 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index b88344ff..452cf116 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1543,9 +1543,9 @@ MonoBehaviour: TermType: 0 Description: Languages: - - "\u5E97\u8217\u30EC\u30D9\u30EB17\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" - - "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u523017\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01" - - "\u5E97\u92EA\u7B49\u7D1A\u5728\u9054\u523017\u7D1A\u4EE5\u5F8C\u6B61\u8FCE\u60A8\u7B49\u5F85\u6211\u5011\u7684\u904A\u6232\u5167\u5BB9\u66F4\u65B0\uFF01" + - "\u5E97\u8217\u30EC\u30D9\u30EB{0}\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" + - "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u5230{0}\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01" + - "\u5E97\u92EA\u7B49\u7D1A\u5728\u9054\u5230{0}\u7D1A\u4EE5\u5F8C\u6B61\u8FCE\u60A8\u7B49\u5F85\u6211\u5011\u7684\u904A\u6232\u5167\u5BB9\u66F4\u65B0\uFF01" - LevelUpdateComingSoon Flags: 00000000 Languages_Touch: [] diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index db10e84d..5b0e1531 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -19,6 +19,7 @@ namespace I2.Loc public static string IncreaseCustomerMessage { get{ return LocalizationManager.GetTranslation ("System/IncreaseCustomerMessage"); } } public static string PerfectPopcornMessage { get{ return LocalizationManager.GetTranslation ("System/PerfectPopcornMessage"); } } public static string VipCustomerMessage { get{ return LocalizationManager.GetTranslation ("System/VipCustomerMessage"); } } + public static string LevelUpdateComingSoon { get{ return LocalizationManager.GetTranslation ("System/LevelUpdateComingSoon"); } } } public static class UI @@ -70,6 +71,7 @@ namespace I2.Loc public const string IncreaseCustomerMessage = "System/IncreaseCustomerMessage"; public const string PerfectPopcornMessage = "System/PerfectPopcornMessage"; public const string VipCustomerMessage = "System/VipCustomerMessage"; + public const string LevelUpdateComingSoon = "System/LevelUpdateComingSoon"; } public static class UI