mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-09 19:25:10 +00:00
adjust dj school mixer settings
This commit is contained in:
parent
2bf39bf8bd
commit
2986563a78
5 changed files with 41 additions and 89 deletions
|
@ -85,7 +85,7 @@ AudioMixerController:
|
|||
- {fileID: 752586362724348005}
|
||||
m_StartSnapshot: {fileID: 24500006}
|
||||
m_SuspendThreshold: -80
|
||||
m_EnableSuspend: 1
|
||||
m_EnableSuspend: 0
|
||||
m_UpdateMode: 1
|
||||
m_ExposedParameters: []
|
||||
m_AudioMixerGroupViews:
|
||||
|
@ -95,7 +95,7 @@ AudioMixerController:
|
|||
- 4f0b7ddcf4e12a14c888732f2ab0fda0
|
||||
name: View
|
||||
m_CurrentViewIndex: 0
|
||||
m_TargetSnapshot: {fileID: 24500006}
|
||||
m_TargetSnapshot: {fileID: 752586362724348005}
|
||||
--- !u!243 &24300002
|
||||
AudioMixerGroupController:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -144,7 +144,7 @@ AudioMixerSnapshotController:
|
|||
9dd04840cf4676047b2e26e659ca4069: 1661
|
||||
65da18c00dad8f642a1f04b10bc4d3fa: -9.8
|
||||
2b8f30d01b6887a4a9a1c346efb59529: 0.96
|
||||
152a0691009a459488775726d7da2a76: 0
|
||||
152a0691009a459488775726d7da2a76: 0.01
|
||||
b32285822a3582a46bc02ae0bb31edd0: 0
|
||||
16419c92ecf0c4743a61bae82f0cd39d: 0.96
|
||||
3537f1d2761ea514aad24adbde59814c: 0.5
|
||||
|
@ -183,7 +183,7 @@ AudioMixerSnapshotController:
|
|||
m_FloatValues:
|
||||
8ac1b110f403261418b718a0a6962426: -9.8
|
||||
9dd04840cf4676047b2e26e659ca4069: 1661
|
||||
152a0691009a459488775726d7da2a76: 16
|
||||
152a0691009a459488775726d7da2a76: 10
|
||||
b32285822a3582a46bc02ae0bb31edd0: 0
|
||||
3537f1d2761ea514aad24adbde59814c: 0.5
|
||||
1f89dac5f0e643c4ab8774d8ad05e968: 2.79
|
||||
|
|
|
@ -113,6 +113,18 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 64
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 2
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
@ -113,6 +113,18 @@ TextureImporter:
|
|||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 1024
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
|
|
|
@ -48,36 +48,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
|
||||
}
|
||||
|
||||
#region old hold
|
||||
//public void Hold(bool ace)
|
||||
//{
|
||||
// isHolding = true;
|
||||
|
||||
// if (ace)
|
||||
// {
|
||||
// missed = false;
|
||||
// shouldBeHolding = true;
|
||||
// game.SetDJYellowHead(1);
|
||||
// }
|
||||
|
||||
// Jukebox.PlayOneShotGame("djSchool/recordStop");
|
||||
|
||||
// anim.Play("Hold", 0, 0);
|
||||
// tableAnim.Play("Student_Turntable_Hold", 0, 0);
|
||||
// if (ace)
|
||||
// {
|
||||
// if (soundFX)
|
||||
// {
|
||||
// Conductor.instance.djSchoolHold.TransitionTo(.01f);
|
||||
// }
|
||||
|
||||
// FlashFX(true);
|
||||
// }
|
||||
|
||||
// // Settings.GetMusicMixer().audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(0.15f);
|
||||
//}
|
||||
#endregion
|
||||
|
||||
public void ForceHold()
|
||||
{
|
||||
isHolding = true;
|
||||
|
@ -90,7 +60,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
|
||||
if (soundFX)
|
||||
{
|
||||
mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -114,7 +84,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
|
||||
if (soundFX)
|
||||
{
|
||||
mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
|
||||
}
|
||||
FlashFX(true);
|
||||
}
|
||||
|
@ -149,6 +119,10 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
|
||||
anim.DoScaledAnimationAsync("Hold", 0.5f);
|
||||
tableAnim.DoScaledAnimationAsync("Student_Turntable_StartHold", 0.5f);
|
||||
if (soundFX)
|
||||
{
|
||||
mixer.audioMixer.FindSnapshot("DJSchool_Hold").TransitionTo(.1f);
|
||||
}
|
||||
if (!game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpFirst) && !game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpSecond))
|
||||
{
|
||||
game.djYellowScript.ChangeHeadSprite(DJYellow.DJExpression.CrossEyed);
|
||||
|
@ -176,7 +150,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
Invoke("EnableBoo", 1f);
|
||||
}
|
||||
missed = true;
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
tableAnim.DoScaledAnimationAsync("Student_Turntable_Idle", 0.5f);
|
||||
if (!game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpFirst) && !game.djYellowScript.HeadSpriteCheck(DJYellow.DJExpression.UpSecond))
|
||||
{
|
||||
|
@ -220,7 +194,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
|
||||
|
||||
//Instantiate(slamFX, this.transform.parent).SetActive(true);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -236,7 +210,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
tableAnim.DoScaledAnimationAsync("Student_Turntable_Swipe", 0.5f);
|
||||
|
||||
//Instantiate(slamFX, this.transform.parent).SetActive(true);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -246,7 +220,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
isHolding = false;
|
||||
//swiping = false;
|
||||
missed = true;
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
// mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
if (canBoo)
|
||||
{
|
||||
Sound booSound = SoundByte.PlayOneShotGame("djSchool/boo", caller.timer + caller.startBeat + 1f, 1, 0.8f);
|
||||
|
@ -273,6 +247,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
isHolding = false;
|
||||
|
||||
missed = true;
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
|
||||
BeatAction.New(game, new List<BeatAction.Action>()
|
||||
{
|
||||
|
@ -297,7 +272,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
isHolding = false;
|
||||
|
||||
missed = true;
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
|
||||
OnMissSwipeForPlayerInput(Conductor.instance.songPositionAsDouble + 1);
|
||||
SoundByte.PlayOneShotGame("djSchool/recordSwipe");
|
||||
|
@ -305,53 +279,6 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
|
||||
#endregion
|
||||
|
||||
#region old swipe
|
||||
//public void Swipe(bool ace)
|
||||
//{
|
||||
// isHolding = false;
|
||||
|
||||
// if (ace)
|
||||
// {
|
||||
// missed = false;
|
||||
// shouldBeHolding = false;
|
||||
// Jukebox.PlayOneShotGame("djSchool/recordSwipe");
|
||||
// FlashFX(false);
|
||||
// swiping = true;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// // Missed record swipe sound should play here.
|
||||
// }
|
||||
|
||||
// anim.Play("Swipe", 0, 0);
|
||||
|
||||
// tableAnim.speed = 1;
|
||||
// tableAnim.Play("Student_Turntable_Swipe", 0, 0);
|
||||
|
||||
// Instantiate(slamFX).SetActive(true);
|
||||
// Conductor.instance.normal.TransitionTo(.01f);
|
||||
// // Settings.GetMusicMixer().audioMixer.FindSnapshot("Main").TransitionTo(0.15f);
|
||||
// swiping = false;
|
||||
|
||||
//}
|
||||
|
||||
//public override void OnAce()
|
||||
//{
|
||||
// if (!shouldBeHolding)
|
||||
// {
|
||||
// //Hold(true);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Conductor.instance.normal.TransitionTo(.01f);
|
||||
// //Swipe(true);
|
||||
// }
|
||||
|
||||
// eligible = false;
|
||||
//}
|
||||
|
||||
#endregion
|
||||
|
||||
private void FlashFX(bool inverse)
|
||||
{
|
||||
GameObject prefab = flashFX;
|
||||
|
@ -381,7 +308,7 @@ namespace HeavenStudio.Games.Scripts_DJSchool
|
|||
//Not sure but will do?
|
||||
private void OnDestroy()
|
||||
{
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.01f);
|
||||
mixer.audioMixer.FindSnapshot("Main").TransitionTo(.04f);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -47,5 +47,6 @@ MonoBehaviour:
|
|||
- Assets/Scripts/TitleManager.cs
|
||||
- Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs
|
||||
- Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs
|
||||
- Assets/Scripts/Games/DJSchool/Student.cs
|
||||
PathsToSkipImportEvent: []
|
||||
PathsToIgnoreOverwriteSettingOnAttribute: []
|
||||
|
|
Loading…
Reference in a new issue