toine/GuildTycoon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mise à jour signale du panneau

Browse source
This commit is contained in:
mrtoine 2025-10-10 09:21:12 +02:00
parent 016c834f21
commit 2370cb670d
31 changed files with 397 additions and 1611 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Assets/_/Features/Decor/Runtime/Decor.Runtime.asmdef
View file

@ -5,7 +5,8 @@
"GUID:2ca720bbf8aa349608caa5ce4acaa603",
"GUID:d01b71ecbce444a299cc1623f29e9d35",
"GUID:4a640bb60ad60478bba0cc41f9b80929",
"GUID:f5d0434d9e8c34eb1a16f4c57b172b85"
"GUID:f5d0434d9e8c34eb1a16f4c57b172b85",
"GUID:239153993e9574192a1980e14075369e"
],
"includePlatforms": [],
"excludePlatforms": [],

60
Assets/_/Features/Decor/Runtime/QuestSign.cs
View file

@ -1,4 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Core.Runtime;
using EventSystem.Runtime;
using Player.Runtime;
using Quests.Runtime;
using UnityEngine;
namespace Decor.Runtime
{
@ -6,14 +13,63 @@ namespace Decor.Runtime
{
#region private & protected
[SerializeField] GameObject _parchment;
int _quests;
PlayerClass _player;
#endregion
#region Unity API
void Awake()
{
_player = GetFact<PlayerClass>(GameManager.Instance.Profile);
}
void Start()
{
//UpdateParchmentState();
Info($"<color=yellow>Il y a actuellement {_quests} quêtes affichés sur le Panneau</color>");
}
void Update()
{
UpdateParchmentState();
}
#endregion
#region Main Methods
//
#endregion
#region Utils
void UpdateParchmentState()
{
List<QuestTemplate> availableTemplates = QuestManager.Instance.GetAvailableQuests(_player.GuildLevel);
var allPossibleQuests = QuestManager.Instance.GetAvailableQuests(_player.GuildLevel);
// 2. Quêtes déjà démarrées (actives OU complétées)
var startedQuests = QuestManager.Instance.ActiveQuests
.Concat(QuestManager.Instance.CompletedQuests)
.ToList();
// 3. Quêtes vraiment disponibles = possibles - déjà démarrées
bool hasTrulyAvailableQuests = allPossibleQuests
.Any(possibleQuest =>
!startedQuests.Any(startedQuest =>
startedQuest.Name == possibleQuest.data.Name
)
);
_parchment.SetActive(hasTrulyAvailableQuests);
Info($"<color=green>Il y a actuellement {hasTrulyAvailableQuests} disponibles</color>");
}
#endregion
}
}

6
Assets/_/Features/EventSystem/Runtime/QuestSignals.cs
View file

@ -7,6 +7,7 @@ namespace EventSystem.Runtime
{
public static event Action<QuestClass> OnInfoQuestPanel;
public static event Action OnRefresh;
public static event Action OnNewQuestRegistered;
public static void RaiseInfoQuestPanel(QuestClass questClass)
{
@ -17,5 +18,10 @@ namespace EventSystem.Runtime
{
OnRefresh?.Invoke();
}
public static void RaiseNewQuestRegistered()
{
OnNewQuestRegistered?.Invoke();
}
}
}

18
Assets/_/Features/Quests/Runtime/QuestManager.cs
View file

@ -23,6 +23,7 @@ namespace Quests.Runtime
public static event Action<QuestClass> OnQuestCompleted;
public static event Action<QuestEvent> OnEventReceived;
public static event Action<QuestClass> OnEventFromQuest;
public static event Action<List<QuestTemplate>> OnAvailableQuestsUpdated;
#endregion
@ -155,6 +156,23 @@ namespace Quests.Runtime
return quests;
}
public List<QuestTemplate> GetAvailableQuests(int level)
{
var factory = _questDatabase.GetFactoryForLevel(level);
if (factory == null)
return new List<QuestTemplate>();
return factory.questTemplates
.Where(q => q.data.MinLevel <= level)
.ToList();
}
public void NotifyAvailableQuestsUpdated(int level)
{
var available = GetAvailableQuests(level);
OnAvailableQuestsUpdated?.Invoke(available);
}
#endregion
#region Methods

99
Assets/_/Features/UI/Runtime/Quests/QuestsBoardPanel.cs
View file

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Core.Runtime;
@ -12,74 +11,42 @@ namespace GameUI.Runtime
{
public class QuestsBoardPanel : BaseMonobehaviour
{
#region Publics
public QuestFactoryDatabase _questFactoryDatabase;
#endregion
#region Unity API
void OnEnable()
{
_player = GetFact<PlayerClass>(GameManager.Instance.Profile);
QuestManager.OnAvailableQuestsUpdated += OnAvailableQuestsChanged;
}
/*void Start()
void OnDisable()
{
foreach (var txt in GetComponentsInChildren<TMP_Text>())
{
txt.text = LocalizationSystem.Instance.GetLocalizedText(txt.text);
}
QuestManager.OnAvailableQuestsUpdated -= OnAvailableQuestsChanged;
}
var factory = _questFactoryDatabase.GetFactoryForLevel(_player.GuildLevel);
if (factory != null)
{
var availableTemplates = factory.questTemplates
.Where(q => q.data.MinLevel <= _player.GuildLevel)
.ToList();
List<QuestClass> acceptedQuestNames = new List<QuestClass>();
if (FactExists<List<QuestClass>>("quests", out _))
{
acceptedQuestNames = GetFact<List<QuestClass>>("quests");
}
foreach (var quest in availableTemplates)
{
if (acceptedQuestNames != null && acceptedQuestNames.Any(q => q.ID == quest.data.ID))
continue;
DisplayCard(quest);
}
}
}*/
void Start()
{
InitializeLocalization();
List<QuestTemplate> availableTemplates = GetAvailableQuests();
List<QuestClass> acceptedQuests = GetAcceptedQuests();
List<QuestTemplate> availableTemplates = QuestManager.Instance.GetAvailableQuests(_player.GuildLevel);
List<QuestClass> acceptedQuests = QuestManager.Instance.ActiveQuests;
DisplayAvailableQuests(availableTemplates, acceptedQuests);
}
#endregion
#region Main Methods
//
#region Public
void OnAvailableQuestsChanged(List<QuestTemplate> availableTemplates)
{
List<QuestClass> acceptedQuests = QuestManager.Instance.ActiveQuests;
ClearPanel();
DisplayAvailableQuests(availableTemplates, acceptedQuests);
}
#endregion
#region Utils
void InitializeLocalization()
{
foreach (var txt in GetComponentsInChildren<TMP_Text>())
@ -88,51 +55,41 @@ namespace GameUI.Runtime
}
}
List<QuestTemplate> GetAvailableQuests()
void ClearPanel()
{
var factory = _questFactoryDatabase.GetFactoryForLevel(_player.GuildLevel);
if (factory == null)
return new List<QuestTemplate>();
return factory.questTemplates
.Where(q => q.data.MinLevel <= _player.GuildLevel)
.ToList();
}
List<QuestClass> GetAcceptedQuests()
{
if (FactExists<List<QuestClass>>("quests", out _))
foreach (Transform child in _panel.transform)
{
return GetFact<List<QuestClass>>("quests");
Destroy(child.gameObject);
}
return new List<QuestClass>();
}
void DisplayAvailableQuests(List<QuestTemplate> availableTemplates, List<QuestClass> acceptedQuests)
{
foreach(var quest in availableTemplates)
foreach (var quest in availableTemplates)
{
if (acceptedQuests.Any(q => q.Name == quest.data.Name))
{
continue;
}
DisplayCard(quest);
}
}
void DisplayCard(QuestTemplate quest)
{
GameObject GO = Instantiate(_questCardPrefab, _panel.transform);
QuestCardUI card = GO.GetComponent<QuestCardUI>();
card.Setup(quest.ToQuestClass(QuestStateEnum.Disponible));
}
#endregion
#region Privates and Protected
PlayerClass _player;
[SerializeField] GameObject _panel;
[SerializeField] GameObject _questCardPrefab;
#endregion
}
}
}