This commit is contained in:
fu-majime 2024-02-27 09:29:49 +09:00
parent b163736546
commit 21f5cfdd5f
33 changed files with 88 additions and 154 deletions

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d85d319d0b2bc654bb3b86621c5d2ff8 guid: d7940c98db7f18e45a2e92eae26d8c46
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
@ -7,7 +7,7 @@ AudioImporter:
loadType: 0 loadType: 0
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 0 compressionFormat: 1
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: pcosomen/common assetBundleName:
assetBundleVariant: assetBundleVariant:

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6796f726f8e5a3f42a1cdb8aba3e8052 guid: 39dfb2cebefb0434e99242b44167222c
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
@ -7,7 +7,7 @@ AudioImporter:
loadType: 0 loadType: 0
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 0 compressionFormat: 1
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: pcosomen/common assetBundleName:
assetBundleVariant: assetBundleVariant:

Binary file not shown.

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: cf98e6ad5700929419032bc074ac44a7 guid: 22fb8c5cdaca8ce458e79733a7685da0
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
@ -7,7 +7,7 @@ AudioImporter:
loadType: 0 loadType: 0
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 0 compressionFormat: 1
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: pcosomen/common assetBundleName:
assetBundleVariant: assetBundleVariant:

Binary file not shown.

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 61e6da8c205481149b07591b8843e223 guid: 8d761bfeb7539f94dacc1278e6e9be1d
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
@ -7,7 +7,7 @@ AudioImporter:
loadType: 0 loadType: 0
sampleRateSetting: 0 sampleRateSetting: 0
sampleRateOverride: 44100 sampleRateOverride: 44100
compressionFormat: 0 compressionFormat: 1
quality: 1 quality: 1
conversionMode: 0 conversionMode: 0
platformSettingOverrides: {} platformSettingOverrides: {}
@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0 ambisonic: 0
3D: 1 3D: 1
userData: userData:
assetBundleName: pcosomen/common assetBundleName:
assetBundleVariant: assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e3a0dc8a99660cc47bf0cb5ad6eb7532
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 52095f2ecb627b04cadd52aa3723e4fb
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: 146c2e67e60e6324f972945a7ea122d5
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: c7111845c46ebeb45a0dc84ccda5fd40
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: e0db05542736eba48ad10e4f035d2cd3
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: ba0ad3677c32a71438bdd4fb42cf5b21
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: 2a7f9c3e24c476c4ca882cec289c2d7a
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

View file

@ -1,22 +0,0 @@
fileFormatVersion: 2
guid: ff6c8516f1997424dac54e8b20e29b27
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 0
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName: pcosomen/common
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: a1f0ab17c67c17043a4056d0886d85b2
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -32,7 +32,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShot("miss");
return; return;
} }
SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); SoundByte.PlayOneShotGame("nailCarpenter/HammerStrong");
nailAnim.DoScaledAnimationAsync("longNailHammered", 0.5f); nailAnim.DoScaledAnimationAsync("longNailHammered", 0.5f);
} }
@ -45,8 +45,8 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShot("miss");
return; return;
} }
SoundByte.PlayOneShotGame("nailCarpenter/HammerWeak");
nailAnim.DoScaledAnimationAsync("longNailWeakHammered", 0.5f); nailAnim.DoScaledAnimationAsync("longNailWeakHammered", 0.5f);
SoundByte.PlayOneShotGame("nailCarpenter/somen_catch");
} }
private void HammmerMiss(PlayerActionEvent caller) private void HammmerMiss(PlayerActionEvent caller)

View file

@ -31,7 +31,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShot("miss");
return; return;
} }
SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); SoundByte.PlayOneShotGame("nailCarpenter/HammerWeak");
nailAnim.DoScaledAnimationAsync("nailHammered", 0.5f); nailAnim.DoScaledAnimationAsync("nailHammered", 0.5f);
} }
private void strongHammmerJust(PlayerActionEvent caller, float state) private void strongHammmerJust(PlayerActionEvent caller, float state)
@ -43,8 +43,8 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShot("miss");
return; return;
} }
SoundByte.PlayOneShotGame("nailCarpenter/HammerStrong");
nailAnim.DoScaledAnimationAsync("nailStrongHammered", 0.5f); nailAnim.DoScaledAnimationAsync("nailStrongHammered", 0.5f);
SoundByte.PlayOneShotGame("nailCarpenter/somen_catch");
} }
private void HammmerMiss(PlayerActionEvent caller) private void HammmerMiss(PlayerActionEvent caller)

View file

@ -144,7 +144,7 @@ namespace HeavenStudio.Games
if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress))
{ {
SoundByte.PlayOneShotGame("nailCarpenter/somen_mistake"); SoundByte.PlayOneShot("miss");
HammerArm.DoScaledAnimationAsync("hammerHit", 0.5f); HammerArm.DoScaledAnimationAsync("hammerHit", 0.5f);
hasSlurped = false; hasSlurped = false;
EffectSweat.DoScaledAnimationAsync("BlobSweating", 0.5f); EffectSweat.DoScaledAnimationAsync("BlobSweating", 0.5f);
@ -195,7 +195,7 @@ namespace HeavenStudio.Games
if (startBeat <= targetNailBeat && targetNailBeat < endBeat) if (startBeat <= targetNailBeat && targetNailBeat < endBeat)
{ {
sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); sounds.Add(new MultiSound.Sound("nailCarpenter/one", targetNailBeat));
SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding);
SpawnNail(targetNailBeat+0.5f, startBeat); SpawnNail(targetNailBeat+0.5f, startBeat);
} }
@ -216,7 +216,7 @@ namespace HeavenStudio.Games
var targetNailBeat = nailBeat + (2f * b); var targetNailBeat = nailBeat + (2f * b);
if (startBeat <= targetNailBeat && targetNailBeat < endBeat) if (startBeat <= targetNailBeat && targetNailBeat < endBeat)
{ {
sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); sounds.Add(new MultiSound.Sound("nailCarpenter/three", targetNailBeat));
SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding);
SpawnNail(targetNailBeat+0.5f, startBeat); SpawnNail(targetNailBeat+0.5f, startBeat);
SpawnNail(targetNailBeat+1.0f, startBeat); SpawnNail(targetNailBeat+1.0f, startBeat);
@ -239,7 +239,7 @@ namespace HeavenStudio.Games
var targetNailBeat = nailBeat + (2f * b); var targetNailBeat = nailBeat + (2f * b);
if (startBeat <= targetNailBeat && targetNailBeat < endBeat) if (startBeat <= targetNailBeat && targetNailBeat < endBeat)
{ {
sounds.Add(new MultiSound.Sound("nailCarpenter/somen_doublealarm", targetNailBeat)); sounds.Add(new MultiSound.Sound("nailCarpenter/alarm", targetNailBeat));
SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding);
SpawnNail(targetNailBeat+0.5f, startBeat); SpawnNail(targetNailBeat+0.5f, startBeat);
SpawnPudding(targetNailBeat+1.0f, startBeat, (int)sweetsType.Pudding); SpawnPudding(targetNailBeat+1.0f, startBeat, (int)sweetsType.Pudding);
@ -263,8 +263,8 @@ namespace HeavenStudio.Games
var targetNailBeat = nailBeat + (2f * b); var targetNailBeat = nailBeat + (2f * b);
if (startBeat <= targetNailBeat && targetNailBeat < endBeat) if (startBeat <= targetNailBeat && targetNailBeat < endBeat)
{ {
sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); sounds.Add(new MultiSound.Sound("nailCarpenter/signal1", targetNailBeat));
sounds.Add(new MultiSound.Sound("nailCarpenter/somen_lowerfar", targetNailBeat+1f)); sounds.Add(new MultiSound.Sound("nailCarpenter/signal2", targetNailBeat+1f));
SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.LayerCake); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.LayerCake);
SpawnNail(targetNailBeat+0.5f, startBeat); SpawnNail(targetNailBeat+0.5f, startBeat);
SpawnLongNail(targetNailBeat+1f, startBeat); SpawnLongNail(targetNailBeat+1f, startBeat);