Fix tooltip issue; Fix unlock issue; Fix spoopy HP bar not updating; Fix res speed boosts
This commit is contained in:
parent
fd002a54a8
commit
00f9dd2910
@ -14,22 +14,14 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_constantSpawn:
|
_constantSpawn:
|
||||||
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
||||||
_count: 30
|
_count: 10
|
||||||
_nestedGroupSpawn:
|
_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:
|
- groupSpawn:
|
||||||
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
||||||
_count: 7
|
_count: 10
|
||||||
triggerTime: 2
|
triggerTime: 0.5
|
||||||
- groupSpawn:
|
- groupSpawn:
|
||||||
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
|
||||||
_count: 14
|
_count: 14
|
||||||
triggerTime: 3
|
triggerTime: 1
|
||||||
_gameDuration: 3
|
_gameDuration: 1
|
||||||
|
|||||||
@ -14,7 +14,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_wood: 0
|
_wood: 0
|
||||||
_rock: 0
|
_rock: 0
|
||||||
_food: 10
|
_food: 140
|
||||||
_cooldownInSeconds: 1
|
_cooldownInSeconds: 1
|
||||||
_tooltipString: "Chevalier jouteur\nAttaque m\xEAl\xE9e + attaque per\xE7ante dans
|
_tooltipString: "Chevalier jouteur\nAttaque m\xEAl\xE9e + attaque per\xE7ante dans
|
||||||
la rang\xE9e"
|
la rang\xE9e"
|
||||||
|
|||||||
@ -104,7 +104,7 @@ MonoBehaviour:
|
|||||||
_enemy: {fileID: 0}
|
_enemy: {fileID: 0}
|
||||||
rangeOutline: {fileID: 4877144423808268021}
|
rangeOutline: {fileID: 4877144423808268021}
|
||||||
_range: 1
|
_range: 1
|
||||||
_multiplier: 10
|
_multiplier: 1.15
|
||||||
--- !u!1 &5799165302180276253
|
--- !u!1 &5799165302180276253
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -104,7 +104,7 @@ MonoBehaviour:
|
|||||||
_enemy: {fileID: 0}
|
_enemy: {fileID: 0}
|
||||||
rangeOutline: {fileID: 4877144423808268021}
|
rangeOutline: {fileID: 4877144423808268021}
|
||||||
_range: 1
|
_range: 1
|
||||||
_multiplier: 10
|
_multiplier: 1.15
|
||||||
--- !u!1 &1371331378727130647
|
--- !u!1 &1371331378727130647
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -104,7 +104,7 @@ MonoBehaviour:
|
|||||||
_enemy: {fileID: 0}
|
_enemy: {fileID: 0}
|
||||||
rangeOutline: {fileID: 4877144423808268021}
|
rangeOutline: {fileID: 4877144423808268021}
|
||||||
_range: 1
|
_range: 1
|
||||||
_multiplier: 10
|
_multiplier: 1.15
|
||||||
--- !u!1 &5799165302180276253
|
--- !u!1 &5799165302180276253
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@ -98,7 +98,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 9accc3bbf43ac664d99f80d0f5302897, type: 3}
|
m_Script: {fileID: 11500000, guid: 9accc3bbf43ac664d99f80d0f5302897, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_lifeBar: {fileID: 2442999547823700946, guid: d72a1a133f548b64ab31d4b0fe743dec, type: 3}
|
_lifeBar: {fileID: 2442999547823700946}
|
||||||
_hp: 30
|
_hp: 30
|
||||||
_speed: 0.07
|
_speed: 0.07
|
||||||
_attack_damage: 2
|
_attack_damage: 2
|
||||||
|
|||||||
@ -16,13 +16,18 @@ public class TooltipText : MonoBehaviour
|
|||||||
[SerializeField]
|
[SerializeField]
|
||||||
private TextMeshProUGUI _tooltipAttackSpeed;
|
private TextMeshProUGUI _tooltipAttackSpeed;
|
||||||
private const string EMPTY_STRING = "";
|
private const string EMPTY_STRING = "";
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
_tooltipManager = TooltipManager.Instance;
|
_tooltipManager = TooltipManager.Instance;
|
||||||
EventAggregator.Instance.GetEvent<TooltipChangedEvent>().Attach(OnEventUpdate);
|
EventAggregator.Instance.GetEvent<TooltipChangedEvent>().Attach(OnEventUpdate);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
EventAggregator.Instance.GetEvent<TooltipChangedEvent>().Detach(OnEventUpdate);
|
||||||
|
}
|
||||||
|
|
||||||
private void OnEventUpdate()
|
private void OnEventUpdate()
|
||||||
{
|
{
|
||||||
if (_tooltipManager.TooltipVisibility)
|
if (_tooltipManager.TooltipVisibility)
|
||||||
|
|||||||
@ -84,8 +84,15 @@ public class WorldMapSave
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
levelUnlocked[GetSavedLevelIndex() + 1] = LevelState.SAVED;
|
int savedLevelIndex = GetSavedLevelIndex();
|
||||||
levelUnlocked[GetSavedLevelIndex()] = LevelState.UNLOCKED;
|
if (savedLevelIndex + 1 >= levelUnlocked.Length)
|
||||||
|
{
|
||||||
|
Debug.Log("All levels already unlocked! savedLevelIndex: " + savedLevelIndex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
levelUnlocked[savedLevelIndex + 1] = LevelState.SAVED;
|
||||||
|
levelUnlocked[savedLevelIndex] = LevelState.UNLOCKED;
|
||||||
WriteData();
|
WriteData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user