Aleanni/A-Fairytale-Gone-Bad-Briar-Queen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor identifiers and add subtitle UI

Browse Source
This commit is contained in:
Ryan Macham
2026-05-17 11:56:08 +01:00
parent 3174079e37
commit 9f9ef72390
25 changed files with 276 additions and 6871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Assets/Scripts/Game/Cinematics/BaseCinematic.cs
View File

@@ -97,8 +97,8 @@ namespace BriarQueen.Game.Cinematics
private Sequence _skipTextSequence;
protected EventCoordinator EventCoordinator;
protected InputManager InputManager;
protected EventCoordinator _eventCoordinator;
protected InputManager _inputManager;
protected virtual void Awake()
{
@@ -116,7 +116,7 @@ namespace BriarQueen.Game.Cinematics
{
if (!_isPlaying) return;
if (!_allowKeyboardEscapeSkipFallback) return;
if (InputManager != null) return;
if (_inputManager != null) return;
var kb = Keyboard.current;
if (kb != null && kb.escapeKey.wasPressedThisFrame)
@@ -247,14 +247,14 @@ namespace BriarQueen.Game.Cinematics
protected virtual void BindSkipAction()
{
if (InputManager == null)
if (_inputManager == null)
return;
InputManager.BindPauseForSkip(OnSkipPerformed);
_inputManager.BindPauseForSkip(OnSkipPerformed);
if (_skipText != null)
{
var inputType = InputManager.DeviceInputType;
var inputType = _inputManager.DeviceInputType;
switch (inputType)
{
case DeviceInputType.KeyboardAndMouse:
@@ -278,10 +278,10 @@ namespace BriarQueen.Game.Cinematics
protected virtual void UnbindSkipAction()
{
if (InputManager == null)
if (_inputManager == null)
return;
InputManager.ResetPauseBind(OnSkipPerformed);
_inputManager.ResetPauseBind(OnSkipPerformed);
}
private void OnSkipPerformed(InputAction.CallbackContext _)
@@ -535,7 +535,7 @@ namespace BriarQueen.Game.Cinematics
{
StopSkipTextTween();
if (EventCoordinator != null)
if (_eventCoordinator != null)
{
if (_cinematicCanvasGroup != null)
{
@@ -544,7 +544,7 @@ namespace BriarQueen.Game.Cinematics
_cinematicCanvasGroup.alpha = 1f;
}
EventCoordinator.PublishImmediate(new FadeEvent(false, 1f));
_eventCoordinator.PublishImmediate(new FadeEvent(false, 1f));
return;
}
@@ -679,8 +679,8 @@ namespace BriarQueen.Game.Cinematics
[Inject]
public void Construct(EventCoordinator eventCoordinator, InputManager inputManager)
{
EventCoordinator = eventCoordinator;
InputManager = inputManager;
_eventCoordinator = eventCoordinator;
_inputManager = inputManager;
}
}
}