From 2903d5ad541974640b0ed3af070b4b1f29c93529 Mon Sep 17 00:00:00 2001
From: Anna Matela <N2970@student.jamk.fi>
Date: Mon, 8 Feb 2021 20:46:02 +0200
Subject: [PATCH] some final adjustments
---
.../Assets/Prefabs/CollectibleHealth.prefab | 39 ++-
2D Beginner/Assets/Scenes/MainScene.unity | 234 +++++++++++++++++-
2D Beginner/Assets/Scripts/EnemyController.cs | 4 +-
.../Assets/Scripts/HealthCollectible.cs | 4 +-
4 files changed, 259 insertions(+), 22 deletions(-)
diff --git a/2D Beginner/Assets/Prefabs/CollectibleHealth.prefab b/2D Beginner/Assets/Prefabs/CollectibleHealth.prefab
index 32019f0..4baffd1 100644
--- a/2D Beginner/Assets/Prefabs/CollectibleHealth.prefab
+++ b/2D Beginner/Assets/Prefabs/CollectibleHealth.prefab
@@ -123,7 +123,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 611a43685f6ebf842bf42c4f01eb3d96, type: 3}
m_Name:
m_EditorClassIdentifier:
- healthCollectibleEffect: {fileID: 8770270086722398146}
+ healthCollectibleEffect: {fileID: 7717576903025370697, guid: 0624134e988c3a44c88d470af194518b, type: 3}
collectedClip: {fileID: 8300000, guid: af5f8b64e3f58f24c87ff8f789b04f6c, type: 3}
--- !u!1001 &3287435499969016934
PrefabInstance:
@@ -132,6 +132,38 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 3830083915671589380}
m_Modifications:
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: playOnAwake
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: InitialModule.startLifetime.scalar
+ value: 1.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].time
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].value
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: EmissionModule.m_Bursts.Array.data[0].countCurve.scalar
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inSlope
+ value: -1.6492764
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].inWeight
+ value: 0.13109761
+ objectReference: {fileID: 0}
+ - target: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
+ propertyPath: SizeModule.curve.maxCurve.m_Curve.Array.data[1].outSlope
+ value: -1.6492764
+ objectReference: {fileID: 0}
- target: {fileID: 7717576903025370697, guid: 0624134e988c3a44c88d470af194518b, type: 3}
propertyPath: m_Name
value: HealthCollectibleEffect
@@ -187,8 +219,3 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8872596001570984402, guid: 0624134e988c3a44c88d470af194518b, type: 3}
m_PrefabInstance: {fileID: 3287435499969016934}
m_PrefabAsset: {fileID: 0}
---- !u!198 &8770270086722398146 stripped
-ParticleSystem:
- m_CorrespondingSourceObject: {fileID: 6064399290308744100, guid: 0624134e988c3a44c88d470af194518b, type: 3}
- m_PrefabInstance: {fileID: 3287435499969016934}
- m_PrefabAsset: {fileID: 0}
diff --git a/2D Beginner/Assets/Scenes/MainScene.unity b/2D Beginner/Assets/Scenes/MainScene.unity
index 9328b46..1d21f7c 100644
--- a/2D Beginner/Assets/Scenes/MainScene.unity
+++ b/2D Beginner/Assets/Scenes/MainScene.unity
@@ -906,7 +906,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 112.59, y: -27}
+ m_AnchoredPosition: {x: 105.2, y: -23.3}
m_SizeDelta: {x: 225.17612, y: 54}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &376122158
@@ -1628,7 +1628,6 @@ GameObject:
m_Component:
- component: {fileID: 776108305}
- component: {fileID: 776108304}
- - component: {fileID: 776108303}
- component: {fileID: 776108306}
m_Layer: 0
m_Name: Main Camera
@@ -1637,14 +1636,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!81 &776108303
-AudioListener:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 776108302}
- m_Enabled: 1
--- !u!20 &776108304
Camera:
m_ObjectHideFlags: 0
@@ -1698,7 +1689,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 1714119085}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1794,6 +1786,67 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 2110435280929417719, guid: 8304b7a64eaaf8441abb739ad553a952, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 8304b7a64eaaf8441abb739ad553a952, type: 3}
+--- !u!1001 &825618710
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 463764463348568501, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_Name
+ value: Robot (2)
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_RootOrder
+ value: 63
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -10
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2806280457158708903, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_SortingOrder
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
--- !u!1 &838647359
GameObject:
m_ObjectHideFlags: 0
@@ -1969,6 +2022,124 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8304b7a64eaaf8441abb739ad553a952, type: 3}
+--- !u!1001 &906247282
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_RootOrder
+ value: 64
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -11.97
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 6.95
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3830083915671589380, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6033027262453235429, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+ propertyPath: m_Name
+ value: CollectibleHealth (4)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0dcad5d1b04f356479e4ed32c44a500b, type: 3}
+--- !u!1001 &926984316
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 463764463348568501, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_Name
+ value: Robot (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_RootOrder
+ value: 62
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 10.67
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 5.94
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2695008227923228907, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2806280457158708903, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
+ propertyPath: m_SortingOrder
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4118b564df9d40d41aaaebc95f661dbf, type: 3}
--- !u!1001 &945548381
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2782,7 +2953,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -353, y: 243.5}
+ m_AnchoredPosition: {x: -353, y: 240.7}
m_SizeDelta: {x: -713.72253, y: -498.94324}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1417320590
@@ -3358,6 +3529,45 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 2110435280929417719, guid: 8304b7a64eaaf8441abb739ad553a952, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 8304b7a64eaaf8441abb739ad553a952, type: 3}
+--- !u!1 &1714119084
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1714119085}
+ - component: {fileID: 1714119086}
+ m_Layer: 0
+ m_Name: Listener
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1714119085
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1714119084}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 10}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 776108305}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &1714119086
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1714119084}
+ m_Enabled: 1
--- !u!1 &1764730402
GameObject:
m_ObjectHideFlags: 0
diff --git a/2D Beginner/Assets/Scripts/EnemyController.cs b/2D Beginner/Assets/Scripts/EnemyController.cs
index 6c2beca..6cf3cdd 100644
--- a/2D Beginner/Assets/Scripts/EnemyController.cs
+++ b/2D Beginner/Assets/Scripts/EnemyController.cs
@@ -8,7 +8,7 @@ public class EnemyController : MonoBehaviour
public float changeTime = 2.0f; // the time before you reverse the enemy’s direction
public bool vertical;
public ParticleSystem smokeEffect;
- public AudioClip clip;
+ public AudioClip clipBroken;
Rigidbody2D rigidbody2D;
float timer; // will keep the current value of the timer
@@ -78,7 +78,7 @@ public class EnemyController : MonoBehaviour
{
player.ChangeHealth(-1);
- player.PlaySound(clip);
+ player.PlaySound(clipBroken);
}
}
diff --git a/2D Beginner/Assets/Scripts/HealthCollectible.cs b/2D Beginner/Assets/Scripts/HealthCollectible.cs
index 95cbae9..77ea236 100644
--- a/2D Beginner/Assets/Scripts/HealthCollectible.cs
+++ b/2D Beginner/Assets/Scripts/HealthCollectible.cs
@@ -4,7 +4,7 @@ using UnityEngine;
public class HealthCollectible : MonoBehaviour
{
- public ParticleSystem healthCollectibleEffect;
+ [SerializeField] private GameObject healthCollectibleEffect;
public AudioClip collectedClip;
void OnTriggerEnter2D(Collider2D other)
@@ -15,8 +15,8 @@ public class HealthCollectible : MonoBehaviour
{
if (controller.health < controller.maxHealth)
{
- // Instantiate(healthCollectibleEffect);
controller.ChangeHealth(1);
+ Instantiate(healthCollectibleEffect, transform.position, Quaternion.identity);
Destroy(gameObject); // This is the GameObject that the script is attached to (the collectible health pack)
controller.PlaySound(collectedClip);
--
GitLab