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

Merge branch 'main' into bugfix/spawnLevelConfigOddBehaviour

Browse Source
This commit is contained in:
craftwill 2024-06-23 18:36:14 -04:00
commit dcdc0d7fc8
14 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Design/Levels/Level1.asset
View File

@ -248,7 +248,7 @@ MonoBehaviour:
_renderLayer: Default _renderLayer: Default
_position: {x: 0, y: 0} _position: {x: 0, y: 0}
_scale: {x: 1, y: 1} _scale: {x: 1, y: 1}
_waveConfig: {fileID: 11400000, guid: 61b21509b3e4be0438ea87b4e7a73e17, type: 2} _waveConfig: {fileID: 11400000, guid: d8140ae36f1b7fd4fb1a57ab3dc69de4, type: 2}
_startPopulation: 10 _startPopulation: 10
_startFood: 40 _startFood: 40
_startWood: 0 _startWood: 0

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

@ -16,8 +16,16 @@ MonoBehaviour:
- _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3} - _enemy: {fileID: 80204295746100150, guid: 1be769d6ef642314b8846bed35e7297c, type: 3}
_count: 20 _count: 20
_nestedGroupSpawn: _nestedGroupSpawn:
- groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 2
triggerTime: 0.25
- groupSpawn: - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3} - _enemy: {fileID: 80204295746100150, guid: 5bbf0d85fa5bb3f4599da79f0a84e3a9, type: 3}
_count: 2 _count: 2
triggerTime: 2 triggerTime: 0.5
_gameDuration: 3 - groupSpawn:
- _enemy: {fileID: 80204295746100150, guid: 2419a879bd4e47d4fa8b30de0fcdde42, type: 3}
_count: 2
triggerTime: 0.75
_gameDuration: 1

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

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 30 _wood: 30
_rock: 0 _rock: 0
_food: 20 _food: 20
_cooldownInSeconds: 3 _cooldownInSeconds: 5

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

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 0 _wood: 0
_rock: 350 _rock: 350
_food: 0 _food: 0
_cooldownInSeconds: 3 _cooldownInSeconds: 30

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

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 40 _wood: 40
_rock: 0 _rock: 0
_food: 0 _food: 0
_cooldownInSeconds: 3 _cooldownInSeconds: 1

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: 3 _cooldownInSeconds: 1

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

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

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

@ -15,4 +15,4 @@ MonoBehaviour:
_wood: 50 _wood: 50
_rock: 0 _rock: 0
_food: 0 _food: 0
_cooldownInSeconds: 3 _cooldownInSeconds: 1

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: 3 _cooldownInSeconds: 10

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

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

2
Assets/Scripts/LevelManager/LevelManager.cs
View File

@ -164,6 +164,8 @@ public class LevelManager : Singleton<LevelManager>
ClearLevel(); ClearLevel();
Debug.Log("Load level: " + _currentLevel.name + " using " + _currentLevel.WaveConfig.name);
_currentLevel = level; _currentLevel = level;
_waveObserver = WaveObserver.Instance; _waveObserver = WaveObserver.Instance;
_waveObserver.Init(_currentLevel.WaveConfig); _waveObserver.Init(_currentLevel.WaveConfig);

4
Assets/Scripts/PlayerAction/ClickBehavior.cs
View File

@ -24,7 +24,7 @@ public class ClickBehavior : MonoBehaviour
} }
} }
#if UNITY_EDITOR /*#if UNITY_EDITOR
if (Input.GetMouseButtonUp(0)) if (Input.GetMouseButtonUp(0))
{ {
try try
@ -45,7 +45,7 @@ public class ClickBehavior : MonoBehaviour
} }
} }
#endif #endif*/
} }
/// <summary> /// <summary>

13
Assets/Scripts/WorldMap/WorldMapSave.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using System.IO; using System.IO;
using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization.Formatters.Binary;
using System.Linq;
public class WorldMapSave public class WorldMapSave
{ {
@ -20,9 +21,10 @@ public class WorldMapSave
public void WorldInitialition() public void WorldInitialition()
{ {
filePath = Application.persistentDataPath + "/data.dat"; filePath = Application.persistentDataPath + "/data.dat";
Debug.Log("Filepath world save: " + Application.persistentDataPath + " + \"/data.dat\"");
if (File.Exists(filePath)) if (File.Exists(filePath))
{ {
ReadData(); ReadData();
@ -60,7 +62,7 @@ public class WorldMapSave
} }
// If LevelState.SAVED not find // If LevelState.SAVED not find
return -1; return 0;
} }
public void UnlockNextLevel() public void UnlockNextLevel()
@ -69,6 +71,13 @@ public class WorldMapSave
ReadData(); ReadData();
//int actuelLevel = PlayerPrefs.GetInt(LevelToLoad,NoLevel); //int actuelLevel = PlayerPrefs.GetInt(LevelToLoad,NoLevel);
//Debug.Log(actuelLevel); //Debug.Log(actuelLevel);
if (levelUnlocked.Length <= 0)
{
Debug.LogError("Why is LevelUnlocked list empty?");
return;
}
levelUnlocked[GetSavedLevelIndex() + 1] = LevelState.SAVED; levelUnlocked[GetSavedLevelIndex() + 1] = LevelState.SAVED;
levelUnlocked[GetSavedLevelIndex()] = LevelState.UNLOCKED; levelUnlocked[GetSavedLevelIndex()] = LevelState.UNLOCKED;
WriteData(); WriteData();

3
ProjectSettings/ProjectSettings.asset
View File

@ -135,8 +135,7 @@ 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