diff --git a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg b/Assets/Resources/Sfx/games/frogHop/thankYou.ogg deleted file mode 100644 index 84f0dda6a..000000000 Binary files a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/frogHop/tyvm.wav b/Assets/Resources/Sfx/games/frogHop/tyvm.wav new file mode 100644 index 000000000..3c7695852 Binary files /dev/null and b/Assets/Resources/Sfx/games/frogHop/tyvm.wav differ diff --git a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta b/Assets/Resources/Sfx/games/frogHop/tyvm.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta rename to Assets/Resources/Sfx/games/frogHop/tyvm.wav.meta index 7157d8abc..87c990ff5 100644 --- a/Assets/Resources/Sfx/games/frogHop/thankYou.ogg.meta +++ b/Assets/Resources/Sfx/games/frogHop/tyvm.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 228840bbcd5fe2d4ebe42fdbdf33044b +guid: 3c803bb5171fceb44bcc1765bc47690b AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Scripts/Games/FrogHop/FrogHop.cs b/Assets/Scripts/Games/FrogHop/FrogHop.cs index 351667eb9..146d39f01 100644 --- a/Assets/Scripts/Games/FrogHop/FrogHop.cs +++ b/Assets/Scripts/Games/FrogHop/FrogHop.cs @@ -659,11 +659,11 @@ namespace HeavenStudio.Games public void ThankYou(double beat, bool stretchToTempo) { float pitch = stretchToTempo ? globalPitch * Conductor.instance.TimelinePitch : 1; - double offset = stretchToTempo ? (0.17 / (Conductor.instance.GetBpmAtBeat(beat) / 98)) : 0.17; + double offset = stretchToTempo ? (.2 / ((Conductor.instance.GetBpmAtBeat(beat) * Conductor.instance.TimelinePitch) / 156)) : .2; MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("frogHop/thankYou", beat, pitch: pitch, offset: offset), + new MultiSound.Sound("frogHop/tyvm", beat, pitch: pitch, offset: offset), }); var actions = new List(); @@ -674,11 +674,13 @@ namespace HeavenStudio.Games actions.Add(new(beat + (0.00 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"thank" actions.Add(new(beat + (0.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"you" - actions.Add(new(beat + (2.00 / stretch), delegate { Talk(BlueFrog, "Wide", beat + (3.75 / stretch)); })); //"verrry" - actions.Add(new(beat + (4.25 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"much" - actions.Add(new(beat + (5.00 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"-a!" + actions.Add(new(beat + (2.00 / stretch), delegate { Talk(BlueFrog, "Wide", beat + (4.00 / stretch)); })); //"verrry" + actions.Add(new(beat + (4.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"much" + actions.Add(new(beat + (5.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"-a!" BeatAction.New(this, actions); + + Debug.Log(offset); } public void Talk(List FrogsToTalk, string syllable, double animEnd)