From 89f2cef0637b1597d28efbed68174f47e6453fd3 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 28 Jul 2022 13:13:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=94=E3=83=83=E3=83=81=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/MiniGame/Scripts/GameManager.cs | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index d2c0ea82..4473bf86 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -33,6 +33,9 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private GameObject readyObject; [SerializeField] private GameObject tutorialPopupObject; [SerializeField] private float resultWaitTime = 1f; + [SerializeField] private float normalPitch = 1.1f; + [SerializeField] private float hardPitch = 1.2f; + [SerializeField] private float extraPitch = 1.4f; #if UNITY_EDITOR [SerializeField] private bool isDebug; #endif @@ -159,8 +162,11 @@ namespace MyGame.Scenes.MiniGame.Scripts SoundManager.Instance.PlaySE("se_minigame_Start"); break; case GameState.Success: - SoundManager.Instance.PlaySE("se_minigame_End"); - player.Result(); + SoundManager.Instance.PlaySE("se_minigame_End", () => + { + SoundManager.Instance.ChangePitchBGM(1f); + player.Result(); + }); break; case GameState.Failure: break; @@ -210,6 +216,15 @@ namespace MyGame.Scenes.MiniGame.Scripts { bgManager.SetSky(x); player.SetSpeed(x); + var pitch = x switch + { + ScrollGameDifficulty.Easy => 1f, + ScrollGameDifficulty.Normal => normalPitch, + ScrollGameDifficulty.Hard => hardPitch, + ScrollGameDifficulty.Extra => extraPitch, + _ => throw new ArgumentOutOfRangeException(nameof(x), x, null) + }; + SoundManager.Instance.ChangePitchBGM(pitch); }).AddTo(this); player.OnEndHit.Subscribe(_ => @@ -217,13 +232,6 @@ namespace MyGame.Scenes.MiniGame.Scripts state.Value = GameState.Success; }).AddTo(this); - player.CurrentSpeedMultiply.SkipLatestValueOnSubscribe() - .Where(_ => state.Value == GameState.Play) - .Subscribe(x => - { - SoundManager.Instance.ChangePitchBGM(x); - }).AddTo(this); - player.OnHitItem.Where(_ => state.Value == GameState.Play).Subscribe(x => { if (!x.TryGetComponent(out var item)) @@ -272,6 +280,7 @@ namespace MyGame.Scenes.MiniGame.Scripts { case StageItem.Type.Obstacle: player.Hit(closestPoint); + SoundManager.Instance.ChangePitchBGM(0f); break; case StageItem.Type.Item1: break; From 3f6f254e76e4662a85f902425a8c7cda7a5e6e2c Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 28 Jul 2022 13:16:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=94?= =?UTF-8?q?=E3=83=83=E3=83=81=E8=A8=AD=E5=AE=9A=E3=82=92=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=AB=E8=A1=A8=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs index 4473bf86..e6e87b36 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/GameManager.cs @@ -33,6 +33,7 @@ namespace MyGame.Scenes.MiniGame.Scripts [SerializeField] private GameObject readyObject; [SerializeField] private GameObject tutorialPopupObject; [SerializeField] private float resultWaitTime = 1f; + [SerializeField, ReadOnly] private float easyPitch = 1f; [SerializeField] private float normalPitch = 1.1f; [SerializeField] private float hardPitch = 1.2f; [SerializeField] private float extraPitch = 1.4f; @@ -218,7 +219,7 @@ namespace MyGame.Scenes.MiniGame.Scripts player.SetSpeed(x); var pitch = x switch { - ScrollGameDifficulty.Easy => 1f, + ScrollGameDifficulty.Easy => easyPitch, ScrollGameDifficulty.Normal => normalPitch, ScrollGameDifficulty.Hard => hardPitch, ScrollGameDifficulty.Extra => extraPitch,