mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-10 03:35:10 +00:00
Merge pull request #44 from jakobwcrowe/master
BTSDS: Added some sfx + slight margin tweak
This commit is contained in:
commit
3239f04211
4 changed files with 58 additions and 3 deletions
22
Assets/Resources/Sfx/games/builtToScaleDS/Boing.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/builtToScaleDS/Boing.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c6d6633ba3aa5145a2029c497163951
|
||||||
|
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:
|
22
Assets/Resources/Sfx/games/builtToScaleDS/Sink.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/builtToScaleDS/Sink.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1c864d88c41ff32418c61277cb9743dd
|
||||||
|
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:
|
|
@ -36,7 +36,7 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS
|
||||||
game.shooterAnim.Play("Windup", 0, 0);
|
game.shooterAnim.Play("Windup", 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
float stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + (createLength * 4.5f), 1f);
|
float stateBeat = Conductor.instance.GetPositionFromMargin(hitBeat, 2f);
|
||||||
StateCheck(stateBeat);
|
StateCheck(stateBeat);
|
||||||
|
|
||||||
if (PlayerInput.Pressed())
|
if (PlayerInput.Pressed())
|
||||||
|
@ -51,10 +51,20 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (moving && anim.GetCurrentAnimatorStateInfo(0).normalizedTime < 0.9f)
|
if (moving)
|
||||||
|
{
|
||||||
|
var sinkBeat = hitBeat + (createLength * 2f);
|
||||||
|
|
||||||
|
if (currentBeat < sinkBeat)
|
||||||
{
|
{
|
||||||
game.SetBlockTime(this, createBeat, createLength);
|
game.SetBlockTime(this, createBeat, createLength);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
moving = false;
|
||||||
|
Jukebox.PlayOneShotGame("builtToScaleDS/Sink");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Ace()
|
void Ace()
|
||||||
|
|
|
@ -98,6 +98,7 @@ namespace RhythmHeavenMania.Games.BuiltToScaleDS
|
||||||
shootingThisFrame = true;
|
shootingThisFrame = true;
|
||||||
Shoot();
|
Shoot();
|
||||||
SpawnObject(BTSObject.FlyingRod);
|
SpawnObject(BTSObject.FlyingRod);
|
||||||
|
Jukebox.PlayOneShotGame("builtToScaleDS/Boing");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!shootingThisFrame)
|
if (!shootingThisFrame)
|
||||||
|
|
Loading…
Reference in a new issue