diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 45b89f1c..e495b6bc 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -53,16 +53,19 @@ public class CookingResult : MonoBehaviour // 各種ボタン押下後、獲得処理 if (viewType == ProductViewType.Default) { + Market.Instance.IsPause.Value = true; centerOkButton.OnClickAsObservable().Subscribe(_ => { // 獲得、遷移 AddStock(productData, rarityData.Rarity); + Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); leftOkButton.OnClickAsObservable().Subscribe(_ => { // 獲得、遷移 AddStock(productData); + Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(GameScenes.Main); }).AddTo(this); } diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity index 11469856..bd483cfd 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/DebugOption.unity @@ -1657,6 +1657,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8dee1e67eb6fa45268e20133acc68259, type: 3} +--- !u!1 &1711540513 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1418391247242195742, guid: 8dee1e67eb6fa45268e20133acc68259, + type: 3} + m_PrefabInstance: {fileID: 1711540512} + m_PrefabAsset: {fileID: 0} +--- !u!81 &1711540514 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1711540513} + m_Enabled: 1 --- !u!1001 &1767352103 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index 6de910fc..e01fca64 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -30,6 +30,7 @@ public class DebugOptionManager : MonoBehaviour { TransitionManager.Instance.LoadScene(GameScenes.Main); } + SoundManager.Instance.StopBGM(); var prevScene = LocalCacheManager.Load(DebugPrevSceneTag); resetButton.OnClickAsObservable().Subscribe(_ => { @@ -37,9 +38,11 @@ public class DebugOptionManager : MonoBehaviour TransitionManager.Instance.LoadScene(GameScenes.DebugOption); }).AddTo(this); + Market.Instance.IsPause.Value = true; backButton.OnClickAsObservable().Subscribe(_ => { GameDataManager.SaveGameData(); + Market.Instance.IsPause.Value = false; TransitionManager.Instance.LoadScene(prevScene); });