diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index fd01a7b..f6ea7d3 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -150,8 +150,6 @@ MonoBehaviour: _position: {x: -10, y: 2, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -9, y: 2, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -8, y: -3, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} @@ -195,7 +193,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: c22ff5f49b21f9844a4d9693dc06777c, type: 2} - _startPopulation: 10 - _startFood: 40 + _startPopulation: 5 + _startFood: 50 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index 50684b7..d8a6ddd 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -145,45 +145,19 @@ MonoBehaviour: - _key: Entities _tiles: - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} + - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: 1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -9, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -9, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} + - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: 1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -8, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -8, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -7, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -7, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -6, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -6, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -5, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _position: {x: -5, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -4, y: -1, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} @@ -225,7 +199,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: 5ccff833a19a71f4499a3b3d786f4d11, type: 2} - _startPopulation: 10 - _startFood: 40 + _startPopulation: 5 + _startFood: 50 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/WaveConfig_1_1.asset b/Assets/Design/Levels/WaveConfig_1_1.asset index 05d585f..26c4095 100644 --- a/Assets/Design/Levels/WaveConfig_1_1.asset +++ b/Assets/Design/Levels/WaveConfig_1_1.asset @@ -14,18 +14,22 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 20 + _count: 30 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} _count: 2 triggerTime: 0.25 - - groupSpawn: - - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 2 - triggerTime: 0.5 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 2 - triggerTime: 0.75 - _gameDuration: 1 + _count: 9 + triggerTime: 1.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 7 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 14 + triggerTime: 3 + _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_2.asset b/Assets/Design/Levels/WaveConfig_1_2.asset index e13eb45..0cc9dbb 100644 --- a/Assets/Design/Levels/WaveConfig_1_2.asset +++ b/Assets/Design/Levels/WaveConfig_1_2.asset @@ -28,4 +28,8 @@ MonoBehaviour: - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} _count: 3 triggerTime: 2.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 15 + triggerTime: 3 _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_3.asset b/Assets/Design/Levels/WaveConfig_1_3.asset index 509e8a4..71ee7a0 100644 --- a/Assets/Design/Levels/WaveConfig_1_3.asset +++ b/Assets/Design/Levels/WaveConfig_1_3.asset @@ -28,4 +28,8 @@ MonoBehaviour: - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} _count: 3 triggerTime: 2.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 17 + triggerTime: 3 _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_4.asset b/Assets/Design/Levels/WaveConfig_1_4.asset index 991a946..a634d80 100644 --- a/Assets/Design/Levels/WaveConfig_1_4.asset +++ b/Assets/Design/Levels/WaveConfig_1_4.asset @@ -26,6 +26,10 @@ MonoBehaviour: triggerTime: 2 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 4 + _count: 5 triggerTime: 2.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 18 + triggerTime: 3 _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_5.asset b/Assets/Design/Levels/WaveConfig_1_5.asset index 067592f..a88130b 100644 --- a/Assets/Design/Levels/WaveConfig_1_5.asset +++ b/Assets/Design/Levels/WaveConfig_1_5.asset @@ -26,6 +26,10 @@ MonoBehaviour: triggerTime: 2 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 4 + _count: 6 triggerTime: 2.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 19 + triggerTime: 3 _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_6.asset b/Assets/Design/Levels/WaveConfig_1_6.asset index 8e903f4..0a16bdf 100644 --- a/Assets/Design/Levels/WaveConfig_1_6.asset +++ b/Assets/Design/Levels/WaveConfig_1_6.asset @@ -26,6 +26,10 @@ MonoBehaviour: triggerTime: 2 - groupSpawn: - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 4 + _count: 8 triggerTime: 2.5 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 20 + triggerTime: 3 _gameDuration: 3 diff --git a/Assets/Design/UnitCards/Archer.asset b/Assets/Design/UnitCards/Archer.asset index 5368f99..c7fdd79 100644 --- a/Assets/Design/UnitCards/Archer.asset +++ b/Assets/Design/UnitCards/Archer.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3} m_Name: Archer m_EditorClassIdentifier: - _wood: 30 + _wood: 40 _rock: 0 _food: 20 _cooldownInSeconds: 5 diff --git a/Assets/Design/UnitCards/Farmer.asset b/Assets/Design/UnitCards/Farmer.asset index 57ad701..25a40e9 100644 --- a/Assets/Design/UnitCards/Farmer.asset +++ b/Assets/Design/UnitCards/Farmer.asset @@ -15,4 +15,4 @@ MonoBehaviour: _wood: 0 _rock: 0 _food: 10 - _cooldownInSeconds: 1 + _cooldownInSeconds: 2 diff --git a/Assets/Design/UnitCards/Knight.asset b/Assets/Design/UnitCards/Knight.asset index c6d7bc3..fe6e362 100644 --- a/Assets/Design/UnitCards/Knight.asset +++ b/Assets/Design/UnitCards/Knight.asset @@ -15,4 +15,4 @@ MonoBehaviour: _wood: 0 _rock: 0 _food: 60 - _cooldownInSeconds: 10 + _cooldownInSeconds: 15 diff --git a/Assets/Prefabs/Sticks/archerStick.prefab b/Assets/Prefabs/Sticks/archerStick.prefab index 06ef7e5..e340c3f 100644 --- a/Assets/Prefabs/Sticks/archerStick.prefab +++ b/Assets/Prefabs/Sticks/archerStick.prefab @@ -873,7 +873,7 @@ MonoBehaviour: _hp: 10 _speed: 0 _attack_damage: 2 - _attack_interval: 4 + _attack_interval: 5.5 --- !u!82 &-6673723252830894487 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/General/Extensions.cs b/Assets/Scripts/General/Extensions.cs index 933cbad..a52cfc7 100644 --- a/Assets/Scripts/General/Extensions.cs +++ b/Assets/Scripts/General/Extensions.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using BindingFlags = System.Reflection.BindingFlags; using UnityEngine; using System.Collections; using GatherAndDefend.LevelEditor; using System.Linq; using System.Threading.Tasks; -using UnityEditorInternal; public static class Extensions { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7b42db3..e8e4e2e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -135,7 +135,8 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 2670dfbb5772b0248b8c8ccaa6470d9a, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1