diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index f83655c..4066fea 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1457,7 +1457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &405965270916774547 RectTransform: m_ObjectHideFlags: 0 @@ -1727,7 +1727,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uBC15\uD638\uB7AD" + m_text: kjm m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -1813,7 +1813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8172929902404983356 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sounds/Click Sound.mp3 b/Assets/Resources/Sounds/ClickSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/Click Sound.mp3 rename to Assets/Resources/Sounds/ClickSound.mp3 diff --git a/Assets/Resources/Sounds/Click Sound.mp3.meta b/Assets/Resources/Sounds/ClickSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Click Sound.mp3.meta rename to Assets/Resources/Sounds/ClickSound.mp3.meta diff --git a/Assets/Resources/Sounds/Close Sound.mp3 b/Assets/Resources/Sounds/CloseSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/Close Sound.mp3 rename to Assets/Resources/Sounds/CloseSound.mp3 diff --git a/Assets/Resources/Sounds/Close Sound.mp3.meta b/Assets/Resources/Sounds/CloseSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Close Sound.mp3.meta rename to Assets/Resources/Sounds/CloseSound.mp3.meta diff --git a/Assets/Resources/Sounds/Coins ADD Sound.wav b/Assets/Resources/Sounds/CoinsAddSound.wav similarity index 100% rename from Assets/Resources/Sounds/Coins ADD Sound.wav rename to Assets/Resources/Sounds/CoinsAddSound.wav diff --git a/Assets/Resources/Sounds/Coins ADD Sound.wav.meta b/Assets/Resources/Sounds/CoinsAddSound.wav.meta similarity index 100% rename from Assets/Resources/Sounds/Coins ADD Sound.wav.meta rename to Assets/Resources/Sounds/CoinsAddSound.wav.meta diff --git a/Assets/Resources/Sounds/Coins Empty Sound.wav b/Assets/Resources/Sounds/CoinsEmptySound.wav similarity index 100% rename from Assets/Resources/Sounds/Coins Empty Sound.wav rename to Assets/Resources/Sounds/CoinsEmptySound.wav diff --git a/Assets/Resources/Sounds/Coins Empty Sound.wav.meta b/Assets/Resources/Sounds/CoinsEmptySound.wav.meta similarity index 100% rename from Assets/Resources/Sounds/Coins Empty Sound.wav.meta rename to Assets/Resources/Sounds/CoinsEmptySound.wav.meta diff --git a/Assets/Resources/Sounds/Coins Remove Sound.wav b/Assets/Resources/Sounds/CoinsRemoveSound.wav similarity index 100% rename from Assets/Resources/Sounds/Coins Remove Sound.wav rename to Assets/Resources/Sounds/CoinsRemoveSound.wav diff --git a/Assets/Resources/Sounds/Coins Remove Sound.wav.meta b/Assets/Resources/Sounds/CoinsRemoveSound.wav.meta similarity index 100% rename from Assets/Resources/Sounds/Coins Remove Sound.wav.meta rename to Assets/Resources/Sounds/CoinsRemoveSound.wav.meta diff --git a/Assets/Resources/Sounds/Draw Sound.mp3 b/Assets/Resources/Sounds/DrawSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/Draw Sound.mp3 rename to Assets/Resources/Sounds/DrawSound.mp3 diff --git a/Assets/Resources/Sounds/Draw Sound.mp3.meta b/Assets/Resources/Sounds/DrawSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Draw Sound.mp3.meta rename to Assets/Resources/Sounds/DrawSound.mp3.meta diff --git a/Assets/Resources/Sounds/Game Bgm.mp3 b/Assets/Resources/Sounds/GameBGM.mp3 similarity index 100% rename from Assets/Resources/Sounds/Game Bgm.mp3 rename to Assets/Resources/Sounds/GameBGM.mp3 diff --git a/Assets/Resources/Sounds/Game Bgm.mp3.meta b/Assets/Resources/Sounds/GameBGM.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Game Bgm.mp3.meta rename to Assets/Resources/Sounds/GameBGM.mp3.meta diff --git a/Assets/Resources/Sounds/Game Start Sound.mp3 b/Assets/Resources/Sounds/GameStartSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/Game Start Sound.mp3 rename to Assets/Resources/Sounds/GameStartSound.mp3 diff --git a/Assets/Resources/Sounds/Game Start Sound.mp3.meta b/Assets/Resources/Sounds/GameStartSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Game Start Sound.mp3.meta rename to Assets/Resources/Sounds/GameStartSound.mp3.meta diff --git a/Assets/Resources/Sounds/lose sound.mp3 b/Assets/Resources/Sounds/LoseSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/lose sound.mp3 rename to Assets/Resources/Sounds/LoseSound.mp3 diff --git a/Assets/Resources/Sounds/lose sound.mp3.meta b/Assets/Resources/Sounds/LoseSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/lose sound.mp3.meta rename to Assets/Resources/Sounds/LoseSound.mp3.meta diff --git a/Assets/Resources/Sounds/main bgm.mp3 b/Assets/Resources/Sounds/MainBGM.mp3 similarity index 100% rename from Assets/Resources/Sounds/main bgm.mp3 rename to Assets/Resources/Sounds/MainBGM.mp3 diff --git a/Assets/Resources/Sounds/main bgm.mp3.meta b/Assets/Resources/Sounds/MainBGM.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/main bgm.mp3.meta rename to Assets/Resources/Sounds/MainBGM.mp3.meta diff --git a/Assets/Resources/Sounds/Stone Sound.mp3 b/Assets/Resources/Sounds/StoneSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/Stone Sound.mp3 rename to Assets/Resources/Sounds/StoneSound.mp3 diff --git a/Assets/Resources/Sounds/Stone Sound.mp3.meta b/Assets/Resources/Sounds/StoneSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/Stone Sound.mp3.meta rename to Assets/Resources/Sounds/StoneSound.mp3.meta diff --git a/Assets/Resources/Sounds/win sound.mp3 b/Assets/Resources/Sounds/WinSound.mp3 similarity index 100% rename from Assets/Resources/Sounds/win sound.mp3 rename to Assets/Resources/Sounds/WinSound.mp3 diff --git a/Assets/Resources/Sounds/win sound.mp3.meta b/Assets/Resources/Sounds/WinSound.mp3.meta similarity index 100% rename from Assets/Resources/Sounds/win sound.mp3.meta rename to Assets/Resources/Sounds/WinSound.mp3.meta diff --git a/Assets/Script/Common/AudioManager.cs b/Assets/Script/Common/AudioManager.cs index 4397a6f..054e75d 100644 --- a/Assets/Script/Common/AudioManager.cs +++ b/Assets/Script/Common/AudioManager.cs @@ -64,7 +64,7 @@ public class AudioManager : Singleton // 메인 BGM을 재생하는 함수 public void PlayMainBGM() { - mainBgm = GetAudioClip("Main Bgm"); + mainBgm = GetAudioClip("MainBGM"); if (bgmAudioSource != null && mainBgm != null && !bgmAudioSource.isPlaying) { @@ -77,7 +77,7 @@ public class AudioManager : Singleton public void PlayGameBGM() { - gameBgm = GetAudioClip("Game Bgm"); + gameBgm = GetAudioClip("GameBGM"); if (bgmAudioSource != null && gameBgm != null && !bgmAudioSource.isPlaying) { @@ -126,7 +126,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource != null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Click Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("ClickSound"), sfxVolume); } } @@ -135,7 +135,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource != null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Close Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("CloseSound"), sfxVolume); } } @@ -143,7 +143,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Coins ADD Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("CoinsAddSound"), sfxVolume); } } @@ -151,7 +151,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Coins Empty Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("CoinsEmptySound"), sfxVolume); } } @@ -159,7 +159,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Coins Remove Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("CoinsRemoveSound"), sfxVolume); } } @@ -167,7 +167,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Lose Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("LoseSound"), sfxVolume); } } @@ -175,7 +175,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Win Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("WinSound"), sfxVolume); } } @@ -183,7 +183,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Draw Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("DrawSound"), sfxVolume); } } @@ -191,7 +191,7 @@ public class AudioManager : Singleton { if (isPlaySFX && sfxAudioSource!=null) { - sfxAudioSource.PlayOneShot(GetAudioClip("Stone Sound"), sfxVolume); + sfxAudioSource.PlayOneShot(GetAudioClip("StoneSound"), sfxVolume); } } } \ No newline at end of file diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index 07b35ff..9882b9d 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -138,6 +138,7 @@ public partial class GameLogic : IDisposable break; case Constants.MultiplayManagerState.ReceiveDrawRequest: Debug.Log("상대방의 무승부 요청 들어옴"); + TimerPause(); ExecuteOnMainThread(() => { GameManager.Instance.panelManager.OpenDrawConfirmPanel("무승부 요청을 승낙하시겠습니까?", () => @@ -153,6 +154,7 @@ public partial class GameLogic : IDisposable break; case Constants.MultiplayManagerState.DrawRequestSent: Debug.Log("무승부 요청 전송 완료"); + TimerPause(); break; case Constants.MultiplayManagerState.DrawAccepted: Debug.Log("무승부 요청이 승낙이 들어옴"); @@ -167,6 +169,7 @@ public partial class GameLogic : IDisposable break; case Constants.MultiplayManagerState.DrawRejected: Debug.Log("무승부 요청이 거부가 들어옴"); + TimerUnpause(); ExecuteOnMainThread(() => { GameManager.Instance.panelManager.OpenConfirmPanel("무승부 요청을 거부하였습니다.", () => { }); @@ -174,7 +177,7 @@ public partial class GameLogic : IDisposable break; case Constants.MultiplayManagerState.DrawRejectionConfirmed: Debug.Log("무승부 요청 거부 완료"); - + TimerUnpause(); break; case Constants.MultiplayManagerState.ReceiveTimeout: Debug.Log("상대방이 타임 아웃 됨"); @@ -529,6 +532,12 @@ public partial class GameLogic : IDisposable return AI_NAMIES[index]; } + // 타이머 일시정지 + private void TimerPause() => FioTimer.PauseTimer(); + + // 타이머 일시정지 해제 + private void TimerUnpause() => FioTimer.StartTimer(); + #endregion public void Dispose()