Merge branch 'master' into feature/Level

# Conflicts:
#	Assets/_Game/Scenes/Levels/Level15.unity

Assets/Resources/LevelSelect/Level13.png.meta

+fileFormatVersion: 2
+guid: 7e6ab90328c64eb42912d0b1f951661b
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/LevelSelect/Level14.png.meta

+fileFormatVersion: 2
+guid: 1b8fdd0702d61f64e9387ab1e910d911
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 7
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Game/Animations/Cannon/CannonAnimator.controller

@@ -13,7 +13,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -27,6 +27,30 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &1101038863132271820
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Fire
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102222599320385362}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &1101399011918543454
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -109,6 +133,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 1101399011918543454}
+  - {fileID: 1101038863132271820}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0

Assets/_Game/Prefabs/Player.prefab

@@ -178,7 +178,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.95, y: 0.95}
+  m_Size: {x: 0.85, y: 0.95}
   m_EdgeRadius: 0
 --- !u!95 &95392249558912674
 Animator:

Assets/_Game/Scripts/LevelSelectController.cs

@@ -4,23 +4,20 @@ using UnityEngine;
 using UnityEngine.UI;
 
 public class LevelSelectController : MonoBehaviour {
-	//[SerializeField] private GameObject levelButtonPrefab;
 	[SerializeField] private GameObject pagePrefab;
 	[SerializeField] private int nonPageObjects = 3;
-	private int highestLevel;
-	private int lastLevel;
 	
 	private void Start() {
 		InitalizeLevelSelect();
 	}
 
 	/// <summary>
-	/// Locks all currently not unlocked levels
+	/// Initializes LevelSelect
 	/// </summary>
 	public void InitalizeLevelSelect()
 	{
-		highestLevel = GameManager.Instance.HighestLevel;
-		lastLevel = GameManager.Instance.LastLevel;
+		int highestLevel = GameManager.Instance.HighestLevel;
+		int lastLevel = GameManager.Instance.LastLevel;
 		int pagesNeeded = lastLevel / 6 + 1;
 		int buttonsOnLastPage = lastLevel % 6;
 		GameObject currentPage;
@@ -36,24 +33,21 @@ public class LevelSelectController : MonoBehaviour {
 				String buttonName = "ButtonLevel" + j;
 				int levelNr = j + (currentPage.GetComponent<LevelSelectPageController>().PageNr-1) * 6;
 
-				if (GameObject.Find(buttonName) != null)
+				GameObject button = currentPage.transform.Find(buttonName).gameObject;
+				Image image = button.transform.Find("Image").GetComponent<Image>();
+				// Level unlocked
+				if (levelNr <= highestLevel)
 				{
-					GameObject button = currentPage.transform.Find(buttonName).gameObject;
-					Image image = button.transform.Find("Image").GetComponent<Image>();
-					// Level unlocked
-					if (levelNr <= highestLevel)
-					{
-						string loadStr = levelNr < 10 ? "LevelSelect/Level0" + levelNr : "LevelSelect/Level" + levelNr;
-						image.sprite = Resources.Load(loadStr, typeof(Sprite)) as Sprite;
-						button.transform.Find("Text").gameObject.GetComponent<TextMeshProUGUI>().text = levelNr + "";
-						button.GetComponent<Button>().interactable = true;
-					}
-					// Level locked
-					else if (levelNr <= lastLevel)
-					{
-						image.sprite = Resources.Load("LevelSelect/lockedTEMP", typeof(Sprite)) as Sprite;
-						button.GetComponent<Button>().interactable = false;
-					}
+					string loadStr = levelNr < 10 ? "LevelSelect/Level0" + levelNr : "LevelSelect/Level" + levelNr;
+					image.sprite = Resources.Load(loadStr, typeof(Sprite)) as Sprite;
+					button.transform.Find("Text").gameObject.GetComponent<TextMeshProUGUI>().text = levelNr + "";
+					button.GetComponent<Button>().interactable = true;
+				}
+				// Level locked
+				else if (levelNr <= lastLevel)
+				{
+					image.sprite = Resources.Load("LevelSelect/lockedTEMP", typeof(Sprite)) as Sprite;
+					button.GetComponent<Button>().interactable = false;
 				}
 			}
 			
@@ -66,7 +60,7 @@ public class LevelSelectController : MonoBehaviour {
 			{
 				currentPage.transform.Find("ButtonNextPage").gameObject.SetActive(false);
 				
-				// Deactivate not needed buttons
+				// Deactivate not needed level buttons
 				if (buttonsOnLastPage != 0)
 				{
 					for (int j = 6; j > buttonsOnLastPage; j--)
@@ -86,27 +80,17 @@ public class LevelSelectController : MonoBehaviour {
 	private void DisablePagesAfterFirst() {
 		bool firstPage = true;
 		foreach (GameObject page in GameObject.FindGameObjectsWithTag("LevelSelectPage")) {
-			if (firstPage) {
+			if (firstPage) 
+			{
 				firstPage = false;
-			} else {
+			} 
+			else 
+			{
 				page.SetActive(false);
 			}
 		}
 	}
 
-	/// <summary>
-	/// Ensures all pages are active before loading "locked" images
-	/// </summary>
-	private void ActivateAllPages() {
-		foreach (GameObject page in GameObject.FindGameObjectsWithTag("LevelSelectPage")) {
-			page.SetActive(true);
-		}
-	}
-
-	public void LoadLevel(int level) {
-		GameManager.Instance.LoadLevel(level);
-	}
-
 	public void ShowNextPage(int pageNr)
 	{
 		GameObject canvas = transform.Find("Canvas").gameObject;

Assets/_Game/Scripts/LevelSelectPageController.cs

@@ -8,7 +8,6 @@ public class LevelSelectPageController : MonoBehaviour {
 	public void LoadLevel(int level)
 	{
 		level += (PageNr-1) * 6;
-		Debug.Log("Load level " + level);
 		GameManager.Instance.LoadLevel(level);
 	}