From 49062bda5de3b213addb3c34311b6cb730238d78 Mon Sep 17 00:00:00 2001 From: kimura Date: Mon, 27 Jun 2022 13:46:44 +0900 Subject: [PATCH] add scrollgame dialog --- ...leased.unity => MiniGameNotReleased.unity} | 4 +- ...ty.meta => MiniGameNotReleased.unity.meta} | 0 .../Main/Scripts/ScrollGameLockDialog.cs | 41 +++++++++++++++++++ .../Main/Scripts/ScrollGameLockDialog.cs.meta | 3 ++ .../Assets/MyGame/Scripts/FooterManager.cs | 2 +- .../MyGame/Scripts/TransitionManager.cs | 1 + .../ProjectSettings/EditorBuildSettings.asset | 3 ++ 7 files changed, 51 insertions(+), 3 deletions(-) rename popcorn/Assets/MyGame/Scenes/Main/{minigeme_NotReleased.unity => MiniGameNotReleased.unity} (99%) rename popcorn/Assets/MyGame/Scenes/Main/{minigeme_NotReleased.unity.meta => MiniGameNotReleased.unity.meta} (100%) create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs create mode 100644 popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/minigeme_NotReleased.unity b/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity similarity index 99% rename from popcorn/Assets/MyGame/Scenes/Main/minigeme_NotReleased.unity rename to popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity index ac410a09..337917bf 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/minigeme_NotReleased.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity @@ -242,12 +242,12 @@ MonoBehaviour: m_GameObject: {fileID: 360429215} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7ac380b2956543a6a6b17c6150b154c0, type: 3} + m_Script: {fileID: 11500000, guid: f9b7ce7a0eb445e3bd8061a9a9b950ab, type: 3} m_Name: m_EditorClassIdentifier: backgroundAnimator: {fileID: 780755706} closeButton: {fileID: 393391861} - updateMessageText: {fileID: 575189313} + messageText: {fileID: 575189313} --- !u!1 &393391858 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/minigeme_NotReleased.unity.meta b/popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity.meta similarity index 100% rename from popcorn/Assets/MyGame/Scenes/Main/minigeme_NotReleased.unity.meta rename to popcorn/Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity.meta diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs new file mode 100644 index 00000000..a5e61bbf --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs @@ -0,0 +1,41 @@ +using UnityEngine; +using System; +using I2.Loc; +using UniRx; +using UnityEngine.UI; + +namespace MyGame.Scenes.Main.Scripts +{ + public class ScrollGameLockDialog : MonoBehaviour + { + private static readonly string CallbackTag = "MiniGameNotReleasedDialogCallback"; + private static readonly int OpenTrigger = Animator.StringToHash("OpenTrigger"); + private static readonly int CloseTrigger = Animator.StringToHash("CloseTrigger"); + + [SerializeField] private Animator backgroundAnimator; + [SerializeField] private Button closeButton; + [SerializeField] private Text messageText; + + private void Start() + { + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => + { + LocalCacheManager.Load(CallbackTag, null)?.Invoke(); + LocalCacheManager.Remove(CallbackTag); + transform.parent.SetLocalScale(0); + backgroundAnimator.SetTrigger(CloseTrigger); + this.CallWaitForSeconds(.25f, () => + { + TransitionManager.Instance.UnloadScene(GameScenes.MiniGameNotReleased); + }); + }).AddTo(this); + + messageText.text = string.Format("店舗レベル{0}で解放されるよ\n特別なレシピや材料が手に入るかも…？", Const.ScrollGameAvailableLevel); + } + + public static void ShowDialog(Action onClose = null){ + LocalCacheManager.Save(CallbackTag, onClose); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.MiniGameNotReleased); + } + } +} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs.meta b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs.meta new file mode 100644 index 00000000..7afbb8e7 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ScrollGameLockDialog.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f9b7ce7a0eb445e3bd8061a9a9b950ab +timeCreated: 1656304568 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index b6fab1b7..627ee870 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -54,7 +54,7 @@ public class FooterManager : MonoBehaviour .ThrottleFirst(TimeSpan.FromSeconds(.2f)) .Subscribe(_ => { - // dialog + ScrollGameLockDialog.ShowDialog(); }).AddTo(this); } } \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs index 5034329b..b8617fc1 100644 --- a/popcorn/Assets/MyGame/Scripts/TransitionManager.cs +++ b/popcorn/Assets/MyGame/Scripts/TransitionManager.cs @@ -51,6 +51,7 @@ public enum GameScenes CustomizeExplanation, MiniGame, WatchMovieMiniGame, + MiniGameNotReleased } public enum SceneType diff --git a/popcorn/ProjectSettings/EditorBuildSettings.asset b/popcorn/ProjectSettings/EditorBuildSettings.asset index cec746b5..85d31409 100644 --- a/popcorn/ProjectSettings/EditorBuildSettings.asset +++ b/popcorn/ProjectSettings/EditorBuildSettings.asset @@ -143,4 +143,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/MyGame/Scenes/MiniGame/WatchMovieMiniGame.unity guid: e39bbcad90cf4704f9164a3d6d574a76 + - enabled: 1 + path: Assets/MyGame/Scenes/Main/MiniGameNotReleased.unity + guid: 90b87b644a26a22468ecc4e2c51dc9df m_configObjects: {}