tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working pause menu re-worked with exlusive views

Browse Source
This commit is contained in:
Michal Pikulski
2025-10-24 10:41:27 +02:00
parent 7bb905eb6b
commit 1003c3f6ac
14 changed files with 878 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/UI/Cards/CardSystem.prefab
View File

@@ -299,7 +299,7 @@ GameObject:
m_Component:
- component: {fileID: 8855931927481658112}
- component: {fileID: 5244731468946939147}
- component: {fileID: 2860077094930428643}
- component: {fileID: 7848685733999064403}
m_Layer: 5
m_Name: Backback
m_TagString: Untagged
@@ -372,7 +372,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2860077094930428643
--- !u!114 &7848685733999064403
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -381,9 +381,9 @@ MonoBehaviour:
m_GameObject: {fileID: 7564017895147059150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7ea50a695c58944799b4f27a9014301, type: 3}
m_Script: {fileID: 11500000, guid: 494d0aedce9744308499355006071138, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
m_EditorClassIdentifier: AppleHillsScripts::UI.DummyInput
--- !u!1 &8561999612656273135
GameObject:
m_ObjectHideFlags: 0

839
Assets/Resources/Fonts/Æblerup Font/AppleHills01 SDF.asset
View File

File diff suppressed because one or more lines are too long

13
Assets/Scripts/Core/GameManager.cs
View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using AppleHills.Core.Interfaces;
using AppleHills.Core.Settings;
using Bootstrap;
using Input;
using UnityEngine;
namespace Core
@@ -122,8 +123,8 @@ namespace Core
/// <param name="shouldPause">True to pause; false to resume</param>
private void ApplyPause(bool shouldPause)
{
// Example: stop time
Time.timeScale = shouldPause ? 0f : 1f;
// TODO: Do we want to stop time?
// Time.timeScale = shouldPause ? 0f : 1f;
// Notify registered components
foreach (var component in _pausableComponents)
@@ -136,9 +137,17 @@ namespace Core
// Fire events
if (shouldPause)
{
// TODO: Stop input here?
InputManager.Instance.SetInputMode(InputMode.UI);
OnGamePaused?.Invoke();
}
else
{
// TODO: Release input here?
InputManager.Instance.SetInputMode(InputMode.GameAndUI);
OnGameResumed?.Invoke();
}
Logging.Debug($"[GameManager] Game {(shouldPause ? "paused" : "resumed")}. Paused {_pausableComponents.Count} components.");
}

4
Assets/Scripts/Minigames/DivingForPictures/Bubbles/Bubble.cs
View File

@@ -61,8 +61,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return; // Already paused
StopBubbleBehavior();
// Debug log for troubleshooting
@@ -74,8 +72,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
StartBubbleBehavior();
// Debug log for troubleshooting

4
Assets/Scripts/Minigames/DivingForPictures/Bubbles/BubbleSpawner.cs
View File

@@ -81,8 +81,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return; // Already paused
// Stop spawning coroutine
if (_spawnCoroutine != null)
{
@@ -108,8 +106,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
// Restart spawning coroutine
StartSpawningCoroutine();

4
Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs
View File

@@ -804,8 +804,6 @@ namespace Minigames.DivingForPictures
public void DoPause(bool turnOffGameInput = true)
{
if (GameManager.Instance.IsPaused) return; // Already paused
// Pause all registered components
foreach (var component in _pausableComponents)
{
@@ -824,8 +822,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
// Resume all registered components
foreach (var component in _pausableComponents)
{

4
Assets/Scripts/Minigames/DivingForPictures/Obstacles/FloatingObstacle.cs
View File

@@ -137,8 +137,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return; // Already paused
StopObstacleCoroutines();
Logging.Debug($"[FloatingObstacle] Paused obstacle: {name}");
@@ -149,8 +147,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
StartObstacleCoroutines();
Logging.Debug($"[FloatingObstacle] Resumed obstacle: {name}");

5
Assets/Scripts/Minigames/DivingForPictures/Obstacles/ObstacleSpawner.cs
View File

@@ -121,8 +121,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return; // Already paused
// Stop spawning coroutine
if (_spawnCoroutine != null)
{
@@ -151,9 +149,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
// Restart spawning coroutine if not in surfacing mode
if (!_isSurfacing)
{

3
Assets/Scripts/Minigames/DivingForPictures/Player/PlayerController.cs
View File

@@ -286,8 +286,6 @@ namespace Minigames.DivingForPictures.Player
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return;
// If we're being paused, stop any active touch and tap impulse
_isTouchActive = false;
_tapImpulseStrength = 0f;
@@ -300,7 +298,6 @@ namespace Minigames.DivingForPictures.Player
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return;
Logging.Debug("[PlayerController] Resumed");
}
#endregion

4
Assets/Scripts/Minigames/DivingForPictures/Tiles/TrenchTileSpawner.cs
View File

@@ -185,8 +185,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void Pause()
{
if (GameManager.Instance.IsPaused) return; // Already paused
// Stop all active coroutines but save their references
if (_movementCoroutine != null)
{
@@ -220,8 +218,6 @@ namespace Minigames.DivingForPictures
/// </summary>
public void DoResume()
{
if (!GameManager.Instance.IsPaused) return; // Already running
// Restart all necessary coroutines
StartMovementCoroutine();
StartTileDestructionCoroutine();

39
Assets/Scripts/UI/CardSystem/BackpackInput.cs
View File

@@ -1,39 +0,0 @@
using UnityEngine;
namespace UI.CardSystem
{
public class BackpackInput : MonoBehaviour, ITouchInputConsumer
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
}
public void OnTap(Vector2 position)
{
return;
}
public void OnHoldStart(Vector2 position)
{
return;
}
public void OnHoldMove(Vector2 position)
{
return;
}
public void OnHoldEnd(Vector2 position)
{
return;
}
}
}

2
Assets/Scripts/UI/CardSystem/BackpackInput.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: e7ea50a695c58944799b4f27a9014301

16
Assets/Scripts/UI/CardSystem/CardAlbumUI.cs
View File

@@ -44,9 +44,6 @@ namespace UI.CardSystem
backpackButton.onClick.AddListener(OnBackpackButtonClicked);
}
// Initially show only the backpack icon
ShowOnlyBackpackIcon();
// Hide notification dot initially
if (boosterNotificationDot != null)
boosterNotificationDot.gameObject.SetActive(false);
@@ -57,6 +54,9 @@ namespace UI.CardSystem
private void InitializePostBoot()
{
// Initially show only the backpack icon
ShowOnlyBackpackIcon();
// Initialize pages and hide them
InitializePages();
}
@@ -142,10 +142,6 @@ namespace UI.CardSystem
if (notificationSound != null)
notificationSound.Play();
// Eat input so the characters don't walk around
var backpackInput = backpackIcon.gameObject.GetComponentInParent<BackpackInput>();
InputManager.Instance.RegisterOverrideConsumer(backpackInput);
PageController.PushPage(mainMenuPage);
// Clear notification for unseen cards when opening menu
@@ -159,6 +155,8 @@ namespace UI.CardSystem
{
backpackButton.gameObject.SetActive(false);
}
GameManager.Instance.RequestPause(this);
}
/// <summary>
@@ -170,8 +168,6 @@ namespace UI.CardSystem
if (newPage == null)
{
ShowOnlyBackpackIcon();
var backpackInput = backpackIcon.gameObject.GetComponentInParent<BackpackInput>();
InputManager.Instance.UnregisterOverrideConsumer(backpackInput);
}
else
{
@@ -225,6 +221,8 @@ namespace UI.CardSystem
boosterNotificationDot.gameObject.SetActive(hasBooters || _hasUnseenCards);
}
}
GameManager.Instance.ReleasePause(this);
}
/// <summary>

45
Assets/Scripts/UI/PauseMenu.cs
View File

@@ -12,7 +12,6 @@ namespace UI
public class PauseMenu : UIPage
{
private static PauseMenu _instance;
private static bool _isQuitting;
/// <summary>
/// Singleton instance of the PauseMenu. No longer creates an instance if one doesn't exist.
@@ -65,18 +64,13 @@ namespace UI
}
}
void OnApplicationQuit()
{
_isQuitting = true;
}
/// <summary>
/// Sets the pause menu game object active or inactive based on the current level
/// </summary>
/// <param name="levelName">The name of the level/scene</param>
public void SetPauseMenuByLevel(string levelName)
{
HidePauseMenu(false);
HidePauseMenu();
// TODO: Implement level-based pause menu visibility logic if needed
/*if (string.IsNullOrEmpty(levelName))
return;
@@ -94,7 +88,6 @@ namespace UI
/// </summary>
public void ShowPauseMenu()
{
if (GameManager.Instance.IsPaused) return;
if (UIPageController.Instance != null)
{
UIPageController.Instance.PushPage(this);
@@ -119,7 +112,7 @@ namespace UI
/// <summary>
/// Hides the pause menu and shows the pause button. Sets input mode to Game.
/// </summary>
public void HidePauseMenu(bool resetInput = true)
public void HidePauseMenu()
{
if (!GameManager.Instance.IsPaused)
{
@@ -139,7 +132,7 @@ namespace UI
pauseMenuPanel.SetActive(false);
if (pauseButton != null)
pauseButton.SetActive(true);
EndPauseSideEffects(resetInput);
EndPauseSideEffects();
if (canvasGroup != null)
{
canvasGroup.alpha = 0f;
@@ -161,15 +154,13 @@ namespace UI
private void BeginPauseSideEffects()
{
if (pauseButton != null) pauseButton.SetActive(false);
InputManager.Instance.SetInputMode(InputMode.UI);
GameManager.Instance.RequestPause(this);;
GameManager.Instance.RequestPause(this);
Logging.Debug("[PauseMenu] Game Paused");
}
private void EndPauseSideEffects(bool invokeEvent)
private void EndPauseSideEffects()
{
if (pauseButton != null) pauseButton.SetActive(true);
InputManager.Instance.SetInputMode(InputMode.GameAndUI);
GameManager.Instance.ReleasePause(this);
Logging.Debug("[PauseMenu] Game Resumed");
}
@@ -178,6 +169,8 @@ namespace UI
{
// Ensure the panel root is active
if (pauseMenuPanel != null) pauseMenuPanel.SetActive(true);
// Pause side effects should run immediately (hide button, set input mode, etc.).
// The tween itself must run in unscaled time so it still animates while the game is paused.
BeginPauseSideEffects();
if (canvasGroup != null)
@@ -185,7 +178,16 @@ namespace UI
canvasGroup.interactable = true;
canvasGroup.blocksRaycasts = true;
canvasGroup.alpha = 0f;
Tween.Value(0f, 1f, v => canvasGroup.alpha = v, transitionDuration, 0f, Tween.EaseInOut, Tween.LoopType.None, null, onComplete);
// pass obeyTimescale = false so this tween runs even when Time.timeScale == 0
Tween.Value(0f, 1f, (v) =>
{
Logging.Debug($"[PauseMenu] Tweening pause menu alpha: {v}");
canvasGroup.alpha = v;
}, transitionDuration, 0f, Tween.EaseInOut, Tween.LoopType.None, null, () =>
{
Logging.Debug("[PauseMenu] Finished tweening pause menu in.");
onComplete?.Invoke();
}, false);
}
else
{
@@ -199,16 +201,17 @@ namespace UI
{
canvasGroup.interactable = false;
canvasGroup.blocksRaycasts = false;
// Run out-tween in unscaled time as well so the fade completes while paused.
Tween.Value(canvasGroup.alpha, 0f, v => canvasGroup.alpha = v, transitionDuration, 0f, Tween.EaseInOut, Tween.LoopType.None, null, () =>
{
EndPauseSideEffects(true);
if (pauseMenuPanel != null) pauseMenuPanel.SetActive(false);
onComplete?.Invoke();
});
{
EndPauseSideEffects();
if (pauseMenuPanel != null) pauseMenuPanel.SetActive(false);
onComplete?.Invoke();
}, false);
}
else
{
EndPauseSideEffects(true);
EndPauseSideEffects();
if (pauseMenuPanel != null) pauseMenuPanel.SetActive(false);
onComplete?.Invoke();
}