Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Pull request #72: Balance level 1-6 and archer

Browse Source 
Merge in CGD/gather-and-defend from design/finallyBalanceLevels to main

* commit '321d6bdff760ad7062b19189c6bb6f9f714a655d':
  Balance level 1-6 and archer
This commit is contained in:
Élia Gingras 01 2024-07-12 15:46:00 +00:00 committed by Ader Alisma 01
commit 8eb2a7d5cc
14 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Design/Levels/Level3.asset
View File

@ -150,8 +150,6 @@ MonoBehaviour:
_position: {x: -10, y: 2, z: 0} _position: {x: -10, y: 2, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -9, y: -3, z: 0} _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} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -8, y: -3, z: 0} _position: {x: -8, y: -3, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
@ -195,7 +193,7 @@ MonoBehaviour:
_position: {x: 0, y: 0} _position: {x: 0, y: 0}
_scale: {x: 1, y: 1} _scale: {x: 1, y: 1}
_waveConfig: {fileID: 11400000, guid: c22ff5f49b21f9844a4d9693dc06777c, type: 2} _waveConfig: {fileID: 11400000, guid: c22ff5f49b21f9844a4d9693dc06777c, type: 2}
_startPopulation: 10 _startPopulation: 5
_startFood: 40 _startFood: 50
_startWood: 0 _startWood: 0
_startRock: 0 _startRock: 0

34
Assets/Design/Levels/Level4.asset
View File

@ -145,45 +145,19 @@ MonoBehaviour:
- _key: Entities - _key: Entities
_tiles: _tiles:
- _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _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} _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} _position: {x: -10, y: 0, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -10, y: 1, z: 0} _position: {x: -10, y: 1, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -10, y: 2, z: 0} _position: {x: -10, y: 2, z: 0}
- _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _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: e74655ccbd41a2b46b1ec9615aba0301, type: 2}
_position: {x: -9, y: -1, z: 0}
- _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2}
_position: {x: -9, y: 0, z: 0} _position: {x: -9, y: 0, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -9, y: 1, z: 0} _position: {x: -9, y: 1, z: 0}
- _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2}
_position: {x: -9, y: 2, z: 0} _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} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2}
_position: {x: -4, y: -1, z: 0} _position: {x: -4, y: -1, z: 0}
- _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2}
@ -225,7 +199,7 @@ MonoBehaviour:
_position: {x: 0, y: 0} _position: {x: 0, y: 0}
_scale: {x: 1, y: 1} _scale: {x: 1, y: 1}
_waveConfig: {fileID: 11400000, guid: 5ccff833a19a71f4499a3b3d786f4d11, type: 2} _waveConfig: {fileID: 11400000, guid: 5ccff833a19a71f4499a3b3d786f4d11, type: 2}
_startPopulation: 10 _startPopulation: 5
_startFood: 40 _startFood: 50
_startWood: 0 _startWood: 0
_startRock: 0 _startRock: 0

20
Assets/Design/Levels/WaveConfig_1_1.asset
View File

@ -14,18 +14,22 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_constantSpawn: _constantSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 20 _count: 30
_nestedGroupSpawn: _nestedGroupSpawn:
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 2 _count: 2
triggerTime: 0.25 triggerTime: 0.25
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 2
triggerTime: 0.5
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3} - _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 2 _count: 9
triggerTime: 0.75 triggerTime: 1.5
_gameDuration: 1 - 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

4
Assets/Design/Levels/WaveConfig_1_2.asset
View File

@ -28,4 +28,8 @@ MonoBehaviour:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 3 _count: 3
triggerTime: 2.5 triggerTime: 2.5
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 15
triggerTime: 3
_gameDuration: 3 _gameDuration: 3

4
Assets/Design/Levels/WaveConfig_1_3.asset
View File

@ -28,4 +28,8 @@ MonoBehaviour:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 3 _count: 3
triggerTime: 2.5 triggerTime: 2.5
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 17
triggerTime: 3
_gameDuration: 3 _gameDuration: 3

6
Assets/Design/Levels/WaveConfig_1_4.asset
View File

@ -26,6 +26,10 @@ MonoBehaviour:
triggerTime: 2 triggerTime: 2
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 4 _count: 5
triggerTime: 2.5 triggerTime: 2.5
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 18
triggerTime: 3
_gameDuration: 3 _gameDuration: 3

6
Assets/Design/Levels/WaveConfig_1_5.asset
View File

@ -26,6 +26,10 @@ MonoBehaviour:
triggerTime: 2 triggerTime: 2
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 4 _count: 6
triggerTime: 2.5 triggerTime: 2.5
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 19
triggerTime: 3
_gameDuration: 3 _gameDuration: 3

6
Assets/Design/Levels/WaveConfig_1_6.asset
View File

@ -26,6 +26,10 @@ MonoBehaviour:
triggerTime: 2 triggerTime: 2
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 4 _count: 8
triggerTime: 2.5 triggerTime: 2.5
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 20
triggerTime: 3
_gameDuration: 3 _gameDuration: 3

2
Assets/Design/UnitCards/Archer.asset
View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3} m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3}
m_Name: Archer m_Name: Archer
m_EditorClassIdentifier: m_EditorClassIdentifier:
_wood: 30 _wood: 40
_rock: 0 _rock: 0
_food: 20 _food: 20
_cooldownInSeconds: 5 _cooldownInSeconds: 5

2
Assets/Design/UnitCards/Farmer.asset
View File

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 0 _wood: 0
_rock: 0 _rock: 0
_food: 10 _food: 10
_cooldownInSeconds: 1 _cooldownInSeconds: 2

2
Assets/Design/UnitCards/Knight.asset
View File

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 0 _wood: 0
_rock: 0 _rock: 0
_food: 60 _food: 60
_cooldownInSeconds: 10 _cooldownInSeconds: 15

2
Assets/Prefabs/Sticks/archerStick.prefab
View File

@ -873,7 +873,7 @@ MonoBehaviour:
_hp: 10 _hp: 10
_speed: 0 _speed: 0
_attack_damage: 2 _attack_damage: 2
_attack_interval: 4 _attack_interval: 5.5
--- !u!82 &-6673723252830894487 --- !u!82 &-6673723252830894487
AudioSource: AudioSource:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scripts/General/Extensions.cs
View File

@ -1,12 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using BindingFlags = System.Reflection.BindingFlags;
using UnityEngine; using UnityEngine;
using System.Collections; using System.Collections;
using GatherAndDefend.LevelEditor; using GatherAndDefend.LevelEditor;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using UnityEditorInternal;
public static class Extensions public static class Extensions
{ {

3
ProjectSettings/ProjectSettings.asset
View File

@ -135,7 +135,8 @@ PlayerSettings:
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 1.0 bundleVersion: 1.0
preloadedAssets: [] preloadedAssets:
- {fileID: 11400000, guid: 2670dfbb5772b0248b8c8ccaa6470d9a, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1