From 90f7b9cd198ef0918eec73b0680110793ca26ccd Mon Sep 17 00:00:00 2001 From: uparupa95 Date: Sat, 1 Mar 2025 21:20:13 +0900 Subject: [PATCH] =?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