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

Compare commits

base: toine:FEAT-Compte-rendu-des-quetes
Branches Tags
toine:main
toine:REFACTO
toine:BUG-3
toine:MARKETING
toine:BUG-2
toine:develop
toine:FEAT-Compte-rendu-des-quetes
toine:FT-Console
toine:BUG-1
..
compare: toine:main
Branches Tags
toine:REFACTO
toine:BUG-3
toine:MARKETING
toine:BUG-2
toine:develop
toine:FEAT-Compte-rendu-des-quetes
toine:main
toine:FT-Console
toine:BUG-1

No commits in common. "FEAT-Compte-rendu-des-quetes" and "main" have entirely different histories.
FEAT-Compt ... main

52 changed files with 722 additions and 2495 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Assets/StreamingAssets/Localization/French.xml
View file

@ -35,8 +35,6 @@
<available_title>Disponible(s)</available_title>
<in_qg>Au QG</in_qg>
<in_quest>En mission</in_quest>
<!-- Recap quête -->
<quest.completed.title>Récap' Quête</quest.completed.title>
<!-- QUÊTES -->
<quests.1.title>Invasion de Rats</quests.1.title>
@ -64,6 +62,7 @@
<event.plain.fight.1>Un groupe de bandit demandent un droit de passage au abord d'un pont. Vous êtes contraint de pay... de les abattre. Après un combat acharné, vos aventuriers l'emporte !</event.plain.fight.1>
<!-- OBJETS -->
<item_gold>Or</item_gold>
<item_gold_desc>Or.</item_gold_desc>

1342
Assets/_/Database/prefabs/Board.prefab
View file

File diff suppressed because it is too large Load diff

2
Assets/_/Features/AudioSystem/Runtime/AudioManager.cs
View file

@ -7,7 +7,7 @@ using UnityEngine.UI;
namespace AudioSystem.Runtime
{
public class AudioManager : BaseMonoBehaviour
public class AudioManager : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/AudioSystem/Runtime/LevelAudioHandler.cs
View file

@ -3,7 +3,7 @@ using UnityEngine.SceneManagement;
namespace Core.Runtime
{
public class SceneLoader : BaseMonoBehaviour
public class SceneLoader : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Cheat/Runtime/Cheat.cs
View file

@ -8,7 +8,7 @@ using UnityEngine.SceneManagement;
namespace Cheat.Runtime
{
public class Cheat : BaseMonoBehaviour
public class Cheat : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Core/Runtime/BaseMonoBehaviour.cs
View file

@ -4,7 +4,7 @@ using UnityEngine;
namespace Core.Runtime
{
public class BaseMonoBehaviour : MonoBehaviour
public class BaseMonobehaviour : MonoBehaviour
{
#region Publics

6
Assets/_/Features/Core/Runtime/FactsSystem/FactDictionary.cs
View file

@ -29,14 +29,14 @@ namespace Core.Runtime
return false;
}
public void SetFact<T>(string key, T value, BaseMonoBehaviour.FactPersistence persistence)
public void SetFact<T>(string key, T value, BaseMonobehaviour.FactPersistence persistence)
{
if (_facts.TryGetValue(key, out var existingFact))
{
if (existingFact is Fact<T> typedFact)
{
typedFact.Value = value;
typedFact.IsPersistent = persistence == BaseMonoBehaviour.FactPersistence.Persistent;
typedFact.IsPersistent = persistence == BaseMonobehaviour.FactPersistence.Persistent;
}
else
{
@ -45,7 +45,7 @@ namespace Core.Runtime
}
else
{
bool isPersistent = persistence == BaseMonoBehaviour.FactPersistence.Persistent;
bool isPersistent = persistence == BaseMonobehaviour.FactPersistence.Persistent;
_facts[key] = new Fact<T>(value, isPersistent);
}
}

2
Assets/_/Features/Core/Runtime/GameManager.cs
View file

@ -7,7 +7,7 @@ using UnityEngine.SceneManagement;
namespace Core.Runtime
{
public class GameManager: BaseMonoBehaviour
public class GameManager: BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Core/Runtime/LocalizationSystem.cs
View file

@ -6,7 +6,7 @@ using UnityEngine;
namespace Core.Runtime
{
public class LocalizationSystem : BaseMonoBehaviour
public class LocalizationSystem : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Core/Runtime/SceneLoader.cs
View file

@ -6,7 +6,7 @@ using Random = UnityEngine.Random;
namespace Core.Runtime
{
public class SceneLoader : BaseMonoBehaviour
public class SceneLoader : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Core/Runtime/UIManager.cs
View file

@ -3,7 +3,7 @@ using UnityEngine;
namespace Core.Runtime
{
public class UIManager : BaseMonoBehaviour
public class UIManager : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Decor/Runtime/AdventurerApearanceSpawner.cs
View file

@ -7,7 +7,7 @@ using UnityEngine;
namespace Decor.Runtime
{
public class AdventurerApearanceSpawner : BaseMonoBehaviour
public class AdventurerApearanceSpawner : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Decor/Runtime/AdventurerModelBinder.cs
View file

@ -4,7 +4,7 @@ using UnityEngine;
namespace Decor.Runtime
{
public class AdventurerModelBinder : BaseMonoBehaviour
public class AdventurerModelBinder : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Decor/Runtime/Portrait/PortraitGenerator.cs
View file

@ -9,7 +9,7 @@ using UnityEngine.AI;
namespace Decor.Runtime
{
public class PortraitGenerator : BaseMonoBehaviour
public class PortraitGenerator : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Decor/Runtime/Portrait/TakePhoto.cs
View file

@ -7,7 +7,7 @@ using UnityEngine.UI;
namespace _.Features.Decor.Runtime
{
public class TakePhoto : BaseMonoBehaviour
public class TakePhoto : BaseMonobehaviour
{
#region Publics

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

@ -9,7 +9,7 @@ using UnityEngine;
namespace Decor.Runtime
{
public class QuestSign: BaseMonoBehaviour
public class QuestSign: BaseMonobehaviour
{
#region private & protected

2
Assets/_/Features/GoalSystem/Runtime/GoalSystem.cs
View file

@ -4,7 +4,7 @@ using UnityEngine;
namespace Goals.Runtime
{
public class GoalSystem : BaseMonoBehaviour
public class GoalSystem : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/LoadGame/LoadGame.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace MenuSystem.Runtime.LoadGame
{
public class LoadGame : BaseMonoBehaviour
public class LoadGame : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/MenuManager.cs
View file

@ -5,7 +5,7 @@ using UnityEngine.UI;
namespace MenuSystem.Runtime
{
public class MenuManager : BaseMonoBehaviour
public class MenuManager : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/NewGame/NewGame.cs
View file

@ -10,7 +10,7 @@ using UnityEngine;
namespace MenuSystem.Runtime
{
public class NewGame : BaseMonoBehaviour
public class NewGame : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/Pause/PauseMenu.cs
View file

@ -5,7 +5,7 @@ using Cursor = UnityEngine.Cursor;
namespace MenuSystem.Runtime
{
public class PauseMenu : BaseMonoBehaviour
public class PauseMenu : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/Settings/AudioMenuModule.cs
View file

@ -3,7 +3,7 @@ using UnityEngine;
namespace MenuSystem.Runtime.Settings
{
public class AudioMenuModule : BaseMonoBehaviour, IMenuModule
public class AudioMenuModule : BaseMonobehaviour, IMenuModule
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/Settings/SettingsMenu.cs
View file

@ -5,7 +5,7 @@ using UnityEngine.UI;
namespace MenuSystem.Runtime
{
public class SettingsMenu : BaseMonoBehaviour
public class SettingsMenu : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/MenuSystem/Runtime/TitleScreen/TitleScreen.cs
View file

@ -7,7 +7,7 @@ using UnityEngine;
namespace MenuSystem.Runtime.TitleScreen
{
public class TitleScreen : BaseMonoBehaviour
public class TitleScreen : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Player/Runtime/Deplacements.cs
View file

@ -5,7 +5,7 @@ using UnityEngine.Serialization;
namespace Player.Runtime
{
public class Deplacements : BaseMonoBehaviour
public class Deplacements : BaseMonobehaviour
{
#region Publics

44
Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs
View file

@ -1,44 +0,0 @@
using Core.Runtime;
using UnityEngine;
namespace Quests.Runtime
{
public class QuestHistory : BaseMonoBehaviour
{
#region Publics
//
#endregion
#region Unity API
//
#endregion
#region Main Methods
//
#endregion
#region Utils
/* Fonctions privées utiles */
#endregion
#region Privates and Protected
[SerializeField] TextMesh _historyContent;
#endregion
}
}

3
Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs.meta
View file

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: a360a2299eba4e078acfa47eac0464e3
timeCreated: 1760204281

2
Assets/_/Features/Quests/Runtime/QuestInitializer.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace Quests.Runtime._.Features.Quests
{
public class QuestInitializer : BaseMonoBehaviour
public class QuestInitializer : BaseMonobehaviour
{
void Awake()
{

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

@ -10,7 +10,7 @@ using Random = UnityEngine.Random;
namespace Quests.Runtime
{
public class QuestManager : BaseMonoBehaviour
public class QuestManager : BaseMonobehaviour
{
#region Singleton

8
Assets/_/Features/Tests/Editor/QuestManagerTests.cs
View file

@ -24,11 +24,11 @@ namespace GuildTycoon.Tests.Editor
// Ensure profile and base facts are set
_gameManager.Profile = "UnitTestProfile";
_gameManager.Fact = new FactDictionnary();
GameManager.m_gameFacts = _gameManager.Fact; // ensure BaseMonoBehaviour access works
GameManager.m_gameFacts = _gameManager.Fact; // ensure BaseMonobehaviour access works
// Pre-seed facts used by QuestManager
_gameManager.Fact.SetFact("accepted_quests", new List<QuestClass>(), BaseMonoBehaviour.FactPersistence.Normal);
_gameManager.Fact.SetFact("events_quests_history", new Dictionary<Guid, List<QuestEventLog>>(), BaseMonoBehaviour.FactPersistence.Normal);
_gameManager.Fact.SetFact("accepted_quests", new List<QuestClass>(), BaseMonobehaviour.FactPersistence.Normal);
_gameManager.Fact.SetFact("events_quests_history", new Dictionary<Guid, List<QuestEventLog>>(), BaseMonobehaviour.FactPersistence.Normal);
// Create QuestManager
_qmGO = new GameObject("QuestManager_Test");
@ -64,7 +64,7 @@ namespace GuildTycoon.Tests.Editor
// Seed facts with the same quest so QuestManager can update saved state
var accepted = new List<QuestClass> { new QuestClass(questId, quest.Name, quest.Description, quest.Objective, quest.Duration, quest.Difficulty, quest.Rewards, quest.MinLevel) { State = QuestStateEnum.InProgress } };
_gameManager.Fact.SetFact("accepted_quests", accepted, BaseMonoBehaviour.FactPersistence.Normal);
_gameManager.Fact.SetFact("accepted_quests", accepted, BaseMonobehaviour.FactPersistence.Normal);
QuestClass completedRaised = null;
Action<QuestClass> handler = q => completedRaised = q;

2
Assets/_/Features/Tests/Runtime/AutoLoaderGame.cs
View file

@ -4,7 +4,7 @@ using UnityEngine.SceneManagement;
namespace TestFacts.Runtime
{
public class AutoLoaderGame : BaseMonoBehaviour
public class AutoLoaderGame : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/Tests/Runtime/TestFacts.cs
View file

@ -6,7 +6,7 @@ using UnityEngine;
namespace TestFacts.Runtime
{
public class TestFacts : BaseMonoBehaviour
public class TestFacts : BaseMonobehaviour
{
string _fact;

2
Assets/_/Features/Tests/Runtime/Triche.cs
View file

@ -7,7 +7,7 @@ using UnityEngine;
namespace TestFacts.Runtime
{
public class Triche : BaseMonoBehaviour
public class Triche : BaseMonobehaviour
{
[ContextMenu("Add 99999 Gold")]
void AddInfiniteGold()

2
Assets/_/Features/UI/Runtime/Adventurers/AdventurerCardSelectionnable.cs
View file

@ -8,7 +8,7 @@ using UnityEngine.UI;
namespace GameUI.Runtime
{
public class AdventurerCardSelectionnable : BaseMonoBehaviour
public class AdventurerCardSelectionnable : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Adventurers/AdventurerUIController.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class AdventurerUIController : BaseMonoBehaviour
public class AdventurerUIController : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Adventurers/AdventurersShop/RecruitementPanel.cs
View file

@ -10,7 +10,7 @@ using UnityEngine.UI;
namespace GameUI.Runtime
{
public class RecruitementPanel: BaseMonoBehaviour
public class RecruitementPanel: BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Adventurers/InfoAdventurerPanel.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class InfoAdventurerPanel : BaseMonoBehaviour
public class InfoAdventurerPanel : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Adventurers/InteractionAdventurerCard.cs
View file

@ -6,7 +6,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class InteractionAdventurerCard : BaseMonoBehaviour
public class InteractionAdventurerCard : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/BasePanel.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class BasePanel : BaseMonoBehaviour
public class BasePanel : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/InfoPanel.cs
View file

@ -5,7 +5,7 @@ using TMPro;
namespace GameUI.Runtime
{
public class InfoPanel : BaseMonoBehaviour
public class InfoPanel : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/InventoryPanel.cs
View file

@ -4,7 +4,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class InventoryPanel : BaseMonoBehaviour
public class InventoryPanel : BaseMonobehaviour
{
#region Unity API

2
Assets/_/Features/UI/Runtime/Quests/Events/EventsDisplayUI.cs
View file

@ -6,7 +6,7 @@ using UnityEngine;
namespace GameUI.Runtime.Events
{
public class EventsDisplayUI : BaseMonoBehaviour
public class EventsDisplayUI : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Quests/Events/QuestLogUI.cs
View file

@ -4,7 +4,7 @@ using UnityEngine;
namespace GameUI.Runtime.Events
{
public class QuestLogUI : BaseMonoBehaviour
public class QuestLogUI : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Quests/Events/QuestLogsListUI.cs
View file

@ -7,7 +7,7 @@ using UnityEngine;
namespace GameUI.Runtime.Events
{
public class QuestLogsListUI : BaseMonoBehaviour
public class QuestLogsListUI : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Quests/InfoQuestPanel.cs
View file

@ -14,7 +14,7 @@ using UnityEngine.UI;
namespace GameUI.Runtime
{
public class InfoQuestPanel : BaseMonoBehaviour
public class InfoQuestPanel : BaseMonobehaviour
{
#region Publics
[Header("UI Text Elements")]

2
Assets/_/Features/UI/Runtime/Quests/InteractionQuestCard.cs
View file

@ -8,7 +8,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class InteractionQuestCard : BaseMonoBehaviour
public class InteractionQuestCard : BaseMonobehaviour
{
[SerializeField] QuestFactoryDatabase _questDatabase;

2
Assets/_/Features/UI/Runtime/Quests/QuestCardUI.cs
View file

@ -9,7 +9,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class QuestCardUI : BaseMonoBehaviour
public class QuestCardUI : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Quests/QuestMini.cs
View file

@ -5,7 +5,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class QuestMini : BaseMonoBehaviour
public class QuestMini : BaseMonobehaviour
{
#region Publics

2
Assets/_/Features/UI/Runtime/Quests/QuestUIController.cs
View file

@ -6,7 +6,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class QuestUIController : BaseMonoBehaviour
public class QuestUIController : BaseMonobehaviour
{
#region Publics

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

@ -9,7 +9,7 @@ using UnityEngine;
namespace GameUI.Runtime
{
public class QuestsBoardPanel : BaseMonoBehaviour
public class QuestsBoardPanel : BaseMonobehaviour
{
#region Unity API

2
Assets/_/Features/UI/Runtime/Quests/QuestsPanel.cs
View file

@ -10,7 +10,7 @@ using UnityEngine.Serialization;
namespace GameUI.Runtime
{
public class QuestsPanel : BaseMonoBehaviour
public class QuestsPanel : BaseMonobehaviour
{
#region Publics

1721
Assets/_/Levels/Game.unity
View file

File diff suppressed because it is too large Load diff