diff --git a/Assets/LevelEditor/Levels.meta b/Assets/Design/Levels.meta similarity index 100% rename from Assets/LevelEditor/Levels.meta rename to Assets/Design/Levels.meta diff --git a/Assets/LevelEditor/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level1.asset rename to Assets/Design/Levels/Level1.asset index 7f0fdca..cbe5ff6 100644 --- a/Assets/LevelEditor/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -246,4 +246,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: d8140ae36f1b7fd4fb1a57ab3dc69de4, type: 2} diff --git a/Assets/LevelEditor/Levels/Level1.asset.meta b/Assets/Design/Levels/Level1.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level1.asset.meta rename to Assets/Design/Levels/Level1.asset.meta diff --git a/Assets/LevelEditor/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level2.asset rename to Assets/Design/Levels/Level2.asset index 38d9c27..9ecf229 100644 --- a/Assets/LevelEditor/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -198,4 +198,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/LevelEditor/Levels/Level2.asset.meta b/Assets/Design/Levels/Level2.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level2.asset.meta rename to Assets/Design/Levels/Level2.asset.meta diff --git a/Assets/LevelEditor/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level3.asset rename to Assets/Design/Levels/Level3.asset index e834439..96be47d 100644 --- a/Assets/LevelEditor/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -196,4 +196,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/LevelEditor/Levels/Level3.asset.meta b/Assets/Design/Levels/Level3.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level3.asset.meta rename to Assets/Design/Levels/Level3.asset.meta diff --git a/Assets/LevelEditor/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level4.asset rename to Assets/Design/Levels/Level4.asset index 01582a4..cd2ff98 100644 --- a/Assets/LevelEditor/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -228,4 +228,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/LevelEditor/Levels/Level4.asset.meta b/Assets/Design/Levels/Level4.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level4.asset.meta rename to Assets/Design/Levels/Level4.asset.meta diff --git a/Assets/LevelEditor/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level5.asset rename to Assets/Design/Levels/Level5.asset index 70774fa..dcb2720 100644 --- a/Assets/LevelEditor/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -204,4 +204,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/LevelEditor/Levels/Level5.asset.meta b/Assets/Design/Levels/Level5.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level5.asset.meta rename to Assets/Design/Levels/Level5.asset.meta diff --git a/Assets/LevelEditor/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset similarity index 99% rename from Assets/LevelEditor/Levels/Level6.asset rename to Assets/Design/Levels/Level6.asset index 1e96254..50237f8 100644 --- a/Assets/LevelEditor/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -202,4 +202,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/LevelEditor/Levels/Level6.asset.meta b/Assets/Design/Levels/Level6.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/Level6.asset.meta rename to Assets/Design/Levels/Level6.asset.meta diff --git a/Assets/LevelEditor/Levels/TestDrag&Drop.asset b/Assets/Design/Levels/TestDrag&Drop.asset similarity index 100% rename from Assets/LevelEditor/Levels/TestDrag&Drop.asset rename to Assets/Design/Levels/TestDrag&Drop.asset diff --git a/Assets/LevelEditor/Levels/TestDrag&Drop.asset.meta b/Assets/Design/Levels/TestDrag&Drop.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/TestDrag&Drop.asset.meta rename to Assets/Design/Levels/TestDrag&Drop.asset.meta diff --git a/Assets/LevelEditor/Levels/TestGame.asset b/Assets/Design/Levels/TestGame.asset similarity index 100% rename from Assets/LevelEditor/Levels/TestGame.asset rename to Assets/Design/Levels/TestGame.asset diff --git a/Assets/LevelEditor/Levels/TestGame.asset.meta b/Assets/Design/Levels/TestGame.asset.meta similarity index 100% rename from Assets/LevelEditor/Levels/TestGame.asset.meta rename to Assets/Design/Levels/TestGame.asset.meta diff --git a/Assets/WaveConfig/Config01.asset b/Assets/Design/Levels/WaveConfig01.asset similarity index 86% rename from Assets/WaveConfig/Config01.asset rename to Assets/Design/Levels/WaveConfig01.asset index 257aaa6..76aa0cf 100644 --- a/Assets/WaveConfig/Config01.asset +++ b/Assets/Design/Levels/WaveConfig01.asset @@ -10,17 +10,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eb0795e326609f0499365f5b65c2b5cd, type: 3} - m_Name: Config01 + m_Name: WaveConfig01 m_EditorClassIdentifier: _constantSpawn: - - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} + - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} _count: 5 _nestedGroupSpawn: - groupSpawn: - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 3 + _count: 11 - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _count: 1 + _count: 4 triggerTime: 0.5 - groupSpawn: - _enemy: {fileID: 313037212318601125, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} diff --git a/Assets/WaveConfig/Config01.asset.meta b/Assets/Design/Levels/WaveConfig01.asset.meta similarity index 100% rename from Assets/WaveConfig/Config01.asset.meta rename to Assets/Design/Levels/WaveConfig01.asset.meta diff --git a/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset new file mode 100644 index 0000000..1ca43e6 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset @@ -0,0 +1,21 @@ +%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_DefaultWorld1_NormalDifficulty + m_EditorClassIdentifier: + _constantSpawn: + - _enemy: {fileID: 313037212318601125, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} + _count: 20 + _nestedGroupSpawn: + - groupSpawn: [] + triggerTime: 0.1 + _gameDuration: 3 diff --git a/Assets/LevelEditor.meta b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset.meta similarity index 52% rename from Assets/LevelEditor.meta rename to Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset.meta index ca44d41..21d09fb 100644 --- a/Assets/LevelEditor.meta +++ b/Assets/Design/Levels/WaveConfig_DefaultWorld1_NormalDifficulty.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0ca30b5ca281be24bb62d7e48cc2bec8 -folderAsset: yes -DefaultImporter: +guid: 4c72177270b51eb46872d1665e3a097e +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Design/Levels/WaveConfig_World1_Level1.asset b/Assets/Design/Levels/WaveConfig_World1_Level1.asset new file mode 100644 index 0000000..8078d53 --- /dev/null +++ b/Assets/Design/Levels/WaveConfig_World1_Level1.asset @@ -0,0 +1,31 @@ +%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/WaveConfig.meta b/Assets/Design/Levels/WaveConfig_World1_Level1.asset.meta similarity index 52% rename from Assets/WaveConfig.meta rename to Assets/Design/Levels/WaveConfig_World1_Level1.asset.meta index b7bd07b..2da30f5 100644 --- a/Assets/WaveConfig.meta +++ b/Assets/Design/Levels/WaveConfig_World1_Level1.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: b3ad07c069cd06e4ebbd5f190b9aa25b -folderAsset: yes -DefaultImporter: +guid: d8140ae36f1b7fd4fb1a57ab3dc69de4 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GlobalConfig.asset b/Assets/GlobalConfig.asset index c7ad5b5..2cf54dc 100644 --- a/Assets/GlobalConfig.asset +++ b/Assets/GlobalConfig.asset @@ -20,14 +20,14 @@ MonoBehaviour: enemyAttackSpeedMultiplier: 1 allyDamageMultiplier: 1 allyLifeMultiplier: 1 - allyAttackSpeedMultiplier: 0.5 + allyAttackSpeedMultiplier: 1 allySpeedMultiplier: 1 allyRangeMultiplier: {x: 1, y: 1} - harvestDuration: 5 + harvestDuration: 10 harvestAmount: 10 - useRandomHarvestDuration: 0 - randomHarvestDurationMinimum: 0 - randomHarvestDurationMaximum: 0 - loadingAddedTime: 1 + useRandomHarvestDuration: 1 + randomHarvestDurationMinimum: 8 + randomHarvestDurationMaximum: 12 + loadingAddedTime: 0.2 baseTileSpawnSpeed: 33 - tileSpawnAcceleration: 1 + tileSpawnAcceleration: 2 diff --git a/Assets/Prefabs/Monsters/Basic_monster.prefab b/Assets/Prefabs/Monsters/Basic_monster.prefab index 23b24b6..f78a556 100644 --- a/Assets/Prefabs/Monsters/Basic_monster.prefab +++ b/Assets/Prefabs/Monsters/Basic_monster.prefab @@ -95,7 +95,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5c6a370a8a12ae547a4509f3b98339cf, type: 3} m_Name: m_EditorClassIdentifier: - _hp: 6 + _hp: 10 _speed: 0.15 _attack_damage: 1 _attack_interval: 2 diff --git a/Assets/Prefabs/Sticks/farmersAssociation.prefab b/Assets/Prefabs/Sticks/farmersAssociation.prefab index 89c8175..fe8865c 100644 --- a/Assets/Prefabs/Sticks/farmersAssociation.prefab +++ b/Assets/Prefabs/Sticks/farmersAssociation.prefab @@ -1104,7 +1104,7 @@ MonoBehaviour: m_EditorClassIdentifier: _hp: 10 _speed: 0 - _attack_damage: 2 + _attack_damage: 1 _attack_interval: 2 --- !u!50 &-1491803373025033585 Rigidbody2D: