From 8e50c6d45539b846c411f65c445eb42704690ae0 Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 13 Nov 2023 22:26:24 -0500 Subject: [PATCH] Fix spawning for gala and fix archer atk speed --- Assets/Design/Levels/WaveConfig_1_1.asset | 2 -- Assets/Design/Levels/WaveConfig_1_2.asset | 4 +--- Assets/Design/Levels/WaveConfig_1_3.asset | 4 +--- Assets/Design/Levels/WaveConfig_1_4.asset | 4 +--- Assets/Design/Levels/WaveConfig_1_5.asset | 4 +--- Assets/Design/Levels/WaveConfig_1_6.asset | 4 +--- Assets/GlobalConfig.asset | 11 ++++++--- Assets/Prefabs/Sticks/archerStick.prefab | 2 +- .../Prefabs/UI/WorldMap/WorldMapCanvas.prefab | 24 ++++++++++++++----- .../LevelManager/LevelManagerScript.cs | 6 +++++ 10 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Assets/Design/Levels/WaveConfig_1_1.asset b/Assets/Design/Levels/WaveConfig_1_1.asset index ef59db7..721069f 100644 --- a/Assets/Design/Levels/WaveConfig_1_1.asset +++ b/Assets/Design/Levels/WaveConfig_1_1.asset @@ -14,8 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 10 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} _count: 20 _nestedGroupSpawn: - groupSpawn: diff --git a/Assets/Design/Levels/WaveConfig_1_2.asset b/Assets/Design/Levels/WaveConfig_1_2.asset index fde9534..e13eb45 100644 --- a/Assets/Design/Levels/WaveConfig_1_2.asset +++ b/Assets/Design/Levels/WaveConfig_1_2.asset @@ -14,9 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 10 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 20 + _count: 40 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} diff --git a/Assets/Design/Levels/WaveConfig_1_3.asset b/Assets/Design/Levels/WaveConfig_1_3.asset index a48e4ac..509e8a4 100644 --- a/Assets/Design/Levels/WaveConfig_1_3.asset +++ b/Assets/Design/Levels/WaveConfig_1_3.asset @@ -14,9 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 15 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 25 + _count: 40 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} diff --git a/Assets/Design/Levels/WaveConfig_1_4.asset b/Assets/Design/Levels/WaveConfig_1_4.asset index dd747ee..991a946 100644 --- a/Assets/Design/Levels/WaveConfig_1_4.asset +++ b/Assets/Design/Levels/WaveConfig_1_4.asset @@ -14,9 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 15 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 25 + _count: 45 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} diff --git a/Assets/Design/Levels/WaveConfig_1_5.asset b/Assets/Design/Levels/WaveConfig_1_5.asset index d3b19f3..067592f 100644 --- a/Assets/Design/Levels/WaveConfig_1_5.asset +++ b/Assets/Design/Levels/WaveConfig_1_5.asset @@ -14,9 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 15 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 25 + _count: 45 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} diff --git a/Assets/Design/Levels/WaveConfig_1_6.asset b/Assets/Design/Levels/WaveConfig_1_6.asset index 6c1bd9e..8e903f4 100644 --- a/Assets/Design/Levels/WaveConfig_1_6.asset +++ b/Assets/Design/Levels/WaveConfig_1_6.asset @@ -14,9 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 15 - - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 25 + _count: 50 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} diff --git a/Assets/GlobalConfig.asset b/Assets/GlobalConfig.asset index 2cf54dc..a1e13e3 100644 --- a/Assets/GlobalConfig.asset +++ b/Assets/GlobalConfig.asset @@ -13,21 +13,26 @@ MonoBehaviour: m_Name: GlobalConfig m_EditorClassIdentifier: damageFlashIntensity: 1 - enemySpeedMultiplier: 1 + enemySpeedMultiplier: 0.8 enemyDamageMultiplier: 1 enemyLifeMultiplier: 1 enemyRangeMultiplier: {x: 1, y: 1} enemyAttackSpeedMultiplier: 1 + groupSpawnDelay: 0.05 allyDamageMultiplier: 1 allyLifeMultiplier: 1 allyAttackSpeedMultiplier: 1 allySpeedMultiplier: 1 allyRangeMultiplier: {x: 1, y: 1} + basePopulation: 5 + populationGivenPerHouse: 5 + populationCostPerUnit: 1 + populationWarningPercentage: 0.85 harvestDuration: 10 harvestAmount: 10 useRandomHarvestDuration: 1 - randomHarvestDurationMinimum: 8 - randomHarvestDurationMaximum: 12 + randomHarvestDurationMinimum: 9 + randomHarvestDurationMaximum: 11 loadingAddedTime: 0.2 baseTileSpawnSpeed: 33 tileSpawnAcceleration: 2 diff --git a/Assets/Prefabs/Sticks/archerStick.prefab b/Assets/Prefabs/Sticks/archerStick.prefab index adfe105..0cb46a0 100644 --- a/Assets/Prefabs/Sticks/archerStick.prefab +++ b/Assets/Prefabs/Sticks/archerStick.prefab @@ -652,7 +652,7 @@ MonoBehaviour: _hp: 10 _speed: 0 _attack_damage: 2 - _attack_interval: 2 + _attack_interval: 4 --- !u!82 &-6673723252830894487 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab b/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab index cca42b1..794d889 100644 --- a/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab +++ b/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab @@ -94,7 +94,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1388419616670829464 RectTransform: m_ObjectHideFlags: 0 @@ -110,9 +110,9 @@ RectTransform: m_Father: {fileID: 1388419617214705178} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -64, y: -58} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -23, y: 168} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1388419616670829471 @@ -196,7 +196,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1388419616670829470} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: WorldMapManager, GameAssembly + m_MethodName: WorldReinitialition + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1388419616788066155 GameObject: m_ObjectHideFlags: 0 @@ -2561,4 +2573,4 @@ PrefabInstance: RectTransform: m_CorrespondingSourceObject: {fileID: 1893888152770301339, guid: eb25bde5e3c72d34fbc9095e2c83cdb4, type: 3} m_PrefabInstance: {fileID: 1388419618220364677} - m_PrefabAsset: {fileID: 0} \ No newline at end of file + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/LevelManager/LevelManagerScript.cs b/Assets/Scripts/LevelManager/LevelManagerScript.cs index 0f90f51..969851e 100644 --- a/Assets/Scripts/LevelManager/LevelManagerScript.cs +++ b/Assets/Scripts/LevelManager/LevelManagerScript.cs @@ -38,6 +38,12 @@ public class LevelManagerScript : SingletonBehaviour void Update() { updateAction?.Invoke(); + + // Gala hack to win level instantly + if (Input.GetKeyDown(KeyCode.Alpha0)) + { + EventAggregator.Instance.GetEvent().Invoke(); + } } private void Instance_LevelLoaded(Level level)