From d29101526ef07455f201eec2d181452fc3cb5016 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 20:51:18 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=EC=8A=A4=ED=85=8C=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20BGM=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Gameton/Scenes/Stage 4.unity | 102 ++++++++++++++++++ .../Gameton/Scripts/Monster/MonsterSpawner.cs | 31 ++++++ .../Gameton/Scripts/Sound/SoundManager.cs | 10 ++ 3 files changed, 143 insertions(+) diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity index 17ab3d44..53ec2cac 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity @@ -20061,6 +20061,10 @@ MonoBehaviour: monsterPrefabB: {fileID: 0} bossPrefab: {fileID: 3667660097767351871, guid: ef14281ca23119941b755a7bff7ff6c8, type: 3} waveCounter: {fileID: 312801291} + _13StageSound: {fileID: 8300000, guid: 4f6e8dfda91d08a4ba54929ea80c3305, type: 3} + _46StageSound: {fileID: 8300000, guid: ee8fe21d7aa40914f94c8d6096ab5f45, type: 3} + _79StageSound: {fileID: 8300000, guid: dcc4a0adc983e3946af96ad9a7d8d239, type: 3} + _10StageSound: {fileID: 8300000, guid: d3e291fdf326c5644ae98d97b25436be, type: 3} --- !u!4 &1103604663 Transform: m_ObjectHideFlags: 0 @@ -34287,6 +34291,7 @@ GameObject: m_Component: - component: {fileID: 2068238029} - component: {fileID: 2068238028} + - component: {fileID: 2068238030} m_Layer: 0 m_Name: SoundManager m_TagString: Untagged @@ -34306,6 +34311,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 023ac119be3a3d24c816494653c341dc, type: 3} m_Name: m_EditorClassIdentifier: + bgSound: {fileID: 2068238030} --- !u!4 &2068238029 Transform: m_ObjectHideFlags: 0 @@ -34321,6 +34327,102 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2068238030 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068238027} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2135657550 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs index d79d8065..0537f5dd 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs @@ -40,6 +40,11 @@ namespace TON [SerializeField] public TextMeshProUGUI waveCounter; + public AudioClip _13StageSound; + public AudioClip _46StageSound; + public AudioClip _79StageSound; + public AudioClip _10StageSound; + // Start is called before the first frame update void Start() { @@ -89,6 +94,15 @@ namespace TON isWaitingForNextWave = true; StartCoroutine(StartNextWaveWithDelay()); } + + // 플레이어 존재 여부 확인 + var player = GameObject.Find("TON.Player").GetComponentInChildren(); + if (player == null && gameStarted) + { + // 플레이어가 죽었을 때 + SoundManager.instance.BgSoundPlay(null); + // 필요하다면 gameStarted = false; 등을 설정하여 한 번만 실행되게 함 + } } private void SpawnBossMonster() @@ -110,6 +124,23 @@ namespace TON StageManager.Singleton.SetWaveData(currentWave); // 웨이브 정보 전달. currentWave++; + + if (0 < currentWave && currentWave <= 3) + { + SoundManager.instance.BgSoundPlay(_13StageSound); // 1~3스테이지 배경음 + } + else if (3 < currentWave && currentWave <= 6) + { + SoundManager.instance.BgSoundPlay(_46StageSound); // 4~6스테이지 배경음 + } + else if (6 < currentWave && currentWave <= 9) + { + SoundManager.instance.BgSoundPlay(_79StageSound); // 7~9스테이지 배경음 + } + else if(currentWave == 10) + { + SoundManager.instance.BgSoundPlay(_10StageSound); // 10스테이지 배경음 + } if (currentWave > TOTAL_WAVES) { diff --git a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs index 2b096fe9..d32e1f2c 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs @@ -6,6 +6,8 @@ namespace TON { public class SoundManager : MonoBehaviour { + public AudioSource bgSound; + public static SoundManager instance; private void Awake() @@ -31,5 +33,13 @@ namespace TON Destroy(go, clip.length); } + + public void BgSoundPlay(AudioClip clip) + { + bgSound.clip = clip; + bgSound.loop = true; + bgSound.volume = 1f; + bgSound.Play(); + } } } From 94eb53919f8e0afcf668ec4cc9be8bf43c5f8235 Mon Sep 17 00:00:00 2001 From: uparupa95 Date: Sat, 1 Mar 2025 20:56:25 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EB=AA=AC=EC=8A=A4=ED=84=B0=20=EC=82=AC?= =?UTF-8?q?=EC=9A=B4=EB=93=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit attack, death, hit 사운드 적용 --- .../Pumpkin death.mp3 | 3 +++ .../Pumpkin death.mp3.meta | 23 +++++++++++++++++++ .../sound effect/monster/Levelup sound.mp3 | 3 +++ .../monster/Levelup sound.mp3.meta | 23 +++++++++++++++++++ .../monster/Monster Hit Sound.mp3 | 3 +++ .../monster/Monster Hit Sound.mp3.meta | 23 +++++++++++++++++++ .../sound effect/monster/Monster hit.mp3 | 4 ++-- .../monster/Ogre,Troll,Dino Die.mp3 | 3 +++ .../monster/Ogre,Troll,Dino Die.mp3.meta | 23 +++++++++++++++++++ .../monster/Rex,Dragon Attack.mp3 | 3 +++ .../monster/Rex,Dragon Attack.mp3.meta | 23 +++++++++++++++++++ .../sound effect/monster/Troll attack.mp3 | 3 +++ .../monster/Troll attack.mp3.meta | 23 +++++++++++++++++++ .../monster/pumpkin attack, Ogre Attack.mp3 | 3 +++ .../pumpkin attack, Ogre Attack.mp3.meta | 23 +++++++++++++++++++ .../Resources/MonsterPrefabs/BlueRex.prefab | 3 +++ .../Resources/MonsterPrefabs/GreenOgre.prefab | 3 +++ .../MonsterPrefabs/GreenPumpkin.prefab | 3 +++ .../Resources/MonsterPrefabs/GreenRex.prefab | 3 +++ .../MonsterPrefabs/GreenTroll.prefab | 3 +++ .../MonsterPrefabs/PurplePumpkin.prefab | 3 +++ .../Resources/MonsterPrefabs/RedDragon.prefab | 3 +++ .../Resources/MonsterPrefabs/RedOgre.prefab | 3 +++ .../Resources/MonsterPrefabs/RedRex.prefab | 3 +++ .../MonsterPrefabs/YellowPumpkin.prefab | 3 +++ 25 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3.meta diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3 new file mode 100644 index 00000000..13271b5b --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a5b6f6effd083e08daa92abbb44aa40fe2a8ca6694efb7699d10b8bd645e7d +size 9836 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3.meta new file mode 100644 index 00000000..bf211865 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/Pumpkin death.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b28bcc4f81c0b4241be9fd9d2f59604e +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3 new file mode 100644 index 00000000..aead212b --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:033b76b173293ac66c1a48f303279681dbe057429af48cc6af6f4496875ad9df +size 14074 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3.meta new file mode 100644 index 00000000..754c308f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Levelup sound.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 205332da33a32af498c7e76ae1250668 +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3 new file mode 100644 index 00000000..9ca2ea7f --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5579524c8af78ac72269cd694d117dfe2a92ab5d63a5e771ce1a12486ad7cc35 +size 55332 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3.meta new file mode 100644 index 00000000..e6103fb8 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster Hit Sound.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bbb6809f75e3f71468da0b8bf20187ba +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster hit.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster hit.mp3 index d13dcbe1..7a3222a8 100644 --- a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster hit.mp3 +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Monster hit.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:826dbc809460495f22c98e46cc7f9ae21551c8d351a0d8efc9929eb427e29642 -size 8327 +oid sha256:85265bb4d7cfc9ac132ff7218e8f121701030cfe3591b3467a4fd6fa10b7ba85 +size 8271 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3 new file mode 100644 index 00000000..8ec49f2c --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e97b7b13cbb3e0b05837d00649c71962ffd41c0d2acb43aef99cc765444297d1 +size 17270 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3.meta new file mode 100644 index 00000000..a350dc09 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Ogre,Troll,Dino Die.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 22b2ca228b3f8ee49b511d312127d757 +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3 new file mode 100644 index 00000000..bdb6e0ae --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a46e12c76812c437d86336d2b8b1272b76fd9d6af5b02f3ab809f11f254124e +size 41760 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3.meta new file mode 100644 index 00000000..b0c42685 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Rex,Dragon Attack.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 410601cdf0dc2194e8c95506d0f9410c +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3 new file mode 100644 index 00000000..b2166bb6 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ddae3f2c897f95a1fe806482988965c0090ee0aba6bb2cc6dda209d17682eb6 +size 17133 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3.meta new file mode 100644 index 00000000..0f7fd4ae --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/Troll attack.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0f19b48052aaaf249b0961eb5a51fce0 +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3 new file mode 100644 index 00000000..7717e2db --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd83e66ed21df28896dc0cb19351a342ce05677488bab9f2f01146f2e0ac6e45 +size 25344 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3.meta new file mode 100644 index 00000000..fd8b3163 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/monster/pumpkin attack, Ogre Attack.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0276d1771dc6b084da5731cd611b452a +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: diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab index 878c7948..d1930079 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/BlueRex.prefab @@ -643,3 +643,6 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab index 9e68a180..8df80318 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenOgre.prefab @@ -562,6 +562,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &7570151098365513060 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab index 7efe5b06..f99890bb 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenPumpkin.prefab @@ -229,6 +229,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3} + _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &3020795925047894191 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab index cd030d84..6227d762 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenRex.prefab @@ -229,6 +229,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &1425971833131969348 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab index af221c92..f5f6aaf0 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/GreenTroll.prefab @@ -568,6 +568,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0f19b48052aaaf249b0961eb5a51fce0, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &8136905868517816863 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab index 5002d525..e7996611 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/PurplePumpkin.prefab @@ -643,3 +643,6 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3} + _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab index a64a4fae..c84eb135 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedDragon.prefab @@ -305,6 +305,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &5762289934519905782 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab index eb59c08f..b658315a 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedOgre.prefab @@ -310,6 +310,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &4890974773502705404 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab index 14db5698..b175cac9 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/RedRex.prefab @@ -386,6 +386,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 410601cdf0dc2194e8c95506d0f9410c, type: 3} + _deathSound: {fileID: 8300000, guid: 22b2ca228b3f8ee49b511d312127d757, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &5557906192929727440 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab index 5cea9a63..0d918c53 100644 --- a/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab +++ b/Gameton-06/Assets/Gameton/Resources/MonsterPrefabs/YellowPumpkin.prefab @@ -384,6 +384,9 @@ MonoBehaviour: Gold: 0 Exp: 0 Score: 0 + _attackSound: {fileID: 8300000, guid: 0276d1771dc6b084da5731cd611b452a, type: 3} + _deathSound: {fileID: 8300000, guid: b28bcc4f81c0b4241be9fd9d2f59604e, type: 3} + _hitSound: {fileID: 8300000, guid: f48df33f7dda4a94aae097863d2e875d, type: 3} --- !u!1 &6732329482384499360 GameObject: m_ObjectHideFlags: 0 From 6ec2aaf5b5409bcad349f0c4aff0944fc1a9d465 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 20:57:02 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EC=BA=90=EB=A6=AD=ED=84=B0=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EC=82=AC=EC=9A=B4=EB=93=9C(=EA=B3=B5=EA=B2=A9,=20?= =?UTF-8?q?=ED=94=BC=EA=B2=A9,=20=EC=82=AC=EB=A7=9D)=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Gameton/Scripts/Character/CharacterBase.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs index 4844dcb2..d4c51a0f 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs @@ -40,7 +40,10 @@ namespace TON [SerializeField] private float mpRecoveryRate = 1f; // MP 회복량 [SerializeField] private float mpRecoveryInterval = 3f; // 회복 간격(초) [SerializeField] private bool isRecovering = false; - + + public AudioClip _attackSound; + public AudioClip _deathSound; + public AudioClip _hitSound; public void Start() { @@ -172,6 +175,8 @@ namespace TON isAttack = true; // 공격 애니메이션 적용 animator.Play("Default Attack"); + + SoundManager.instance.SFXPlay("Attack", _attackSound); // 공격 범위 Collider 활성화 attackCollider.EnableCollider(true); @@ -248,6 +253,7 @@ namespace TON if (currentHP <= 0f && prevHP > 0) { Dead(); + SoundManager.instance.SFXPlay("Death", _deathSound); } // 체력이 0 보다 클때만 피격 모션 실행 @@ -256,6 +262,7 @@ namespace TON if (damage < 10) { animator.SetTrigger("Hit Trigger"); + SoundManager.instance.SFXPlay("Hit", _hitSound); } } } From 1c31056e98712f1a12c0a6d07930ee56a8246d28 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 21:03:13 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=94=AC=20=EC=A0=84=ED=99=98=EB=90=A0?= =?UTF-8?q?=EB=95=8C=20=EC=9D=B4=EC=A0=84=20=EC=94=AC=20=EB=85=B8=EB=9E=98?= =?UTF-8?q?=20=EA=BA=BC=EC=A7=80=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Scripts/Sound/SoundManager.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs index d32e1f2c..a7c2e3f1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; namespace TON { @@ -22,6 +23,24 @@ namespace TON Destroy(gameObject); } } + + private void OnEnable() + { + // 씬 로드 이벤트에 리스너 등록 + SceneManager.sceneLoaded += OnSceneLoaded; + } + + private void OnDisable() + { + // 씬 로드 이벤트에서 리스너 제거 + SceneManager.sceneLoaded -= OnSceneLoaded; + } + + private void OnSceneLoaded(Scene scene, LoadSceneMode mode) + { + // 씬이 바뀔 때마다 배경 음악 종료 + BgSoundPlay(null); + } public void SFXPlay(string sfxName, AudioClip clip) { From eec08c14f17ab7e0c0be3024d765b582945f8634 Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 21:15:35 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EC=BA=90=EB=A6=AD=ED=84=B0=20=ED=94=BC?= =?UTF-8?q?=EA=B2=A9=20=EC=82=AC=EC=9A=B4=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Gameton/Scripts/Character/CharacterBase.cs | 4 +--- .../Assets/Gameton/Scripts/Sound/SoundManager.cs | 14 ++------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs index d4c51a0f..866118cf 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/CharacterBase.cs @@ -43,8 +43,7 @@ namespace TON public AudioClip _attackSound; public AudioClip _deathSound; - public AudioClip _hitSound; - + public void Start() { animator = GetComponent(); @@ -262,7 +261,6 @@ namespace TON if (damage < 10) { animator.SetTrigger("Hit Trigger"); - SoundManager.instance.SFXPlay("Hit", _hitSound); } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs index a7c2e3f1..8755af84 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Sound/SoundManager.cs @@ -17,6 +17,8 @@ namespace TON { instance = this; DontDestroyOnLoad(instance); + // 씬 로드 이벤트에 리스너 등록 + SceneManager.sceneLoaded += OnSceneLoaded; } else { @@ -24,18 +26,6 @@ namespace TON } } - private void OnEnable() - { - // 씬 로드 이벤트에 리스너 등록 - SceneManager.sceneLoaded += OnSceneLoaded; - } - - private void OnDisable() - { - // 씬 로드 이벤트에서 리스너 제거 - SceneManager.sceneLoaded -= OnSceneLoaded; - } - private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { // 씬이 바뀔 때마다 배경 음악 종료 From 90f7b9cd198ef0918eec73b0680110793ca26ccd Mon Sep 17 00:00:00 2001 From: uparupa95 Date: Sat, 1 Mar 2025 21:20:13 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EC=82=AC=EC=9A=B4=EB=93=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 플레이어 attack, death 업데이트 --- .../player sound.meta | 8 +++++++ .../player sound/Character Death.mp3 | 3 +++ .../Character Death.mp3.meta} | 2 +- .../player sound/Character normal attack.mp3 | 3 +++ .../Character normal attack.mp3.meta} | 2 +- .../player sound/Chracter Hit.mp3 | 3 +++ .../player sound/Chracter Hit.mp3.meta | 23 +++++++++++++++++++ .../character/Character death.mp3 | 3 --- .../Character death.mp3 | 3 --- .../Resources/Player/TON.Player_B.prefab | 6 +++++ .../Resources/Player/TON.Player_W.prefab | 6 +++++ 11 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound.meta create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3 rename Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/{sound effect/character/Character death.mp3.meta => player sound/Character Death.mp3.meta} (91%) create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3 rename Gameton-06/Assets/Gameton/{Resources/Arcade additional sounds/Character death.mp3.meta => Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3.meta} (91%) create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3 create mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3.meta delete mode 100644 Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3 delete mode 100644 Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound.meta new file mode 100644 index 00000000..75128c66 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d446aad3a2bbb64f81063aa72ba4831 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3 new file mode 100644 index 00000000..e5957edd --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdcbe34466df2045fcb9753f4afa2c95d7da6c73605a75fd0fee62dc02a3017f +size 52320 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3.meta similarity index 91% rename from Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3.meta rename to Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3.meta index 04b7adff..fc50b48f 100644 --- a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3.meta +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character Death.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 65232055f6eef9e448a7fe045b14e461 +guid: d5e7610e90cfd054b9c1fc1fef110d91 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3 new file mode 100644 index 00000000..d5f88f20 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68f75b3437dd3157aacfe8bbad022aa4bccb083f889913ff23507f493e26b7f8 +size 12538 diff --git a/Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3.meta similarity index 91% rename from Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3.meta rename to Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3.meta index 30a921ea..92599ee6 100644 --- a/Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3.meta +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Character normal attack.mp3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e82105a0d9784144ae38fc5230a777d +guid: 3aa1c6aa8a0b2c24487dde9a48e1d6da AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3 new file mode 100644 index 00000000..e2cad838 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3adc9eb00ee685b66cc8dc4015b98afb6cf936ade529bad3b4915014daa7f97d +size 24000 diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3.meta b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3.meta new file mode 100644 index 00000000..eee474db --- /dev/null +++ b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/player sound/Chracter Hit.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 365990a793283564aa391eddb2dc2c76 +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: diff --git a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3 b/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3 deleted file mode 100644 index 6bdf1e6b..00000000 --- a/Gameton-06/Assets/Gameton/Art/Sound/Arcade additional sounds/sound effect/character/Character death.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9bcef5148444ca9c2f3333f35f17b1a8df3d88a7d6456a60f3b4934d9ff6fe -size 22568 diff --git a/Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3 b/Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3 deleted file mode 100644 index 6bdf1e6b..00000000 --- a/Gameton-06/Assets/Gameton/Resources/Arcade additional sounds/Character death.mp3 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b9bcef5148444ca9c2f3333f35f17b1a8df3d88a7d6456a60f3b4934d9ff6fe -size 22568 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab index 04482d63..4c37b4a5 100644 --- a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab +++ b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_B.prefab @@ -380,6 +380,12 @@ MonoBehaviour: firePoint: {fileID: 3571909985532505043} attackCollider: {fileID: 3772826248857896723} rb: {fileID: 4986202531950816680} + mpRecoveryRate: 1 + mpRecoveryInterval: 3 + isRecovering: 0 + _attackSound: {fileID: 8300000, guid: 3aa1c6aa8a0b2c24487dde9a48e1d6da, type: 3} + _deathSound: {fileID: 8300000, guid: d5e7610e90cfd054b9c1fc1fef110d91, type: 3} + _hitSound: {fileID: 8300000, guid: 365990a793283564aa391eddb2dc2c76, type: 3} --- !u!1 &6930308287002930140 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab index 6cecda94..647ef398 100644 --- a/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab +++ b/Gameton-06/Assets/Gameton/Resources/Player/TON.Player_W.prefab @@ -349,6 +349,12 @@ MonoBehaviour: firePoint: {fileID: 3204799031628172313} attackCollider: {fileID: 5093782900058509363} rb: {fileID: 4986202531950816680} + mpRecoveryRate: 1 + mpRecoveryInterval: 3 + isRecovering: 0 + _attackSound: {fileID: 8300000, guid: 3aa1c6aa8a0b2c24487dde9a48e1d6da, type: 3} + _deathSound: {fileID: 8300000, guid: d5e7610e90cfd054b9c1fc1fef110d91, type: 3} + _hitSound: {fileID: 8300000, guid: 365990a793283564aa391eddb2dc2c76, type: 3} --- !u!1 &4475587780921916628 GameObject: m_ObjectHideFlags: 0 From f30495c93ce4506a2c4e97dfc21493b6ee84fb4c Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 21:22:25 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=EC=9B=A8=EC=9D=B4=EB=B8=8C=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=20=EC=8B=9C=20BGM=20=EC=A2=85=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs index 0537f5dd..2c070d8b 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs @@ -266,6 +266,8 @@ namespace TON { if (currentWave != 11 && GameObject.Find("TON.Player").GetComponentInChildren() != null) { + SoundManager.instance.BgSoundPlay(null); + float timer = nextWaveDelay; while (timer > 0) From fb9423ac25838666ae0f2b4fb2a8ef75208ad88b Mon Sep 17 00:00:00 2001 From: Mingu Kim Date: Sat, 1 Mar 2025 21:44:52 +0900 Subject: [PATCH 8/8] =?UTF-8?q?10=20=EC=9B=A8=EC=9D=B4=EB=B8=8C=20?= =?UTF-8?q?=EC=9D=B4=ED=9B=84=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=20=EB=82=98?= =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs index 2c070d8b..4a4b7b9d 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Monster/MonsterSpawner.cs @@ -89,7 +89,7 @@ namespace TON activeMonsters.RemoveAll(monster => monster == null); // 모든 몬스터가 죽었는지 확인하고 다음 웨이브 준비 - if (activeMonsters.Count == 0 && currentWave > 0 && !isWaitingForNextWave) + if (activeMonsters.Count == 0 && currentWave > 0 && currentWave < 11 && !isWaitingForNextWave) { isWaitingForNextWave = true; StartCoroutine(StartNextWaveWithDelay());