diff --git a/Assets/Scenes/GamePlayer.unity b/Assets/Scenes/GamePlayer.unity index ee59d80..82e0af8 100644 --- a/Assets/Scenes/GamePlayer.unity +++ b/Assets/Scenes/GamePlayer.unity @@ -455,6 +455,37 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &157908646 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 157908647} + m_Layer: 0 + m_Name: Berries + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &157908647 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 157908646} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &211523163 GameObject: m_ObjectHideFlags: 0 @@ -1609,6 +1640,7 @@ MonoBehaviour: restartButton: {fileID: 0} backButton: {fileID: 0} lastMoveTime: 0 + berryParent: {fileID: 157908646} --- !u!1 &527090675 GameObject: m_ObjectHideFlags: 0 @@ -3145,7 +3177,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 99cb5320fee003746a29683a53dd3337, type: 3} + m_audioClip: {fileID: 0} m_Resource: {fileID: 8300000, guid: 99cb5320fee003746a29683a53dd3337, type: 3} m_PlayOnAwake: 1 m_Volume: 1 @@ -3740,3 +3772,4 @@ SceneRoots: - {fileID: 808236451} - {fileID: 1811565639} - {fileID: 1035262213} + - {fileID: 157908647} diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs index 72f482f..b4d51a7 100644 --- a/Assets/Scripts/GamePlayer.cs +++ b/Assets/Scripts/GamePlayer.cs @@ -34,12 +34,13 @@ public class GamePlayer : MonoBehaviour private float nextUpdate; private float fps; public SpriteRenderer overlayRender; - public GameObject leftArrow; - public GameObject rightArrow; - public GameObject jumpArrow; - public GameObject restartButton; - public GameObject backButton; - public float lastMoveTime; + private GameObject leftArrow; + private GameObject rightArrow; + private GameObject jumpArrow; + private GameObject restartButton; + private GameObject backButton; + private float lastMoveTime; + public GameObject berryParent; void Start() { @@ -347,47 +348,36 @@ public class GamePlayer : MonoBehaviour float spawnProbability = Random.value; if (!pausePanel.activeSelf) { - GameObject newBerry; - SpriteRenderer spriteRenderer; + GameObject newBerry = new("Berry"); + newBerry.transform.SetParent(berryParent.transform); + SpriteRenderer spriteRenderer = newBerry.AddComponent(); if (spawnProbability <= 0.6f) { - newBerry = new GameObject("Berry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/Berry"); newBerry.tag = "NormalBerry"; } else if (spawnProbability <= 0.65f) { - newBerry = new GameObject("PoisonBerry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/PoisonBerry"); newBerry.tag = "PoisonBerry"; } else if (spawnProbability <= 0.75f) { - newBerry = new GameObject("SlowBerry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/SlowBerry"); newBerry.tag = "SlowBerry"; } else if (spawnProbability <= 0.85f) { - newBerry = new GameObject("UltraBerry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/UltraBerry"); newBerry.tag = "UltraBerry"; } else if (spawnProbability <= 0.95f) { - newBerry = new GameObject("SpeedyBerry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/SpeedyBerry"); newBerry.tag = "SpeedyBerry"; } else { - newBerry = new GameObject("CoinBerry"); - spriteRenderer = newBerry.AddComponent(); spriteRenderer.sprite = Resources.Load("Berries/CoinBerry"); newBerry.tag = "CoinBerry"; }