From e1ffb8c88703387e94a243c6ce643d7ba12d761b Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 13 Nov 2023 17:47:23 -0500 Subject: [PATCH 1/4] Add berries to all levels --- Assets/Design/Levels/Level1.asset | 6 +++++- Assets/Design/Levels/Level2.asset | 14 +++++--------- Assets/Design/Levels/Level3.asset | 12 ++++++------ Assets/Design/Levels/Level4.asset | 10 +++++----- Assets/Design/Levels/Level5.asset | 30 +++++++++++------------------- Assets/Design/Levels/Level6.asset | 10 +++++----- 6 files changed, 37 insertions(+), 45 deletions(-) diff --git a/Assets/Design/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset index 3639283..02ba32a 100644 --- a/Assets/Design/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -148,6 +148,10 @@ MonoBehaviour: _position: {x: -10, y: -3, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -10, y: -2, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _position: {x: -10, y: -1, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _position: {x: -10, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -10, y: 1, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} @@ -244,7 +248,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset index a5fa3ab..7c41e4e 100644 --- a/Assets/Design/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -146,16 +146,14 @@ MonoBehaviour: _tiles: - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} _position: {x: -10, y: -2, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} _position: {x: -10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} _position: {x: -10, y: 0, z: 0} - - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, 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: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: -3, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} @@ -166,8 +164,6 @@ MonoBehaviour: _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} _isInvisible: 0 _isCollidable: 0 _isTrigger: 0 @@ -196,7 +192,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index 0ca94e4..d34eecd 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -146,12 +146,12 @@ MonoBehaviour: _tiles: - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2} - _position: {x: -10, y: -1, z: 0} - - _tile: {fileID: 11400000, guid: 7568f730b2ba3754297a7612452482e2, type: 2} - _position: {x: -10, y: 0, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _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} @@ -162,7 +162,7 @@ MonoBehaviour: _position: {x: -5, y: -3, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -4, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -3, y: -3, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -2, y: -3, z: 0} @@ -194,7 +194,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index 396af7d..5b59118 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -144,9 +144,9 @@ MonoBehaviour: _scale: {x: 1, y: 1} - _key: Entities _tiles: - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} _position: {x: -10, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + - _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} @@ -156,9 +156,9 @@ MonoBehaviour: _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: e0d57b3c128ba1447920637cdb289530, type: 2} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} _position: {x: -9, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + - _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} @@ -224,7 +224,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset index 691e82b..0794c35 100644 --- a/Assets/Design/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -145,33 +145,27 @@ MonoBehaviour: - _key: Entities _tiles: - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, 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: -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: -8, 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} + - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -8, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} - _position: {x: -8, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} - _position: {x: -5, y: -3, z: 0} + _position: {x: -7, y: -1, z: 0} + - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} + _position: {x: -7, y: 0, z: 0} - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} _position: {x: -4, y: -3, z: 0} + - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + _position: {x: -3, y: -3, z: 0} + - _tile: {fileID: 11400000, guid: e0d57b3c128ba1447920637cdb289530, type: 2} + _position: {x: -2, y: 2, z: 0} _isInvisible: 0 _isCollidable: 0 _isTrigger: 0 @@ -181,8 +175,6 @@ MonoBehaviour: _scale: {x: 1, y: 1} - _key: Spawners _tiles: - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -6, y: -1, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} _position: {x: -1, y: -3, z: 0} - _tile: {fileID: 11400000, guid: 4002377ed7e87b34699f126f2b10c703, type: 2} @@ -202,7 +194,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset index 3bcebfa..4ba96c0 100644 --- a/Assets/Design/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -162,14 +162,14 @@ MonoBehaviour: _position: {x: -7, y: -2, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -7, y: 1, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _position: {x: -6, y: -2, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -6, y: 1, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -5, y: -3, z: 0} - - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} - _position: {x: -5, y: -1, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -5, y: 1, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _position: {x: -4, y: -1, z: 0} - _tile: {fileID: 11400000, guid: e74655ccbd41a2b46b1ec9615aba0301, type: 2} _position: {x: -4, y: 1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} @@ -206,7 +206,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} + _waveConfig: {fileID: 0} _startPopulation: 5 _startFood: 50 _startWood: 0 From 2c701112ad9d9dbfa2fb87fce1db1bcd1736dd0b Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 13 Nov 2023 17:56:14 -0500 Subject: [PATCH 2/4] Add levels missing config; Add island float animation --- Assets/Animations/UI/WorldMap.meta | 8 + .../UI/WorldMap/WorldMapIsland.controller | 72 ++++++ .../WorldMap/WorldMapIsland.controller.meta | 8 + .../UI/WorldMap/WorldMapIsland_Float.anim | 134 ++++++++++++ .../WorldMap/WorldMapIsland_Float.anim.meta | 8 + Assets/Design/Levels/Level1.asset | 2 +- Assets/Design/Levels/Level2.asset | 2 +- Assets/Design/Levels/Level3.asset | 2 +- Assets/Design/Levels/Level4.asset | 2 +- Assets/Design/Levels/Level5.asset | 2 +- Assets/Design/Levels/Level6.asset | 2 +- Assets/Prefabs/UI/WorldMap/Btn_Level.prefab | 2 +- .../Prefabs/UI/WorldMap/WorldMapCanvas.prefab | 205 ++++++++++++++++-- 13 files changed, 426 insertions(+), 23 deletions(-) create mode 100644 Assets/Animations/UI/WorldMap.meta create mode 100644 Assets/Animations/UI/WorldMap/WorldMapIsland.controller create mode 100644 Assets/Animations/UI/WorldMap/WorldMapIsland.controller.meta create mode 100644 Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim create mode 100644 Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim.meta diff --git a/Assets/Animations/UI/WorldMap.meta b/Assets/Animations/UI/WorldMap.meta new file mode 100644 index 0000000..9b8d994 --- /dev/null +++ b/Assets/Animations/UI/WorldMap.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 743e30fe10b54494aaf996bdf084bd58 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/UI/WorldMap/WorldMapIsland.controller b/Assets/Animations/UI/WorldMap/WorldMapIsland.controller new file mode 100644 index 0000000..f445fed --- /dev/null +++ b/Assets/Animations/UI/WorldMap/WorldMapIsland.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-9102624072654608672 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1345182337023351907} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1345182337023351907} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WorldMapIsland + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -9102624072654608672} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1345182337023351907 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WorldMapIsland_Float + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: cba18d9e310383d4eb6eaee15164cfba, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/UI/WorldMap/WorldMapIsland.controller.meta b/Assets/Animations/UI/WorldMap/WorldMapIsland.controller.meta new file mode 100644 index 0000000..45ca4ba --- /dev/null +++ b/Assets/Animations/UI/WorldMap/WorldMapIsland.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c66556f1f1203974b8418e3db529fa58 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim b/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim new file mode 100644 index 0000000..7a40e2d --- /dev/null +++ b/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim @@ -0,0 +1,134 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WorldMapIsland_Float + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -10 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 4 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: -10 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim.meta b/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim.meta new file mode 100644 index 0000000..313074f --- /dev/null +++ b/Assets/Animations/UI/WorldMap/WorldMapIsland_Float.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cba18d9e310383d4eb6eaee15164cfba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Design/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset index 02ba32a..2622186 100644 --- a/Assets/Design/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -248,7 +248,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset index 7c41e4e..fa30ea8 100644 --- a/Assets/Design/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -192,7 +192,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index d34eecd..03d7452 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -194,7 +194,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index 5b59118..c67d17f 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -224,7 +224,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset index 0794c35..bd97463 100644 --- a/Assets/Design/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -194,7 +194,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Design/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset index 4ba96c0..278d86a 100644 --- a/Assets/Design/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -206,7 +206,7 @@ MonoBehaviour: _renderLayer: Default _position: {x: 0, y: 0} _scale: {x: 1, y: 1} - _waveConfig: {fileID: 0} + _waveConfig: {fileID: 11400000, guid: 4c72177270b51eb46872d1665e3a097e, type: 2} _startPopulation: 5 _startFood: 50 _startWood: 0 diff --git a/Assets/Prefabs/UI/WorldMap/Btn_Level.prefab b/Assets/Prefabs/UI/WorldMap/Btn_Level.prefab index ae08edd..413bb8e 100644 --- a/Assets/Prefabs/UI/WorldMap/Btn_Level.prefab +++ b/Assets/Prefabs/UI/WorldMap/Btn_Level.prefab @@ -247,7 +247,7 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_NormalColor: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} diff --git a/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab b/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab index 2ccd1e6..757c6e3 100644 --- a/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab +++ b/Assets/Prefabs/UI/WorldMap/WorldMapCanvas.prefab @@ -1,5 +1,81 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1473428787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1473428788} + - component: {fileID: 1473428790} + - component: {fileID: 1473428789} + m_Layer: 5 + m_Name: background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1473428788 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473428787} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1388419617042242050} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1473428790 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473428787} + m_CullTransparentMesh: 1 +--- !u!114 &1473428789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1473428787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.740566, g: 1, b: 0.95764345, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 94c1e489ce789c4409775082a60a76c6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1388419616670829467 GameObject: m_ObjectHideFlags: 0 @@ -18,7 +94,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1388419616670829464 RectTransform: m_ObjectHideFlags: 0 @@ -28,16 +104,16 @@ RectTransform: m_GameObject: {fileID: 1388419616670829467} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8343763, y: 0.8343763, z: 0.8343763} + m_LocalScale: {x: 0.16324572, y: 0.16324572, z: 0.16324572} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1388419617214705178} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 846.13, y: 573.41} - m_SizeDelta: {x: 227.75, y: 187.408} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -64, y: -58} + m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1388419616670829471 CanvasRenderer: @@ -148,16 +224,16 @@ RectTransform: m_GameObject: {fileID: 1388419616788066155} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.81355935, y: 0.81355935, z: 0.81355935} + m_LocalScale: {x: 0.8135594, y: 0.8135594, z: 0.8135594} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1388419617042242050} + m_Father: {fileID: 7318915945480603808} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.32531738, y: -0.00036621094} - m_SizeDelta: {x: 440.39978, y: 305.7627} + m_AnchoredPosition: {x: -57.674683, y: -99.00037} + m_SizeDelta: {x: 2260.4, y: 1285.7627} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1388419616788066158 CanvasRenderer: @@ -228,8 +304,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1388419616788066152} - - {fileID: 1388419617214705178} + - {fileID: 1473428788} + - {fileID: 6045558796034018510} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -322,7 +398,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1388419617214705253} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -339,14 +415,111 @@ RectTransform: - {fileID: 652135140497265160} - {fileID: 652135141588773322} - {fileID: 1388419616670829464} - m_Father: {fileID: 1388419617042242050} + m_Father: {fileID: 7318915945480603808} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -58, y: -99} + m_SizeDelta: {x: 1820, y: 980} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6646286295886637728 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6045558796034018510} + m_Layer: 5 + m_Name: IslandRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6045558796034018510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6646286295886637728} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7318915945480603808} + m_Father: {fileID: 1388419617042242050} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7562342414061786083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7318915945480603808} + - component: {fileID: 360981297534925855} + m_Layer: 5 + m_Name: anim + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7318915945480603808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7562342414061786083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1388419616788066152} + - {fileID: 1388419617214705178} + m_Father: {fileID: 6045558796034018510} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &360981297534925855 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7562342414061786083} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c66556f1f1203974b8418e3db529fa58, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &652135141416114485 PrefabInstance: m_ObjectHideFlags: 0 From e8d89dbd038b9d92c832c5a33908dd31589e1ffe Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 13 Nov 2023 18:57:58 -0500 Subject: [PATCH 3/4] Balanced level configs --- Assets/Design/Levels/Level1.asset | 4 +- Assets/Design/Levels/Level2.asset | 4 +- Assets/Design/Levels/Level3.asset | 4 +- Assets/Design/Levels/Level4.asset | 4 +- Assets/Design/Levels/Level5.asset | 4 +- Assets/Design/Levels/Level6.asset | 4 +- Assets/Design/Levels/TestDrag&Drop.asset | 353 ------------------ Assets/Design/Levels/TestGame.asset | 191 ---------- Assets/Design/Levels/WaveConfig01.asset | 31 -- Assets/Design/Levels/WaveConfig_1_1.asset | 25 ++ ...1.asset.meta => WaveConfig_1_1.asset.meta} | 0 Assets/Design/Levels/WaveConfig_1_2.asset | 33 ++ ...1.asset.meta => WaveConfig_1_2.asset.meta} | 2 +- Assets/Design/Levels/WaveConfig_1_3.asset | 33 ++ ...p.asset.meta => WaveConfig_1_3.asset.meta} | 2 +- Assets/Design/Levels/WaveConfig_1_4.asset | 33 ++ ...e.asset.meta => WaveConfig_1_4.asset.meta} | 2 +- Assets/Design/Levels/WaveConfig_1_5.asset | 33 ++ .../Design/Levels/WaveConfig_1_5.asset.meta | 8 + Assets/Design/Levels/WaveConfig_1_6.asset | 33 ++ .../Design/Levels/WaveConfig_1_6.asset.meta | 8 + ...onfig_DefaultWorld1_NormalDifficulty.asset | 20 +- .../Levels/WaveConfig_World1_Level1.asset | 31 -- .../Scripts/Events/LastWaveCompletedEvent.cs | 3 + .../Events/LastWaveCompletedEvent.cs.meta | 11 + Assets/Scripts/Opponent/EnemyType.cs | 13 +- Assets/Scripts/VictoryDefeat.cs | 32 +- 27 files changed, 272 insertions(+), 649 deletions(-) delete mode 100644 Assets/Design/Levels/TestDrag&Drop.asset delete mode 100644 Assets/Design/Levels/TestGame.asset delete mode 100644 Assets/Design/Levels/WaveConfig01.asset create mode 100644 Assets/Design/Levels/WaveConfig_1_1.asset rename Assets/Design/Levels/{WaveConfig_World1_Level1.asset.meta => WaveConfig_1_1.asset.meta} (100%) create mode 100644 Assets/Design/Levels/WaveConfig_1_2.asset rename Assets/Design/Levels/{WaveConfig01.asset.meta => WaveConfig_1_2.asset.meta} (79%) create mode 100644 Assets/Design/Levels/WaveConfig_1_3.asset rename Assets/Design/Levels/{TestDrag&Drop.asset.meta => WaveConfig_1_3.asset.meta} (79%) create mode 100644 Assets/Design/Levels/WaveConfig_1_4.asset rename Assets/Design/Levels/{TestGame.asset.meta => WaveConfig_1_4.asset.meta} (79%) create mode 100644 Assets/Design/Levels/WaveConfig_1_5.asset create mode 100644 Assets/Design/Levels/WaveConfig_1_5.asset.meta create mode 100644 Assets/Design/Levels/WaveConfig_1_6.asset create mode 100644 Assets/Design/Levels/WaveConfig_1_6.asset.meta delete mode 100644 Assets/Design/Levels/WaveConfig_World1_Level1.asset create mode 100644 Assets/Scripts/Events/LastWaveCompletedEvent.cs create mode 100644 Assets/Scripts/Events/LastWaveCompletedEvent.cs.meta 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 :( } } } From c8d2e4332629c0f92ee9ccd1680cde81b529f4bc Mon Sep 17 00:00:00 2001 From: craftwill Date: Mon, 13 Nov 2023 20:03:28 -0500 Subject: [PATCH 4/4] Add timed victory and config changes --- Assets/Design/Levels/Level1.asset | 4 ++-- Assets/Design/Levels/Level2.asset | 4 ++-- Assets/Design/Levels/Level3.asset | 4 ++-- Assets/Design/Levels/Level4.asset | 4 ++-- Assets/Design/Levels/Level5.asset | 6 ++++-- Assets/Design/Levels/Level6.asset | 4 ++-- Assets/Scripts/LevelConfig/WaveConfig.cs | 1 + Assets/Scripts/LevelConfig/WaveObserver.cs | 13 ++++++++++++- Assets/Scripts/LevelManager/LevelManager.cs | 2 +- 9 files changed, 28 insertions(+), 14 deletions(-) diff --git a/Assets/Design/Levels/Level1.asset b/Assets/Design/Levels/Level1.asset index 6705b55..23e574f 100644 --- a/Assets/Design/Levels/Level1.asset +++ b/Assets/Design/Levels/Level1.asset @@ -249,7 +249,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: d8140ae36f1b7fd4fb1a57ab3dc69de4, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level2.asset b/Assets/Design/Levels/Level2.asset index 9f4a4ba..7c89056 100644 --- a/Assets/Design/Levels/Level2.asset +++ b/Assets/Design/Levels/Level2.asset @@ -193,7 +193,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: e9e134bb6a24e4647a27955d3d276bd2, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level3.asset b/Assets/Design/Levels/Level3.asset index 13c89a7..fd01a7b 100644 --- a/Assets/Design/Levels/Level3.asset +++ b/Assets/Design/Levels/Level3.asset @@ -195,7 +195,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: c22ff5f49b21f9844a4d9693dc06777c, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level4.asset b/Assets/Design/Levels/Level4.asset index 3033302..50684b7 100644 --- a/Assets/Design/Levels/Level4.asset +++ b/Assets/Design/Levels/Level4.asset @@ -225,7 +225,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: 5ccff833a19a71f4499a3b3d786f4d11, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level5.asset b/Assets/Design/Levels/Level5.asset index 70cb095..d4222a4 100644 --- a/Assets/Design/Levels/Level5.asset +++ b/Assets/Design/Levels/Level5.asset @@ -148,6 +148,8 @@ MonoBehaviour: _position: {x: -10, y: -1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -10, y: 0, z: 0} + - _tile: {fileID: 11400000, guid: 3723ba09738ef6245947ae3ba7978b21, type: 2} + _position: {x: -10, y: 1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} _position: {x: -9, y: -1, z: 0} - _tile: {fileID: 11400000, guid: e0b1d2d816ae5624c99b09a2bebb2a39, type: 2} @@ -195,7 +197,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: 2462ecbf554cf1d4883dea95b2504a9f, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Design/Levels/Level6.asset b/Assets/Design/Levels/Level6.asset index 1e61549..f455d8e 100644 --- a/Assets/Design/Levels/Level6.asset +++ b/Assets/Design/Levels/Level6.asset @@ -207,7 +207,7 @@ MonoBehaviour: _position: {x: 0, y: 0} _scale: {x: 1, y: 1} _waveConfig: {fileID: 11400000, guid: eee8fc46b43d8144ca603169dc9f26d6, type: 2} - _startPopulation: 5 - _startFood: 30 + _startPopulation: 10 + _startFood: 40 _startWood: 0 _startRock: 0 diff --git a/Assets/Scripts/LevelConfig/WaveConfig.cs b/Assets/Scripts/LevelConfig/WaveConfig.cs index afee1dd..3671260 100644 --- a/Assets/Scripts/LevelConfig/WaveConfig.cs +++ b/Assets/Scripts/LevelConfig/WaveConfig.cs @@ -43,6 +43,7 @@ public class WaveConfig : ScriptableObject return interval; } } + public float GameDuration { get { return _gameDuration; } } /** * Returns the updated game interval after adjusting to enemies spawned at the start */ diff --git a/Assets/Scripts/LevelConfig/WaveObserver.cs b/Assets/Scripts/LevelConfig/WaveObserver.cs index 5c1de7e..2ab3d1c 100644 --- a/Assets/Scripts/LevelConfig/WaveObserver.cs +++ b/Assets/Scripts/LevelConfig/WaveObserver.cs @@ -1,3 +1,5 @@ +using GatherAndDefend.Events; +using System.Threading.Tasks; using System.Collections.Generic; using UnityEngine; @@ -15,7 +17,7 @@ public class WaveObserver : Singleton private bool _once = true; private int _currentGroupIndex = 0; - public void SetLevelConfig(WaveConfig config) + public void Init(WaveConfig config) { _levelConfig = Object.Instantiate(config); _copyConstantSpawn = new List(); @@ -39,6 +41,15 @@ public class WaveObserver : Singleton } _groupSpawnTimers.Add(_levelConfig.NestedGroupSpawn[index].triggerTime); } + + // Start game timer, at the end, player wins. + GameTimer(); + } + + private async void GameTimer() + { + await Task.Delay((int) _levelConfig.GameDuration * 60 * 1000); + EventAggregator.Instance.GetEvent().Invoke(); } /** diff --git a/Assets/Scripts/LevelManager/LevelManager.cs b/Assets/Scripts/LevelManager/LevelManager.cs index 940bd8f..c1b1ea7 100644 --- a/Assets/Scripts/LevelManager/LevelManager.cs +++ b/Assets/Scripts/LevelManager/LevelManager.cs @@ -166,7 +166,7 @@ public class LevelManager : Singleton _currentLevel = level; _waveObserver = WaveObserver.Instance; - _waveObserver.SetLevelConfig(_currentLevel.WaveConfig); + _waveObserver.Init(_currentLevel.WaveConfig); Grid grid = Object.FindObjectOfType(); //create new grid if there is none if (!grid)