Merge pull request #76 from Degulleo/DO-68-패널-관련-버그-픽스
Do-68 [Fix] 사운드 리소스 이름 수정
This commit is contained in:
commit
a06f9809de
@ -1457,7 +1457,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &405965270916774547
|
--- !u!224 &405965270916774547
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -1727,7 +1727,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_text: "\uBC15\uD638\uB7AD"
|
m_text: kjm
|
||||||
m_isRightToLeft: 0
|
m_isRightToLeft: 0
|
||||||
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
||||||
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2}
|
||||||
@ -1813,7 +1813,7 @@ GameObject:
|
|||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &8172929902404983356
|
--- !u!224 &8172929902404983356
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -64,7 +64,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
// 메인 BGM을 재생하는 함수
|
// 메인 BGM을 재생하는 함수
|
||||||
public void PlayMainBGM()
|
public void PlayMainBGM()
|
||||||
{
|
{
|
||||||
mainBgm = GetAudioClip("Main Bgm");
|
mainBgm = GetAudioClip("MainBGM");
|
||||||
|
|
||||||
if (bgmAudioSource != null && mainBgm != null && !bgmAudioSource.isPlaying)
|
if (bgmAudioSource != null && mainBgm != null && !bgmAudioSource.isPlaying)
|
||||||
{
|
{
|
||||||
@ -77,7 +77,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
|
|
||||||
public void PlayGameBGM()
|
public void PlayGameBGM()
|
||||||
{
|
{
|
||||||
gameBgm = GetAudioClip("Game Bgm");
|
gameBgm = GetAudioClip("GameBGM");
|
||||||
|
|
||||||
if (bgmAudioSource != null && gameBgm != null && !bgmAudioSource.isPlaying)
|
if (bgmAudioSource != null && gameBgm != null && !bgmAudioSource.isPlaying)
|
||||||
{
|
{
|
||||||
@ -126,7 +126,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource != null)
|
if (isPlaySFX && sfxAudioSource != null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Click Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("ClickSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -135,7 +135,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource != null)
|
if (isPlaySFX && sfxAudioSource != null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Close Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("CloseSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,7 +143,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Coins ADD Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("CoinsAddSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -151,7 +151,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Coins Empty Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("CoinsEmptySound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,7 +159,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Coins Remove Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("CoinsRemoveSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,7 +167,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Lose Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("LoseSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -175,7 +175,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Win Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("WinSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,7 +183,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Draw Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("DrawSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -191,7 +191,7 @@ public class AudioManager : Singleton<AudioManager>
|
|||||||
{
|
{
|
||||||
if (isPlaySFX && sfxAudioSource!=null)
|
if (isPlaySFX && sfxAudioSource!=null)
|
||||||
{
|
{
|
||||||
sfxAudioSource.PlayOneShot(GetAudioClip("Stone Sound"), sfxVolume);
|
sfxAudioSource.PlayOneShot(GetAudioClip("StoneSound"), sfxVolume);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user