From a9426fc30d404abb54430adf8f4a82fe9e4af47a Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 5 Dec 2022 09:42:00 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B5=E3=83=B3=E3=83=95=E3=83=A9=E3=83=B3?= =?UTF-8?q?=E3=82=B7=E3=82=B9=E3=82=B3=E9=83=BD=E5=B8=82=E5=BA=97=E8=88=97?= =?UTF-8?q?=E3=83=AC=E3=83=99=E3=83=AB2=E3=81=AE=E3=81=A8=E3=81=8D?= =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87=E3=83=BC=E3=83=88=E5=BE=85?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=AD=E3=83=9D=E3=83=83=E3=83=97=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Main/Scripts/UpdateDialog.cs | 21 ++++++++++++++++++- popcorn/Assets/MyGame/Scripts/Const.cs | 1 + .../Assets/MyGame/Scripts/HeaderManager.cs | 3 ++- popcorn/Assets/Resources/I2Languages.asset | 11 ++++++++++ popcorn/Assets/ScriptLocalization.cs | 2 ++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs index 927f123e..2d8c5faf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/UpdateDialog.cs @@ -6,9 +6,15 @@ using UnityEngine.UI; namespace MyGame.Scenes.Main.Scripts { + public enum DialogType + { + MaxShopLevel, + MaxCityShopLevel + } public class UpdateDialog : MonoBehaviour { private static readonly string CallbackTag = "UpdateDialogCallback"; + private static readonly string DialogTypeTag = "UpdateDialogType"; private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); private static readonly GameScenes SceneName = GameScenes.Update; @@ -19,6 +25,8 @@ namespace MyGame.Scenes.Main.Scripts private void Start() { + var dialogType = LocalCacheManager.Load(DialogTypeTag); + LocalCacheManager.Remove(DialogTypeTag); closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Load(CallbackTag, null)?.Invoke(); @@ -31,12 +39,23 @@ namespace MyGame.Scenes.Main.Scripts }); }).AddTo(this); - updateMessageText.text = string.Format(ScriptLocalization.System.LevelUpdateComingSoon, Const.MaxShopLevel + 1); + updateMessageText.text = dialogType switch + { + DialogType.MaxShopLevel => string.Format(ScriptLocalization.System.LevelUpdateComingSoon, Const.MaxShopLevel + 1), + DialogType.MaxCityShopLevel => ScriptLocalization.System.CityLevelUpComingSoon, + // _ => throw new ArgumentOutOfRangeException() + }; } public static void ShowDialog(Action onClose = null){ LocalCacheManager.Save(CallbackTag, onClose); TransitionManager.Instance.LoadSceneAdditive(SceneName); } + + public static void ShowCityDialog(Action onClose = null){ + LocalCacheManager.Save(CallbackTag, onClose); + LocalCacheManager.Save(DialogTypeTag, DialogType.MaxCityShopLevel); + TransitionManager.Instance.LoadSceneAdditive(SceneName); + } } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index c14bd03e..d7ff3a4c 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -38,6 +38,7 @@ public static class Const { public static readonly int ScrollGameAvailableLevel = 8; public static readonly int WorldMapTutorialScriptId = 21; public static readonly int WorldTripLimitScriptId = 25; + public static readonly (int cityId,int cityLevel) MaxCityLevel = (2, 2); // tag public static readonly string GameDataTag = "GameData"; diff --git a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs index 59816c64..c60b3781 100644 --- a/popcorn/Assets/MyGame/Scripts/HeaderManager.cs +++ b/popcorn/Assets/MyGame/Scripts/HeaderManager.cs @@ -91,7 +91,8 @@ public class HeaderManager : MonoBehaviour if (levelUpScripts.Count <= 0) return; BrotherConversation.ShowDialog(levelUpScripts, () => { - // 既読処理（必要なら + if (cityGameData.ViewedShopLevel < Const.MaxCityLevel.cityLevel) return; + UpdateDialog.ShowCityDialog(); }); }).AddTo(this); diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 2d7af088..8cabf92c 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -14831,6 +14831,17 @@ MonoBehaviour: - Flags: 0000000000 Languages_Touch: [] + - Term: System/CityLevelUpComingSoon + TermType: 0 + Description: + Languages: + - "\u7D9A\u304D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" + - + - + - + - + Flags: 0000000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: diff --git a/popcorn/Assets/ScriptLocalization.cs b/popcorn/Assets/ScriptLocalization.cs index 3adb03a6..f559aa23 100644 --- a/popcorn/Assets/ScriptLocalization.cs +++ b/popcorn/Assets/ScriptLocalization.cs @@ -21,6 +21,7 @@ namespace I2.Loc 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 string CityLevelUpComingSoon { get{ return LocalizationManager.GetTranslation ("System/CityLevelUpComingSoon"); } } } public static class UI @@ -77,6 +78,7 @@ namespace I2.Loc public const string PerfectPopcornMessage = "System/PerfectPopcornMessage"; public const string VipCustomerMessage = "System/VipCustomerMessage"; public const string LevelUpdateComingSoon = "System/LevelUpdateComingSoon"; + public const string CityLevelUpComingSoon = "System/CityLevelUpComingSoon"; } public static class UI