diff --git a/assets/resources/music/Attack_01.wav b/assets/resources/music/Attack_01.wav deleted file mode 100644 index bb22ab1b..00000000 Binary files a/assets/resources/music/Attack_01.wav and /dev/null differ diff --git a/assets/resources/music/Attack_02.wav b/assets/resources/music/Attack_02.wav deleted file mode 100644 index 95281d59..00000000 Binary files a/assets/resources/music/Attack_02.wav and /dev/null differ diff --git a/assets/resources/music/BATTLE.mp3 b/assets/resources/music/BATTLE.mp3 new file mode 100644 index 00000000..9b1e6409 Binary files /dev/null and b/assets/resources/music/BATTLE.mp3 differ diff --git a/assets/resources/music/BATTLE.wav.meta b/assets/resources/music/BATTLE.mp3.meta similarity index 72% rename from assets/resources/music/BATTLE.wav.meta rename to assets/resources/music/BATTLE.mp3.meta index 6733834d..4478a018 100644 --- a/assets/resources/music/BATTLE.wav.meta +++ b/assets/resources/music/BATTLE.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "7077f9ac-0d7f-49b2-b1fc-258f48ebcb92", + "uuid": "db35468f-265d-4465-86ba-5186c6c1d0a2", "files": [ ".json", - ".wav" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/resources/music/BATTLE.wav b/assets/resources/music/BATTLE.wav deleted file mode 100644 index de3f8ecc..00000000 Binary files a/assets/resources/music/BATTLE.wav and /dev/null differ diff --git a/assets/resources/music/Critical.mp3 b/assets/resources/music/Critical.mp3 new file mode 100644 index 00000000..6b503ca7 Binary files /dev/null and b/assets/resources/music/Critical.mp3 differ diff --git a/assets/resources/music/Attack_01.wav.meta b/assets/resources/music/Critical.mp3.meta similarity index 72% rename from assets/resources/music/Attack_01.wav.meta rename to assets/resources/music/Critical.mp3.meta index 0720de40..6252d843 100644 --- a/assets/resources/music/Attack_01.wav.meta +++ b/assets/resources/music/Critical.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "9d34eb17-93b0-4e19-817e-aa289eebf54e", + "uuid": "82584d50-d744-4717-bba9-a74cf21c136d", "files": [ ".json", - ".wav" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/resources/music/Critical.wav b/assets/resources/music/Critical.wav deleted file mode 100644 index c229bbad..00000000 Binary files a/assets/resources/music/Critical.wav and /dev/null differ diff --git a/assets/resources/music/Fire.mp3 b/assets/resources/music/Fire.mp3 new file mode 100644 index 00000000..56a8c4b6 Binary files /dev/null and b/assets/resources/music/Fire.mp3 differ diff --git a/assets/resources/music/Critical.wav.meta b/assets/resources/music/Fire.mp3.meta similarity index 72% rename from assets/resources/music/Critical.wav.meta rename to assets/resources/music/Fire.mp3.meta index 84c7ae18..9d7a20d1 100644 --- a/assets/resources/music/Critical.wav.meta +++ b/assets/resources/music/Fire.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "55262788-4684-484b-9273-5af16c12690d", + "uuid": "b03d05c0-ce55-4f75-b4ef-214d0151a240", "files": [ ".json", - ".wav" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/resources/music/Hit.mp3 b/assets/resources/music/Hit.mp3 new file mode 100644 index 00000000..c7c46779 Binary files /dev/null and b/assets/resources/music/Hit.mp3 differ diff --git a/assets/resources/music/Attack_02.wav.meta b/assets/resources/music/Hit.mp3.meta similarity index 72% rename from assets/resources/music/Attack_02.wav.meta rename to assets/resources/music/Hit.mp3.meta index ecdd15fd..20982450 100644 --- a/assets/resources/music/Attack_02.wav.meta +++ b/assets/resources/music/Hit.mp3.meta @@ -2,10 +2,10 @@ "ver": "1.0.0", "importer": "audio-clip", "imported": true, - "uuid": "7788bbf2-19b3-4d2b-9b29-73c1a3611bf2", + "uuid": "32a28430-53ab-4444-a65a-140412486986", "files": [ ".json", - ".wav" + ".mp3" ], "subMetas": {}, "userData": { diff --git a/assets/resources/music/Hit.wav b/assets/resources/music/Hit.wav deleted file mode 100644 index 52e290d8..00000000 Binary files a/assets/resources/music/Hit.wav and /dev/null differ diff --git a/assets/resources/music/Hit.wav.meta b/assets/resources/music/Hit.wav.meta deleted file mode 100644 index 249bce0f..00000000 --- a/assets/resources/music/Hit.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "eab9c19a-d17b-44c1-8182-666328bfd379", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/resources/music/button.mp3 b/assets/resources/music/button.mp3 new file mode 100644 index 00000000..f6fc4181 Binary files /dev/null and b/assets/resources/music/button.mp3 differ diff --git a/assets/resources/music/button.mp3.meta b/assets/resources/music/button.mp3.meta new file mode 100644 index 00000000..223204c0 --- /dev/null +++ b/assets/resources/music/button.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "62669db4-c83b-4438-9a93-150260d92408", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/resources/music/dun.mp3 b/assets/resources/music/dun.mp3 new file mode 100644 index 00000000..6153c3bb Binary files /dev/null and b/assets/resources/music/dun.mp3 differ diff --git a/assets/resources/music/dun.mp3.meta b/assets/resources/music/dun.mp3.meta new file mode 100644 index 00000000..d4748950 --- /dev/null +++ b/assets/resources/music/dun.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "7c92881a-8fe9-4c48-bbe0-8f1989d6e3f1", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/resources/music/dun.wav b/assets/resources/music/dun.wav deleted file mode 100644 index 7e044d92..00000000 Binary files a/assets/resources/music/dun.wav and /dev/null differ diff --git a/assets/resources/music/dun.wav.meta b/assets/resources/music/dun.wav.meta deleted file mode 100644 index a45d9071..00000000 --- a/assets/resources/music/dun.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "4ced6d9e-6d28-40ed-a43e-7f1911ad5e22", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/resources/music/flash.mp3 b/assets/resources/music/flash.mp3 new file mode 100644 index 00000000..3883439b Binary files /dev/null and b/assets/resources/music/flash.mp3 differ diff --git a/assets/resources/music/flash.mp3.meta b/assets/resources/music/flash.mp3.meta new file mode 100644 index 00000000..e90adabb --- /dev/null +++ b/assets/resources/music/flash.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "683c1c7a-97da-4694-a96a-f83df6575d73", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/resources/music/home.mp3 b/assets/resources/music/home.mp3 new file mode 100644 index 00000000..cd12189f Binary files /dev/null and b/assets/resources/music/home.mp3 differ diff --git a/assets/resources/music/home.mp3.meta b/assets/resources/music/home.mp3.meta new file mode 100644 index 00000000..c0fe9e4a --- /dev/null +++ b/assets/resources/music/home.mp3.meta @@ -0,0 +1,14 @@ +{ + "ver": "1.0.0", + "importer": "audio-clip", + "imported": true, + "uuid": "8c59d18e-9b43-46e5-8249-39d98ffec825", + "files": [ + ".json", + ".mp3" + ], + "subMetas": {}, + "userData": { + "downloadMode": 0 + } +} diff --git a/assets/resources/music/home.wav b/assets/resources/music/home.wav deleted file mode 100644 index d1fb3081..00000000 Binary files a/assets/resources/music/home.wav and /dev/null differ diff --git a/assets/resources/music/home.wav.meta b/assets/resources/music/home.wav.meta deleted file mode 100644 index 11884844..00000000 --- a/assets/resources/music/home.wav.meta +++ /dev/null @@ -1,14 +0,0 @@ -{ - "ver": "1.0.0", - "importer": "audio-clip", - "imported": true, - "uuid": "70867b0a-df6f-4e16-be5d-761e17533c5b", - "files": [ - ".json", - ".wav" - ], - "subMetas": {}, - "userData": { - "downloadMode": 0 - } -} diff --git a/assets/script/game/hero/SCastSystem.ts b/assets/script/game/hero/SCastSystem.ts index 9dac7b04..146092be 100644 --- a/assets/script/game/hero/SCastSystem.ts +++ b/assets/script/game/hero/SCastSystem.ts @@ -229,6 +229,9 @@ export class SCastSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate heroView.playOther('yellow') } + // 播放特殊技能触发音效 + oops.audio.playEffect("music/flash"); + // 如果是敌方攻击技能,必须在战斗中才能释放;友方增益/护盾则允许在非战斗中释放 let config = SkillSet[s_uuid]; if (!config) return;