All working but codex.

This commit is contained in:
2026-05-13 14:20:25 +01:00
parent c203f836b1
commit 602e1ec0d3
49 changed files with 186784 additions and 62239 deletions

View File

@@ -159,6 +159,8 @@ namespace BriarQueen.Framework.Managers.Interaction
if (_currentHovered != null)
ClearHover().Forget();
Debug.Log($"[InteractManager] SetExclusiveRaycaster set to {raycaster.gameObject.name}.");
}
/// <summary>
@@ -170,6 +172,8 @@ namespace BriarQueen.Framework.Managers.Interaction
if (_currentHovered != null)
ClearHover().Forget();
Debug.Log($"[InteractManager] Cleared exclusive raycaster.");
}
public void Initialize()
@@ -375,7 +379,6 @@ namespace BriarQueen.Framework.Managers.Interaction
return;
if (_currentHovered != null)
{
try
{
await _currentHovered.ExitHover();
@@ -383,19 +386,20 @@ namespace BriarQueen.Framework.Managers.Interaction
catch
{
}
}
_currentHovered = next;
_eventCoordinator.Publish(new HoverInteractableChangedEvent(_currentHovered));
_eventCoordinator.Publish(
new HoverInteractableChangedEvent(_currentHovered));
var cursor = _currentHovered?.ApplicableCursorStyle
?? UICursorService.CursorStyle.Default;
var cursor =
_currentHovered?.ApplicableCursorStyle
?? UICursorService.CursorStyle.Default;
_eventCoordinator.Publish(new CursorStyleChangeEvent(cursor));
_eventCoordinator.Publish(
new CursorStyleChangeEvent(cursor));
if (_currentHovered != null)
{
try
{
await _currentHovered.EnterHover();
@@ -403,7 +407,6 @@ namespace BriarQueen.Framework.Managers.Interaction
catch
{
}
}
}
private async UniTask ClearHover()
@@ -438,7 +441,6 @@ namespace BriarQueen.Framework.Managers.Interaction
return;
_currentHovered.OnInteract(_selectedItem).Forget();
}
private void OnRightClickReceived(OnRightClickEvent obj)

View File

@@ -36,6 +36,8 @@ namespace BriarQueen.Framework.Managers.Levels
private BaseLevel _currentLevel;
public bool Initialized { get; private set; }
public BaseLevel CurrentLevel => _currentLevel;
[Inject]
public LevelManager(

View File

@@ -253,8 +253,6 @@ namespace BriarQueen.Framework.Managers.Player
}
}
_tutorialService.DisplayTutorial(TutorialPopupID.CodexKeyboard);
_eventCoordinator.PublishImmediate(new RequestGameSaveEvent());
_eventCoordinator.Publish(new CodexChangedEvent(entry.EntryType));
}
@@ -437,6 +435,8 @@ namespace BriarQueen.Framework.Managers.Player
Debug.Log($"[PlayerManager] Final InventoryData count = {save.InventoryData.Count}");
save.CodexUnlocked = CodexUnlocked();
save.DiscoveredCodexEntries ??= new List<CodexSaveData>();
save.DiscoveredCodexEntries.Clear();

View File

@@ -12,6 +12,7 @@ using BriarQueen.Framework.Managers.UI.Events;
using BriarQueen.Framework.Services.Settings;
using Cysharp.Threading.Tasks;
using UnityEngine;
using UnityEngine.UI;
using VContainer;
namespace BriarQueen.Framework.Managers.UI