Merge branch 'dev' of https://bitbucket.clubconjure.com/scm/cegj/ludumdare50 into dev

Assets/Scenes/SampleScene.unity

@@ -498,6 +498,67 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 3328484984159178892, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
   m_PrefabInstance: {fileID: 647315810}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1638714736 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 632081106300030536, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+  m_PrefabInstance: {fileID: 1896701250}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1638714737 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+  m_PrefabInstance: {fileID: 1896701250}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1638714736}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1638714738
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1638714736}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 0
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 1638714737}
+          m_TargetAssemblyTypeName: UnityEngine.UI.Selectable, UnityEngine.UI
+          m_MethodName: Select
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
+  - eventID: 9
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 462706131}
+          m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine
+          m_MethodName: Play
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
 --- !u!82 &1880914075 stripped
 AudioSource:
   m_CorrespondingSourceObject: {fileID: 2620472401436852063, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
@@ -562,10 +623,34 @@ PrefabInstance:
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
       value: 
       objectReference: {fileID: 1880914075}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
       value: 
       objectReference: {fileID: 1880914075}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
+      value: Play
+      objectReference: {fileID: 0}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName
+      value: UnityEngine.AudioSource, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 3919079211556563161, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 4394421820928219480, guid: 7671830e57aa4bd4cab63b8399c6f825, type: 3}
       propertyPath: m_Name
       value: MainMenu

Assets/Scripts/Arena.cs

@@ -97,7 +97,7 @@ public class Arena : MonoBehaviour {
 			}
 			if(wave++ >= stats.increaseWaveStep){
 				if((currWaveSize += stats.waveIncrease) > stats.maxWaveSize) currWaveSize=stats.maxWaveSize;
-				print(currWaveSize);
+				// print(currWaveSize);
 			}
 			amountSpawned = 0;
 			lightAmountSpawned = 0;