diff --git a/Assets/Scriptable Objects/Enemy/Tekkamaki.asset b/Assets/Scriptable Objects/Enemy/Tekkamaki.asset index fe4bba25..4be89bd2 100644 --- a/Assets/Scriptable Objects/Enemy/Tekkamaki.asset +++ b/Assets/Scriptable Objects/Enemy/Tekkamaki.asset @@ -38,6 +38,6 @@ MonoBehaviour: _triggerEffect: {fileID: 0} _spriteRenderer: {fileID: 0} enterEnemy: 0 - death: + death: TekkamkiDeath projectile: - attack: + attack: TekkamakiAttack diff --git a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h index 7cbf2b50..cf240880 100644 --- a/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h +++ b/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h @@ -68,11 +68,15 @@ namespace AK static const AkUniqueID SPLAT = 236860119U; static const AkUniqueID TAKOBACKGROUND = 1970138382U; static const AkUniqueID TAKOSPLAT = 3483809414U; + static const AkUniqueID TEKKAMAKIATTACK = 3411720253U; + static const AkUniqueID TEKKAMAKIDEATH = 2201750977U; static const AkUniqueID TELEPORTBUTTON = 1392147812U; static const AkUniqueID TENTACLESLAM = 1348410100U; static const AkUniqueID TURNPAGE = 2936962349U; static const AkUniqueID TUTORIAL = 3762955427U; static const AkUniqueID WARNINGBOSS = 2724248488U; + static const AkUniqueID WASABIATTACK = 1045106998U; + static const AkUniqueID WASABIDEATH = 4154409516U; static const AkUniqueID WAVEBEGIN = 607500489U; static const AkUniqueID WEAPONPICKUP = 2883364373U; } // namespace EVENTS diff --git a/Project S_WwiseProject/.cache/SoundBankInfoCache.dat b/Project S_WwiseProject/.cache/SoundBankInfoCache.dat index 36afff36..9addd73b 100644 Binary files a/Project S_WwiseProject/.cache/SoundBankInfoCache.dat and b/Project S_WwiseProject/.cache/SoundBankInfoCache.dat differ diff --git a/Project S_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/Project S_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu index 611d5108..08cc1be6 100644 --- a/Project S_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/Project S_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -2770,6 +2770,329 @@ + + + + + 200 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SFX + FutomakiGrunt1.wav + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 5 + + + 20 + -200 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SFX + OnigiriGrunt1.wav + + + + + + + + + + + + + + + + 450 + + + + + -5 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 5 + + + 20 + -200 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SFX + OnigiriDeath.wav + + + + + + + + + + + + + + + + 14 + + + + + 6 + + + + + -350 + + + + + + + + + + + + + + + + + + + + 0 + 0 + 5 + + + 20 + -200 + 37 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SFX + SushiRollDeath.wav + + + + + + + + + + diff --git a/Project S_WwiseProject/Events/Default Work Unit.wwu b/Project S_WwiseProject/Events/Default Work Unit.wwu index f9128699..f0278f3d 100644 --- a/Project S_WwiseProject/Events/Default Work Unit.wwu +++ b/Project S_WwiseProject/Events/Default Work Unit.wwu @@ -1296,6 +1296,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml b/Project S_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml index 2c7bb886..2c357a38 100644 --- a/Project S_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml +++ b/Project S_WwiseProject/GeneratedSoundBanks/Mac/SoundbanksInfo.xml @@ -16,7 +16,7 @@ Init Init.bnk - + \SoundBanks\Default Work Unit\main main main.bnk @@ -579,6 +579,22 @@ + + + + OnigiriGrunt1.wav + SFX\OnigiriGrunt1_5578D1DB.wem + + + + + + + OnigiriDeath.wav + SFX\OnigiriDeath_1A904FC9.wem + + + @@ -619,6 +635,22 @@ + + + + FutomakiGrunt1.wav + SFX\FutomakiGrunt1_6A19D534.wem + + + + + + + SushiRollDeath.wav + SFX\SushiRollDeath_8921A352.wem + + + diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.bnk b/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.bnk index c1e63e30..83d09ec2 100644 Binary files a/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.bnk and b/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.bnk differ diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.txt b/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.txt index 530ab709..aa06d9bc 100644 --- a/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.txt +++ b/Project S_WwiseProject/GeneratedSoundBanks/Mac/main.txt @@ -8,6 +8,7 @@ Event ID Name Wwise Object Path Notes 643270054 ShootFamas \Default Work Unit\ShootFamas 737767022 Scream \Default Work Unit\Scream 948477392 EmptyFamas \Default Work Unit\EmptyFamas + 1045106998 WasabiAttack \Default Work Unit\WasabiAttack 1125500713 Intro \Default Work Unit\Intro 1210244458 EmptyUzi \Default Work Unit\EmptyUzi 1225251435 FallingBack \Default Work Unit\FallingBack @@ -35,6 +36,7 @@ Event ID Name Wwise Object Path Notes 2139269741 ExplosionTimer \Default Work Unit\ExplosionTimer 2162906834 BaoMumbling \Default Work Unit\BaoMumbling 2201105581 Credits \Default Work Unit\Credits + 2201750977 TekkamakiDeath \Default Work Unit\TekkamakiDeath 2283047610 DummyHit \Default Work Unit\DummyHit 2501306844 OnigiriAttack \Default Work Unit\OnigiriAttack 2724248488 WarningBoss \Default Work Unit\WarningBoss @@ -48,6 +50,7 @@ Event ID Name Wwise Object Path Notes 3176895516 ShootUzi \Default Work Unit\ShootUzi 3355135784 IkuraProjectile \Default Work Unit\IkuraProjectile 3392074037 IkuraDeath \Default Work Unit\IkuraDeath + 3411720253 TekkamakiAttack \Default Work Unit\TekkamakiAttack 3483809414 TakoSplat \Default Work Unit\TakoSplat 3500068760 InkShoot \Default Work Unit\InkShoot 3643184226 MiniMap \Default Work Unit\MiniMap @@ -60,6 +63,7 @@ Event ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Music 4016454680 Laugh \Default Work Unit\Laugh 4020555763 RpgExplosion \Default Work Unit\RpgExplosion + 4154409516 WasabiDeath \Default Work Unit\WasabiDeath 4259908363 CooldownSniper \Default Work Unit\CooldownSniper Switch Group ID Name Wwise Object Path Notes diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml b/Project S_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml index 33f121a8..6e974641 100644 --- a/Project S_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml +++ b/Project S_WwiseProject/GeneratedSoundBanks/Windows/SoundbanksInfo.xml @@ -16,7 +16,7 @@ Init Init.bnk - + \SoundBanks\Default Work Unit\main main main.bnk @@ -579,6 +579,22 @@ + + + + OnigiriGrunt1.wav + SFX\OnigiriGrunt1_5578D1DB.wem + + + + + + + OnigiriDeath.wav + SFX\OnigiriDeath_1A904FC9.wem + + + @@ -619,6 +635,22 @@ + + + + FutomakiGrunt1.wav + SFX\FutomakiGrunt1_6A19D534.wem + + + + + + + SushiRollDeath.wav + SFX\SushiRollDeath_8921A352.wem + + + diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.bnk b/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.bnk index c1e63e30..83d09ec2 100644 Binary files a/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.bnk and b/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.bnk differ diff --git a/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.txt b/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.txt index 1ddcaebc..6e8c822c 100644 --- a/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.txt +++ b/Project S_WwiseProject/GeneratedSoundBanks/Windows/main.txt @@ -8,6 +8,7 @@ Event ID Name Wwise Object Path Notes 643270054 ShootFamas \Default Work Unit\ShootFamas 737767022 Scream \Default Work Unit\Scream 948477392 EmptyFamas \Default Work Unit\EmptyFamas + 1045106998 WasabiAttack \Default Work Unit\WasabiAttack 1125500713 Intro \Default Work Unit\Intro 1210244458 EmptyUzi \Default Work Unit\EmptyUzi 1225251435 FallingBack \Default Work Unit\FallingBack @@ -35,6 +36,7 @@ Event ID Name Wwise Object Path Notes 2139269741 ExplosionTimer \Default Work Unit\ExplosionTimer 2162906834 BaoMumbling \Default Work Unit\BaoMumbling 2201105581 Credits \Default Work Unit\Credits + 2201750977 TekkamakiDeath \Default Work Unit\TekkamakiDeath 2283047610 DummyHit \Default Work Unit\DummyHit 2501306844 OnigiriAttack \Default Work Unit\OnigiriAttack 2724248488 WarningBoss \Default Work Unit\WarningBoss @@ -48,6 +50,7 @@ Event ID Name Wwise Object Path Notes 3176895516 ShootUzi \Default Work Unit\ShootUzi 3355135784 IkuraProjectile \Default Work Unit\IkuraProjectile 3392074037 IkuraDeath \Default Work Unit\IkuraDeath + 3411720253 TekkamakiAttack \Default Work Unit\TekkamakiAttack 3483809414 TakoSplat \Default Work Unit\TakoSplat 3500068760 InkShoot \Default Work Unit\InkShoot 3643184226 MiniMap \Default Work Unit\MiniMap @@ -60,6 +63,7 @@ Event ID Name Wwise Object Path Notes 3991942870 Music \Default Work Unit\Music 4016454680 Laugh \Default Work Unit\Laugh 4020555763 RpgExplosion \Default Work Unit\RpgExplosion + 4154409516 WasabiDeath \Default Work Unit\WasabiDeath 4259908363 CooldownSniper \Default Work Unit\CooldownSniper Switch Group ID Name Wwise Object Path Notes diff --git a/Project S_WwiseProject/Project S_WwiseProject.Nico.wsettings b/Project S_WwiseProject/Project S_WwiseProject.Nico.wsettings index 565421bb..b8d290f8 100644 --- a/Project S_WwiseProject/Project S_WwiseProject.Nico.wsettings +++ b/Project S_WwiseProject/Project S_WwiseProject.Nico.wsettings @@ -7,13 +7,16 @@ + + + @@ -35,6 +38,7 @@ + @@ -61,6 +65,7 @@ +