Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/WhaleAdventure_VR
# Conflicts:dsdsgaaggdag # Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
|
||||
public class StarPickup : MonoBehaviour
|
||||
{
|
||||
@@ -19,7 +20,11 @@ public class StarPickup : MonoBehaviour
|
||||
|
||||
[Header("Sound")]
|
||||
public AudioClip pickupSound;
|
||||
|
||||
|
||||
[Header("Events")]
|
||||
[Tooltip("별을 먹었을 때 발생하는 이벤트입니다.")]
|
||||
public UnityEvent onCollected;
|
||||
|
||||
private Vector3 startPosition;
|
||||
|
||||
void Awake()
|
||||
@@ -63,11 +68,13 @@ public void CollectStar()
|
||||
Debug.LogWarning("CollectionManager not found.");
|
||||
}
|
||||
|
||||
if (pickupSound != null && pickupSound != null)
|
||||
if (pickupSound != null)
|
||||
{
|
||||
SoundManager.Instance.PlaySFX(pickupSound);
|
||||
}
|
||||
|
||||
onCollected?.Invoke();
|
||||
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
|
||||
BIN
Assets/04_Models/VRPlayer.prefab
LFS
BIN
Assets/04_Models/VRPlayer.prefab
LFS
Binary file not shown.
Reference in New Issue
Block a user