From 00f9dd2910429a408db2edf0f11d539908bce609 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 9 Nov 2025 11:51:12 -0500 Subject: [PATCH] Fix tooltip issue; Fix unlock issue; Fix spoopy HP bar not updating; Fix res speed boosts --- Assets/Design/Levels/WaveConfig_1_1.asset | 18 +++++------------- Assets/Design/UnitCards/KnightOnHorse.asset | 2 +- Assets/Prefabs/Buildings/Blacksmith.prefab | 2 +- Assets/Prefabs/Buildings/Mill.prefab | 2 +- Assets/Prefabs/Buildings/Workshop.prefab | 2 +- .../Monsters/SpoopyAhGhost_monster.prefab | 2 +- Assets/Scripts/Ally/Tooltip/TooltipText.cs | 7 ++++++- Assets/Scripts/WorldMap/WorldMapSave.cs | 11 +++++++++-- 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/Assets/Design/Levels/WaveConfig_1_1.asset b/Assets/Design/Levels/WaveConfig_1_1.asset index 26c4095..b10926a 100644 --- a/Assets/Design/Levels/WaveConfig_1_1.asset +++ b/Assets/Design/Levels/WaveConfig_1_1.asset @@ -14,22 +14,14 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 30 + _count: 10 _nestedGroupSpawn: - - groupSpawn: - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 2 - triggerTime: 0.25 - - groupSpawn: - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 9 - triggerTime: 1.5 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 7 - triggerTime: 2 + _count: 10 + triggerTime: 0.5 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} _count: 14 - triggerTime: 3 - _gameDuration: 3 + triggerTime: 1 + _gameDuration: 1 diff --git a/Assets/Design/UnitCards/KnightOnHorse.asset b/Assets/Design/UnitCards/KnightOnHorse.asset index 815ba79..97b6e8d 100644 --- a/Assets/Design/UnitCards/KnightOnHorse.asset +++ b/Assets/Design/UnitCards/KnightOnHorse.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _wood: 0 _rock: 0 - _food: 10 + _food: 140 _cooldownInSeconds: 1 _tooltipString: "Chevalier jouteur\nAttaque m\xEAl\xE9e + attaque per\xE7ante dans la rang\xE9e" diff --git a/Assets/Prefabs/Buildings/Blacksmith.prefab b/Assets/Prefabs/Buildings/Blacksmith.prefab index 248cb41..da0f31e 100644 --- a/Assets/Prefabs/Buildings/Blacksmith.prefab +++ b/Assets/Prefabs/Buildings/Blacksmith.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _enemy: {fileID: 0} rangeOutline: {fileID: 4877144423808268021} _range: 1 - _multiplier: 10 + _multiplier: 1.15 --- !u!1 &5799165302180276253 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Buildings/Mill.prefab b/Assets/Prefabs/Buildings/Mill.prefab index 4952e0b..68eb605 100644 --- a/Assets/Prefabs/Buildings/Mill.prefab +++ b/Assets/Prefabs/Buildings/Mill.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _enemy: {fileID: 0} rangeOutline: {fileID: 4877144423808268021} _range: 1 - _multiplier: 10 + _multiplier: 1.15 --- !u!1 &1371331378727130647 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Buildings/Workshop.prefab b/Assets/Prefabs/Buildings/Workshop.prefab index 579678a..e4d6f8c 100644 --- a/Assets/Prefabs/Buildings/Workshop.prefab +++ b/Assets/Prefabs/Buildings/Workshop.prefab @@ -104,7 +104,7 @@ MonoBehaviour: _enemy: {fileID: 0} rangeOutline: {fileID: 4877144423808268021} _range: 1 - _multiplier: 10 + _multiplier: 1.15 --- !u!1 &5799165302180276253 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Monsters/SpoopyAhGhost_monster.prefab b/Assets/Prefabs/Monsters/SpoopyAhGhost_monster.prefab index 18d0aea..3ebb4d2 100644 --- a/Assets/Prefabs/Monsters/SpoopyAhGhost_monster.prefab +++ b/Assets/Prefabs/Monsters/SpoopyAhGhost_monster.prefab @@ -98,7 +98,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9accc3bbf43ac664d99f80d0f5302897, type: 3} m_Name: m_EditorClassIdentifier: - _lifeBar: {fileID: 2442999547823700946, guid: d72a1a133f548b64ab31d4b0fe743dec, type: 3} + _lifeBar: {fileID: 2442999547823700946} _hp: 30 _speed: 0.07 _attack_damage: 2 diff --git a/Assets/Scripts/Ally/Tooltip/TooltipText.cs b/Assets/Scripts/Ally/Tooltip/TooltipText.cs index 0c70365..ddbe456 100644 --- a/Assets/Scripts/Ally/Tooltip/TooltipText.cs +++ b/Assets/Scripts/Ally/Tooltip/TooltipText.cs @@ -16,13 +16,18 @@ public class TooltipText : MonoBehaviour [SerializeField] private TextMeshProUGUI _tooltipAttackSpeed; private const string EMPTY_STRING = ""; + private void Start() { _tooltipManager = TooltipManager.Instance; EventAggregator.Instance.GetEvent().Attach(OnEventUpdate); } - // Update is called once per frame + private void OnDestroy() + { + EventAggregator.Instance.GetEvent().Detach(OnEventUpdate); + } + private void OnEventUpdate() { if (_tooltipManager.TooltipVisibility) diff --git a/Assets/Scripts/WorldMap/WorldMapSave.cs b/Assets/Scripts/WorldMap/WorldMapSave.cs index 19fbd35..e832bb1 100644 --- a/Assets/Scripts/WorldMap/WorldMapSave.cs +++ b/Assets/Scripts/WorldMap/WorldMapSave.cs @@ -84,8 +84,15 @@ public class WorldMapSave return; } - levelUnlocked[GetSavedLevelIndex() + 1] = LevelState.SAVED; - levelUnlocked[GetSavedLevelIndex()] = LevelState.UNLOCKED; + int savedLevelIndex = GetSavedLevelIndex(); + if (savedLevelIndex + 1 >= levelUnlocked.Length) + { + Debug.Log("All levels already unlocked! savedLevelIndex: " + savedLevelIndex); + return; + } + + levelUnlocked[savedLevelIndex + 1] = LevelState.SAVED; + levelUnlocked[savedLevelIndex] = LevelState.UNLOCKED; WriteData(); }