Merge pull request #88 from Degulleo/DO-83-사운드-추가-및-적용
Do 83 사운드 추가 및 적용
This commit is contained in:
commit
56050e0a9d
BIN
Assets/Resources/Sounds/ErrorSound.mp3
Normal file
BIN
Assets/Resources/Sounds/ErrorSound.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/ErrorSound.mp3.meta
Normal file
23
Assets/Resources/Sounds/ErrorSound.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8b6eda2c005124d48a7b862a955c2ac1
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/RatingDownSound.mp3
Normal file
BIN
Assets/Resources/Sounds/RatingDownSound.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/RatingDownSound.mp3.meta
Normal file
23
Assets/Resources/Sounds/RatingDownSound.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d946cc47f6d6a8348ad0c8bdf8dc0afe
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/RatingSound.mp3
Normal file
BIN
Assets/Resources/Sounds/RatingSound.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/RatingSound.mp3.meta
Normal file
23
Assets/Resources/Sounds/RatingSound.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6b8dc6e53098cf8479a556c57166c0dc
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/RatingUpSound.mp3
Normal file
BIN
Assets/Resources/Sounds/RatingUpSound.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/RatingUpSound.mp3.meta
Normal file
23
Assets/Resources/Sounds/RatingUpSound.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 314c364bf0413db4e871e937f6065d9c
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound2.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound2.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound2.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound2.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4d09a9fde068d764d96f25c744b808e6
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound3.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound3.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound3.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound3.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a0eb62de2ee82f44b9f56bc99bc49cf4
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound4.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound4.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound4.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound4.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 602218e89f800b5409e1db0adbe3b7e9
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound5.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound5.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound5.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound5.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1cd5f8e7c3c90b47bf7d39de60e83dd
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound6.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound6.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound6.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound6.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 404172c1dace08449b9ba215dd1e4e7a
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
Assets/Resources/Sounds/StoneSound7.mp3
Normal file
BIN
Assets/Resources/Sounds/StoneSound7.mp3
Normal file
Binary file not shown.
23
Assets/Resources/Sounds/StoneSound7.mp3.meta
Normal file
23
Assets/Resources/Sounds/StoneSound7.mp3.meta
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ffa674672ea5fdd438dc98a27b2394b7
|
||||||
|
AudioImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 7
|
||||||
|
defaultSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
loadType: 0
|
||||||
|
sampleRateSetting: 0
|
||||||
|
sampleRateOverride: 44100
|
||||||
|
compressionFormat: 1
|
||||||
|
quality: 1
|
||||||
|
conversionMode: 0
|
||||||
|
preloadAudioData: 0
|
||||||
|
platformSettingOverrides: {}
|
||||||
|
forceToMono: 0
|
||||||
|
normalize: 1
|
||||||
|
loadInBackground: 0
|
||||||
|
ambisonic: 0
|
||||||
|
3D: 1
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Binary file not shown.
@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 1613a4bf934e4d043b4e50b1b74c16b5
|
guid: 767120737a3407142b97ca108f21d1d1
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 7
|
serializedVersion: 7
|
||||||
|
@ -121,7 +121,6 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
PlayBGM();
|
PlayBGM();
|
||||||
}
|
}
|
||||||
|
|
||||||
// 클릭 사운드(SFX) 재생
|
|
||||||
public void PlayClickSound()
|
public void PlayClickSound()
|
||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource != null)
|
if (isPlaySFX && sfxAudioSource != null)
|
||||||
@ -130,7 +129,6 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 닫기 사운드(SFX) 재생
|
|
||||||
public void PlayCloseSound()
|
public void PlayCloseSound()
|
||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource != null)
|
if (isPlaySFX && sfxAudioSource != null)
|
||||||
@ -191,7 +189,40 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("StoneSound"), sfxVolume);
|
int randomIndex = UnityEngine.Random.Range(1, 8);
|
||||||
|
sfxAudioSource.PlayOneShot(GetAudioClip("StoneSound"+randomIndex), sfxVolume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayRatingSound()
|
||||||
|
{
|
||||||
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
|
{
|
||||||
|
sfxAudioSource.PlayOneShot(GetAudioClip("RatingSound"), sfxVolume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayRatingUpSound()
|
||||||
|
{
|
||||||
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
|
{
|
||||||
|
sfxAudioSource.PlayOneShot(GetAudioClip("RatingUpSound"), sfxVolume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayRatingDownSound()
|
||||||
|
{
|
||||||
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
|
{
|
||||||
|
sfxAudioSource.PlayOneShot(GetAudioClip("RatingDownSound"), sfxVolume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void PlayErrorSound()
|
||||||
|
{
|
||||||
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
|
{
|
||||||
|
sfxAudioSource.PlayOneShot(GetAudioClip("ErrorSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -57,6 +57,8 @@ public class GameManager : Singleton<GameManager>
|
|||||||
{
|
{
|
||||||
if (_camera != null)
|
if (_camera != null)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayErrorSound(); //사운드 추가
|
||||||
|
|
||||||
_camera.transform.DOShakePosition(0.5f, 0.5f).OnComplete(() =>
|
_camera.transform.DOShakePosition(0.5f, 0.5f).OnComplete(() =>
|
||||||
{
|
{
|
||||||
_camera.transform.position = new Vector3(0,0,-10);
|
_camera.transform.position = new Vector3(0,0,-10);
|
||||||
|
@ -36,6 +36,8 @@ public partial class GameLogic
|
|||||||
{
|
{
|
||||||
if (_board[row, col] != Enums.PlayerType.None) return;
|
if (_board[row, col] != Enums.PlayerType.None) return;
|
||||||
|
|
||||||
|
AudioManager.Instance.PlayStoneSound(); //사운드 추가
|
||||||
|
|
||||||
switch (playerType)
|
switch (playerType)
|
||||||
{
|
{
|
||||||
case Enums.PlayerType.PlayerA:
|
case Enums.PlayerType.PlayerA:
|
||||||
|
@ -14,6 +14,8 @@ public class DrawEffectController : EffectController
|
|||||||
|
|
||||||
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayDrawSound(); //사운드 추가
|
||||||
|
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
onEffectPanelEnded = onEffectPanelEnd;
|
onEffectPanelEnded = onEffectPanelEnd;
|
||||||
|
@ -14,6 +14,8 @@ public class LoseEffectController : EffectController
|
|||||||
|
|
||||||
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayLoseSound(); //사운드 추가
|
||||||
|
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
onEffectPanelEnded = onEffectPanelEnd;
|
onEffectPanelEnded = onEffectPanelEnd;
|
||||||
|
@ -14,6 +14,8 @@ public class RatingDownEffectController : EffectController
|
|||||||
|
|
||||||
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayRatingDownSound(); //사운드 추가
|
||||||
|
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
onEffectPanelEnded = onEffectPanelEnd;
|
onEffectPanelEnded = onEffectPanelEnd;
|
||||||
|
@ -16,6 +16,8 @@ public class RatingUpEffectController : EffectController
|
|||||||
|
|
||||||
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayRatingUpSound(); //사운드 추가
|
||||||
|
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
onEffectPanelEnded = onEffectPanelEnd;
|
onEffectPanelEnded = onEffectPanelEnd;
|
||||||
|
@ -16,6 +16,8 @@ public class WinEffectController : EffectController
|
|||||||
|
|
||||||
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
public override void ShowEffect(OnEffectPanelEnded onEffectPanelEnd)
|
||||||
{
|
{
|
||||||
|
AudioManager.Instance.PlayWinSound(); //사운드 추가
|
||||||
|
|
||||||
gameObject.SetActive(true);
|
gameObject.SetActive(true);
|
||||||
cancellationTokenSource = new CancellationTokenSource();
|
cancellationTokenSource = new CancellationTokenSource();
|
||||||
onEffectPanelEnded = onEffectPanelEnd;
|
onEffectPanelEnded = onEffectPanelEnd;
|
||||||
|
@ -32,6 +32,12 @@ public class RatingPointsController : MonoBehaviour
|
|||||||
|
|
||||||
sequence.Append(
|
sequence.Append(
|
||||||
imageOBject.GetComponent<Transform>().DOLocalRotate(new Vector3(0f, 90f, 0f), flipDuration).SetEase(Ease.InExpo));
|
imageOBject.GetComponent<Transform>().DOLocalRotate(new Vector3(0f, 90f, 0f), flipDuration).SetEase(Ease.InExpo));
|
||||||
|
|
||||||
|
sequence.AppendCallback(() =>
|
||||||
|
{
|
||||||
|
AudioManager.Instance.PlayRatingSound(); //사운드 추가
|
||||||
|
});
|
||||||
|
|
||||||
sequence.Append(
|
sequence.Append(
|
||||||
imageOBject.GetComponent<Transform>().DOLocalRotate(Vector3.zero, flipDuration).SetEase(Ease.OutExpo));
|
imageOBject.GetComponent<Transform>().DOLocalRotate(Vector3.zero, flipDuration).SetEase(Ease.OutExpo));
|
||||||
sequence.Join(
|
sequence.Join(
|
||||||
|
Loading…
x
Reference in New Issue
Block a user