Pull request #68: Design/summerBalance

Merge in CGD/gather-and-defend from design/summerBalance to main

* commit '7e9385db30127a2b7a5ca4703a168393f0b68adc':
  revert object instantiate on level config
  Cards and level spawning balance testing, Fixed some error logs

Assets/Design/Levels/Level1.asset

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

Assets/Design/Levels/WaveConfig_1_1.asset

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

Assets/Design/UnitCards/Archer.asset

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

Assets/Design/UnitCards/Castle.asset

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

Assets/Design/UnitCards/Farm.asset

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

Assets/Design/UnitCards/Farmer.asset

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

Assets/Design/UnitCards/FarmerMob.asset

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

Assets/Design/UnitCards/House.asset

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

Assets/Design/UnitCards/Knight.asset

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

Assets/Design/UnitCards/Mill.asset

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

Assets/Scripts/LevelManager/LevelManager.cs

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

Assets/Scripts/PlayerAction/ClickBehavior.cs

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

Assets/Scripts/WorldMap/WorldMapSave.cs

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

ProjectSettings/ProjectSettings.asset

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