From 5211bd9ae94564c81098c190821acd2a459083db Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 23 Oct 2023 21:56:10 -0400 Subject: [PATCH] Fix spawn configs and levels to spawn ok amount of enemies --- Assets/Animations/Sticks/Archer/archer_attack.anim | 2 +- .../FarmersAssociation/farmersAssociation_attack.anim | 2 +- Assets/Design/Levels/Level1.asset | 2 -- Assets/Design/Levels/Level2.asset | 2 -- Assets/Design/Levels/Level3.asset | 2 -- Assets/Design/Levels/Level4.asset | 4 ---- Assets/Design/Levels/Level5.asset | 4 ---- Assets/Design/Levels/Level6.asset | 2 +- Assets/Design/Levels/TestDrag&Drop.asset | 5 +---- Assets/Design/Levels/TestGame.asset | 4 ++-- .../Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset | 6 +++--- 11 files changed, 9 insertions(+), 26 deletions(-) diff --git a/Assets/Animations/Sticks/Archer/archer_attack.anim b/Assets/Animations/Sticks/Archer/archer_attack.anim index 5913090..5aef41b 100644 --- a/Assets/Animations/Sticks/Archer/archer_attack.anim +++ b/Assets/Animations/Sticks/Archer/archer_attack.anim @@ -1233,7 +1233,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/Sticks/FarmersAssociation/farmersAssociation_attack.anim b/Assets/Animations/Sticks/FarmersAssociation/farmersAssociation_attack.anim index eceef25..b662731 100644 --- a/Assets/Animations/Sticks/FarmersAssociation/farmersAssociation_attack.anim +++ b/Assets/Animations/Sticks/FarmersAssociation/farmersAssociation_attack.anim @@ -1311,7 +1311,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Design/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset index 3f7d26a..c94a3a2 100644 --- a/Assets/Design/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -237,8 +237,6 @@ MonoBehaviour: _position: {x: 0, y: -1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: 0, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 1, y: -1, z: 0} _isInvisible: 1 _isCollidable: 0 _isTrigger: 0 diff --git a/Assets/Design/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset index 9ecf229..8c1fa42 100644 --- a/Assets/Design/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -189,8 +189,6 @@ MonoBehaviour: _position: {x: 0, y: 1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: 0, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 1, y: 2, z: 0} _isInvisible: 1 _isCollidable: 0 _isTrigger: 0 diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index 96be47d..5239154 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -187,8 +187,6 @@ MonoBehaviour: _position: {x: 0, y: 1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: 0, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 1, y: 2, z: 0} _isInvisible: 1 _isCollidable: 0 _isTrigger: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index cd2ff98..ba87cc9 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -217,10 +217,6 @@ MonoBehaviour: _position: {x: -1, y: 1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 0, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 0, y: 1, z: 0} _isInvisible: 1 _isCollidable: 0 _isTrigger: 0 diff --git a/Assets/Design/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset index dcb2720..a439c39 100644 --- a/Assets/Design/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -193,10 +193,6 @@ MonoBehaviour: _position: {x: -1, y: 1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 0, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} - _position: {x: 0, y: 1, z: 0} _isInvisible: 1 _isCollidable: 0 _isTrigger: 0 diff --git a/Assets/Design/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset index 50237f8..1e1a21c 100644 --- a/Assets/Design/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -187,7 +187,7 @@ MonoBehaviour: _tiles: - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} + - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -2, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -1, z: 0} diff --git a/Assets/Design/Levels/TestDrag&Drop.asset b/Assets/Design/Levels/TestDrag&Drop.asset index b206bd0..f6c395b 100644 --- a/Assets/Design/Levels/TestDrag&Drop.asset +++ b/Assets/Design/Levels/TestDrag&Drop.asset @@ -309,7 +309,6 @@ MonoBehaviour: _position: {x: 10, y: 1, z: 0} - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} _position: {x: 10, y: 2, z: 0} - _isSpawner: 0 _isInvisible: 0 _isCollidable: 0 _isTrigger: 0 @@ -319,7 +318,6 @@ MonoBehaviour: _scale: {x: 1, y: 1} - _key: Entities _tiles: [] - _isSpawner: 0 _isInvisible: 0 _isCollidable: 0 _isTrigger: 0 @@ -345,7 +343,6 @@ MonoBehaviour: _position: {x: 10, y: 0, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: 10, y: 2, z: 0} - _isSpawner: 0 _isInvisible: 0 _isCollidable: 0 _isTrigger: 0 @@ -353,4 +350,4 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 21b0f85f7c746974db1e72f2df646f5d, type: 2} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} diff --git a/Assets/Design/Levels/TestGame.asset b/Assets/Design/Levels/TestGame.asset index 53f4bfe..7faa9f9 100644 --- a/Assets/Design/Levels/TestGame.asset +++ b/Assets/Design/Levels/TestGame.asset @@ -171,7 +171,7 @@ MonoBehaviour: _tiles: - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 15606c8c503e8164fb69178aa7016f58, type: 2} + - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -2, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -1, z: 0} @@ -188,4 +188,4 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} diff --git a/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset index 0080787..67c9384 100644 --- a/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset +++ b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset @@ -14,9 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: _constantSpawn: - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 1 + _count: 15 - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 1 + _count: 10 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} @@ -31,5 +31,5 @@ MonoBehaviour: _count: 1 - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} _count: 1 - triggerTime: 2 + triggerTime: 1 _gameDuration: 3