diff --git a/Assets/Design/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset index 2622186..6705b55 100644 --- a/Assets/Design/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -248,8 +248,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: d8140ae36f1b7fd4fb1a57ab3dc69de4, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset index fa30ea8..9f4a4ba 100644 --- a/Assets/Design/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -192,8 +192,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: e9e134bb6a24e4647a27955d3d276bd2, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index 03d7452..13c89a7 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -194,8 +194,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: c22ff5f49b21f9844a4d9693dc06777c, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index c67d17f..3033302 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -224,8 +224,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: 5ccff833a19a71f4499a3b3d786f4d11, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset index bd97463..70cb095 100644 --- a/Assets/Design/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -194,8 +194,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: 2462ecbf554cf1d4883dea95b2504a9f, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset index 278d86a..1e61549 100644 --- a/Assets/Design/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -206,8 +206,8 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 11400000, guid: eee8fc46b43d8144ca603169dc9f26d6, type: 2} _startPopulation: 5 - _startFood: 50 + _startFood: 30 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/TestDrag&Drop.asset b/Assets/Design/Levels/TestDrag&Drop.asset deleted file mode 100644 index f6c395b..0000000 --- a/Assets/Design/Levels/TestDrag&Drop.asset +++ /dev/null @@ -1,353 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b25d284985e65e48b50826c522a5ec3, type: 3} - m_Name: TestDrag&Drop - m_EditorClassIdentifier: - _data: - - _key: Background - _tiles: - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 0, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 1, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 2, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 3, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 4, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 5, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 6, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 7, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 8, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 9, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: 10, y: 2, z: 0} - _isInvisible: 0 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 0 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - - _key: Entities - _tiles: [] - _isInvisible: 0 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 1 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - - _key: Spawners - _tiles: - - _tile: {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2} - _position: {x: -10, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2} - _position: {x: -10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2} - _position: {x: -10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: 4aaf448680c7f8a438a9a5861c622a55, type: 2} - _position: {x: -10, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: 10, y: -4, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: 10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: 10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: 10, y: 2, z: 0} - _isInvisible: 0 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 2 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} diff --git a/Assets/Design/Levels/TestGame.asset b/Assets/Design/Levels/TestGame.asset deleted file mode 100644 index 7faa9f9..0000000 --- a/Assets/Design/Levels/TestGame.asset +++ /dev/null @@ -1,191 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b25d284985e65e48b50826c522a5ec3, type: 3} - m_Name: TestGame - m_EditorClassIdentifier: - _data: - - _key: Background - _tiles: - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -10, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -9, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -8, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -7, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -6, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -5, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -4, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -3, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -2, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: ef5a154519b23a34aaded32e86bf7f2f, type: 2} - _position: {x: -1, y: 2, z: 0} - _isInvisible: 0 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 0 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - - _key: Entities - _tiles: - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _position: {x: -10, y: -2, 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: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _position: {x: -9, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _position: {x: -9, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} - _position: {x: -6, y: 2, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} - _position: {x: -5, y: 2, z: 0} - _isInvisible: 0 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 1 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - - _key: Spawners - _tiles: - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: -1, y: -3, z: 0} - - _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} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: -1, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: -1, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} - _position: {x: -1, y: 2, z: 0} - _isInvisible: 1 - _isCollidable: 0 - _isTrigger: 0 - _renderOrder: 2 - _renderLayer: Default - _position: {x: 0, y: 0} - _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} diff --git a/Assets/Design/Levels/WaveConfig01.asset b/Assets/Design/Levels/WaveConfig01.asset deleted file mode 100644 index db67372..0000000 --- a/Assets/Design/Levels/WaveConfig01.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} - m_Name: WaveConfig01 - m_EditorClassIdentifier: - _constantSpawn: - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 5 - _nestedGroupSpawn: - - groupSpawn: - - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 0 - - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 2 - triggerTime: 0.1 - - groupSpawn: - - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 2 - triggerTime: 1 - _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_1.asset b/Assets/Design/Levels/WaveConfig_1_1.asset new file mode 100644 index 0000000..ef59db7 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_1.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_1 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 10 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 20 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 2 + triggerTime: 2 + _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_World1_Level1.asset.meta b/Assets/Design/Levels/WaveConfig_1_1.asset.meta similarity index 100% rename from Assets/Design/Levels/WaveConfig_World1_Level1.asset.meta rename to Assets/Design/Levels/WaveConfig_1_1.asset.meta diff --git a/Assets/Design/Levels/WaveConfig_1_2.asset b/Assets/Design/Levels/WaveConfig_1_2.asset new file mode 100644 index 0000000..fde9534 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_2.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_2 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 10 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 20 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 5 + triggerTime: 1 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 7 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 3 + triggerTime: 2.5 + _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig01.asset.meta b/Assets/Design/Levels/WaveConfig_1_2.asset.meta similarity index 79% rename from Assets/Design/Levels/WaveConfig01.asset.meta rename to Assets/Design/Levels/WaveConfig_1_2.asset.meta index 7ed0ea8..fba576a 100644 --- a/Assets/Design/Levels/WaveConfig01.asset.meta +++ b/Assets/Design/Levels/WaveConfig_1_2.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21b0f85f7c746974db1e72f2df646f5d +guid: e9e134bb6a24e4647a27955d3d276bd2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Design/Levels/WaveConfig_1_3.asset b/Assets/Design/Levels/WaveConfig_1_3.asset new file mode 100644 index 0000000..a48e4ac --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_3.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_3 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 15 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 25 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 5 + triggerTime: 1 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 7 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 3 + triggerTime: 2.5 + _gameDuration: 3 diff --git a/Assets/Design/Levels/TestDrag&Drop.asset.meta b/Assets/Design/Levels/WaveConfig_1_3.asset.meta similarity index 79% rename from Assets/Design/Levels/TestDrag&Drop.asset.meta rename to Assets/Design/Levels/WaveConfig_1_3.asset.meta index 5f50d38..977ae8c 100644 --- a/Assets/Design/Levels/TestDrag&Drop.asset.meta +++ b/Assets/Design/Levels/WaveConfig_1_3.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 458348dd169e806459b7449b7e157d64 +guid: c22ff5f49b21f9844a4d9693dc06777c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Design/Levels/WaveConfig_1_4.asset b/Assets/Design/Levels/WaveConfig_1_4.asset new file mode 100644 index 0000000..dd747ee --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_4.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_4 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 15 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 25 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 10 + triggerTime: 1 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 8 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 4 + triggerTime: 2.5 + _gameDuration: 3 diff --git a/Assets/Design/Levels/TestGame.asset.meta b/Assets/Design/Levels/WaveConfig_1_4.asset.meta similarity index 79% rename from Assets/Design/Levels/TestGame.asset.meta rename to Assets/Design/Levels/WaveConfig_1_4.asset.meta index ad54b76..e01f3e4 100644 --- a/Assets/Design/Levels/TestGame.asset.meta +++ b/Assets/Design/Levels/WaveConfig_1_4.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5a11cb6d0d324b47b493042c7615112 +guid: 5ccff833a19a71f4499a3b3d786f4d11 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Design/Levels/WaveConfig_1_5.asset b/Assets/Design/Levels/WaveConfig_1_5.asset new file mode 100644 index 0000000..d3b19f3 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_5.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_5 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 15 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 25 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 12 + triggerTime: 1 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 8 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 4 + triggerTime: 2.5 + _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_5.asset.meta b/Assets/Design/Levels/WaveConfig_1_5.asset.meta new file mode 100644 index 0000000..2ebd9a8 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2462ecbf554cf1d4883dea95b2504a9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Design/Levels/WaveConfig_1_6.asset b/Assets/Design/Levels/WaveConfig_1_6.asset new file mode 100644 index 0000000..6c1bd9e --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_6.asset @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} + m_Name: WaveConfig_1_6 + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 15 + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 25 + _nestedGroupSpawn: + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} + _count: 12 + triggerTime: 1 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 9 + triggerTime: 2 + - groupSpawn: + - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + _count: 4 + triggerTime: 2.5 + _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_1_6.asset.meta b/Assets/Design/Levels/WaveConfig_1_6.asset.meta new file mode 100644 index 0000000..341be63 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_1_6.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eee8fc46b43d8144ca603169dc9f26d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset index 67c9384..246d1f0 100644 --- a/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset +++ b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset @@ -13,23 +13,11 @@ MonoBehaviour: m_Name: WaveConfig_DefaultWorld1_NormalDifficulty m_EditorClassIdentifier: _constantSpawn: - - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 15 - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 10 + - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 20 _nestedGroupSpawn: - groupSpawn: - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} _count: 1 - triggerTime: 0.1 - - groupSpawn: - - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _count: 1 - triggerTime: 1 + triggerTime: 0.25 _gameDuration: 3 diff --git a/Assets/Design/Levels/WaveConfig_World1_Level1.asset b/Assets/Design/Levels/WaveConfig_World1_Level1.asset deleted file mode 100644 index 8078d53..0000000 --- a/Assets/Design/Levels/WaveConfig_World1_Level1.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} - m_Name: WaveConfig_World1_Level1 - m_EditorClassIdentifier: - _constantSpawn: - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 20 - _nestedGroupSpawn: - - groupSpawn: - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 1 - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 3 - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 5 - - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _count: 17 - triggerTime: 0.5 - _gameDuration: 3 diff --git a/Assets/Scripts/Events/LastWaveCompletedEvent.cs b/Assets/Scripts/Events/LastWaveCompletedEvent.cs new file mode 100644 index 0000000..8613568 --- /dev/null +++ b/Assets/Scripts/Events/LastWaveCompletedEvent.cs @@ -0,0 +1,3 @@ +using GatherAndDefend.Events; + +public class LastWaveCompletedEvent : EventBase { } \ No newline at end of file diff --git a/Assets/Scripts/Events/LastWaveCompletedEvent.cs.meta b/Assets/Scripts/Events/LastWaveCompletedEvent.cs.meta new file mode 100644 index 0000000..0b7765f --- /dev/null +++ b/Assets/Scripts/Events/LastWaveCompletedEvent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 056fb8bd9181745448b804766e4081bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Opponent/EnemyType.cs b/Assets/Scripts/Opponent/EnemyType.cs index 1bb9e02..1a3493b 100644 --- a/Assets/Scripts/Opponent/EnemyType.cs +++ b/Assets/Scripts/Opponent/EnemyType.cs @@ -6,19 +6,26 @@ using System; public class EnemyType { [SerializeField] - private Opponent _enemy; + private GameObject _enemy; [SerializeField] private int _count; + private Opponent _opponent; + public int GetEnemyToughness() { - float toughness = Mathf.Round((_enemy.Hp / 10) / 2); + if (_opponent == null) + { + _opponent = _enemy.GetComponent(); + } + + float toughness = Mathf.Round((_opponent.Hp / 10) / 2); return (int)toughness; } public GameObject GetEnemyObject() { - return _enemy.gameObject; + return _enemy; } public int Count { diff --git a/Assets/Scripts/VictoryDefeat.cs b/Assets/Scripts/VictoryDefeat.cs index fde40a0..1aca2cc 100644 --- a/Assets/Scripts/VictoryDefeat.cs +++ b/Assets/Scripts/VictoryDefeat.cs @@ -1,36 +1,50 @@ +using GatherAndDefend.Events; using System.Collections; using System.Collections.Generic; using UnityEngine; public class VictoryDefeat : MonoBehaviour { - private bool _wavesEnd = false; - private bool _isShowingVictoryOrDefeat = false; + public const float positionLoseLimit = -10.0f; + [SerializeField] private Animator _victoryAnimator; [SerializeField] private Animator _defeatAnimator; - public const float positionLoseLimit = -10.0f; + private bool _lastWaveCompleted = false; + private bool _isShowingVictoryOrDefeat = false; private void Start() { _isShowingVictoryOrDefeat = false; + + EventAggregator.Instance.GetEvent().Attach(HandleLastWaveCompletedEvent); } - void Update() + private void OnDestroy() + { + EventAggregator.Instance.GetEvent().Detach(HandleLastWaveCompletedEvent); + } + + private void HandleLastWaveCompletedEvent() + { + _lastWaveCompleted = true; + } + + private void Update() { if (_isShowingVictoryOrDefeat) return; List opponentsList = LevelManager.Instance.GetAll(x => x is Opponent); - //I believe that we win if the waves are finished and there are no more monsters (to be modified in the case that's not it) - if(_wavesEnd && opponentsList.Count == 0) + // Win if the waves are finished and there are no more monsters. + if(_lastWaveCompleted && opponentsList.Count == 0) { _victoryAnimator.Play("ShowVictoryOrDefeat"); _isShowingVictoryOrDefeat = true; - //win ! + // win ! } - //I estimate that we lose if one of the enemies arrives behind our line of defense (to be modified in the case it's not that) + // Lose if one of the enemies arrives behind our line of defense. foreach (Opponent opponent in opponentsList) { if (opponent == null) return; @@ -38,7 +52,7 @@ public class VictoryDefeat : MonoBehaviour { _defeatAnimator.Play("ShowVictoryOrDefeat"); _isShowingVictoryOrDefeat = true; - //lose :( + // lose :( } } }