Merge branch 'main' into DO-75-승패-함수-문제-해결

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

Assets/Script/Common/AudioManager.cs

@@ -64,7 +64,7 @@ public class AudioManager : Singleton<AudioManager>
     // 메인 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<AudioManager>
     
     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<AudioManager>
     {
         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)
         {
-            sfxAudioSource.PlayOneShot(GetAudioClip("Close Sound"), sfxVolume);
+            sfxAudioSource.PlayOneShot(GetAudioClip("CloseSound"), sfxVolume);
         }
     }
 
@@ -143,7 +143,7 @@ public class AudioManager : Singleton<AudioManager>
     {
         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)
         {
-            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)
         {
-            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)
         {
-            sfxAudioSource.PlayOneShot(GetAudioClip("Lose Sound"), sfxVolume);
+            sfxAudioSource.PlayOneShot(GetAudioClip("LoseSound"), sfxVolume);
         }
     }
 
@@ -175,7 +175,7 @@ public class AudioManager : Singleton<AudioManager>
     {
         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)
         {
-            sfxAudioSource.PlayOneShot(GetAudioClip("Draw Sound"), sfxVolume);
+            sfxAudioSource.PlayOneShot(GetAudioClip("DrawSound"), sfxVolume);
         }
     }
 
@@ -191,7 +191,7 @@ public class AudioManager : Singleton<AudioManager>
     {
         if (isPlaySFX && sfxAudioSource!=null)
         {
-            sfxAudioSource.PlayOneShot(GetAudioClip("Stone Sound"), sfxVolume);
+            sfxAudioSource.PlayOneShot(GetAudioClip("StoneSound"), sfxVolume);
         }
     }
 }

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()