i fixed a couple bugs
the dim screen is back and no input duplication when switching games. hallelujah
This commit is contained in:
parent
0243580eca
commit
4b9181be92
|
@ -3485,7 +3485,7 @@ SpriteRenderer:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 7781305826881837383}
|
m_GameObject: {fileID: 7781305826881837383}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_CastShadows: 0
|
m_CastShadows: 0
|
||||||
m_ReceiveShadows: 0
|
m_ReceiveShadows: 0
|
||||||
m_DynamicOccludee: 1
|
m_DynamicOccludee: 1
|
||||||
|
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
||||||
m_DownscaleFallback: 0
|
m_DownscaleFallback: 0
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Width: 1228
|
m_Width: 851
|
||||||
m_Height: 691
|
m_Height: 479
|
||||||
m_AntiAliasing: 2
|
m_AntiAliasing: 2
|
||||||
m_MipCount: -1
|
m_MipCount: -1
|
||||||
m_DepthStencilFormat: 92
|
m_DepthStencilFormat: 92
|
||||||
|
|
|
@ -14,8 +14,8 @@ RenderTexture:
|
||||||
m_DownscaleFallback: 0
|
m_DownscaleFallback: 0
|
||||||
m_IsAlphaChannelOptional: 0
|
m_IsAlphaChannelOptional: 0
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_Width: 1842
|
m_Width: 1276
|
||||||
m_Height: 1036
|
m_Height: 718
|
||||||
m_AntiAliasing: 1
|
m_AntiAliasing: 1
|
||||||
m_MipCount: -1
|
m_MipCount: -1
|
||||||
m_DepthStencilFormat: 92
|
m_DepthStencilFormat: 92
|
||||||
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/beginningSignal1.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/beginningSignal1.ogg
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: e92b00ea282d92946a089045779dd091
|
guid: 219e1307a9985e947b076ded4d97e53d
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
Binary file not shown.
BIN
Assets/Resources/Sfx/games/freezeFrame/beginningSignal2.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/beginningSignal2.ogg
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 47bfe417e50d5e744bed6311617597f7
|
guid: 1d820ab72249d9241ad786194ae83859
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
Binary file not shown.
BIN
Assets/Resources/Sfx/games/freezeFrame/fastCarFar.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/fastCarFar.ogg
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 01d406f853fa5a545909c2f4b212fd2b
|
guid: b5c8291753ff9b642b43c2d54ff4f801
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
Binary file not shown.
BIN
Assets/Resources/Sfx/games/freezeFrame/fastCarNear.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/fastCarNear.ogg
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: f6b51b42d788296408372c6aec8fbf1b
|
guid: 24648410b9892594092098ffb6b0cac4
|
||||||
AudioImporter:
|
AudioImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
Binary file not shown.
BIN
Assets/Resources/Sfx/games/freezeFrame/pictureShow.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/pictureShow.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/pictureShow.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/pictureShow.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0cf6af060e6ebe1429793eccca2df11a
|
||||||
|
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.
|
@ -1,22 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 4308d01551cd68b4c82ec366e5a4e198
|
|
||||||
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:
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Hi.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Hi.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/result_Hi.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/result_Hi.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 210765294199a764ab37ecd63ec08d94
|
||||||
|
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.
|
@ -1,22 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 9406c5ba5e0937447a5a8ec8ed84fbf9
|
|
||||||
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:
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Ng.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Ng.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/result_Ng.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/result_Ng.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: abd758f80d9edcf4783789223c1f1bd7
|
||||||
|
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.
|
@ -1,22 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 06e9e8825927e9148b5e49c3bb415bb1
|
|
||||||
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:
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Ok.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/result_Ok.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/result_Ok.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/result_Ok.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7c4179656fb34984f8a9012a9a653464
|
||||||
|
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.
|
@ -1,22 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 845f2850c4320244fb3d4a8dfa178927
|
|
||||||
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:
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/shutter.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/shutter.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/shutter.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/shutter.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 7118dfcca609c8b41858ad749d0b4d8d
|
||||||
|
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.
|
@ -1,22 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 96124be51dd990a45a3c8f8e15fd5b8d
|
|
||||||
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:
|
|
BIN
Assets/Resources/Sfx/games/freezeFrame/slowCarFar.ogg
Normal file
BIN
Assets/Resources/Sfx/games/freezeFrame/slowCarFar.ogg
Normal file
Binary file not shown.
22
Assets/Resources/Sfx/games/freezeFrame/slowCarFar.ogg.meta
Normal file
22
Assets/Resources/Sfx/games/freezeFrame/slowCarFar.ogg.meta
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2998454fd5ef3cd43b3e1258e050ba85
|
||||||
|
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:
|
|
@ -220,8 +220,6 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
BIG LIST OF TODOS
|
BIG LIST OF TODOS
|
||||||
- use unity's random
|
|
||||||
|
|
||||||
- finish sounds
|
- finish sounds
|
||||||
- wait for upscale
|
- wait for upscale
|
||||||
- make particles random sprites
|
- make particles random sprites
|
||||||
|
@ -414,7 +412,11 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
if (PhotoList.Count > 0) PhotoList.Clear();
|
foreach (var evt in scheduledInputs)
|
||||||
|
{
|
||||||
|
evt.Disable();
|
||||||
|
}
|
||||||
|
//if (PhotoList.Count > 0) PhotoList.Clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
// MINIGAME METHODS
|
// MINIGAME METHODS
|
||||||
|
@ -587,7 +589,7 @@ namespace HeavenStudio.Games
|
||||||
}
|
}
|
||||||
public static void SlowCarSFX()
|
public static void SlowCarSFX()
|
||||||
{
|
{
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/smallCarZoom1a", forcePlay: true);
|
SoundByte.PlayOneShotGame("freezeFrame/slowCarFar", forcePlay: true);
|
||||||
}
|
}
|
||||||
public static void FastCarCue(double beat, int photoType, bool mute = false)
|
public static void FastCarCue(double beat, int photoType, bool mute = false)
|
||||||
{
|
{
|
||||||
|
@ -599,11 +601,11 @@ namespace HeavenStudio.Games
|
||||||
Instance.ScheduleInput(beat, 2f, InputAction_BasicPress, Instance.PhotoSuccess, Instance.PhotoMiss, Instance.PhotoEmpty),
|
Instance.ScheduleInput(beat, 2f, InputAction_BasicPress, Instance.PhotoSuccess, Instance.PhotoMiss, Instance.PhotoEmpty),
|
||||||
new PhotoArgs(CarType.FastCar, (PhotoType)photoType, 0f)
|
new PhotoArgs(CarType.FastCar, (PhotoType)photoType, 0f)
|
||||||
);
|
);
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/fastCarZoom", beat + 2);
|
SoundByte.PlayOneShotGame("freezeFrame/fastCarNear", beat + 2);
|
||||||
}
|
}
|
||||||
public static void FastCarSFX()
|
public static void FastCarSFX()
|
||||||
{
|
{
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/fastCarZoom", forcePlay: true);
|
SoundByte.PlayOneShotGame("freezeFrame/fastCarFar", forcePlay: true);
|
||||||
}
|
}
|
||||||
public static void ShowPhotos(double beat, float length, int gradeTypeI, bool audience, bool clearCache)
|
public static void ShowPhotos(double beat, float length, int gradeTypeI, bool audience, bool clearCache)
|
||||||
{
|
{
|
||||||
|
@ -685,18 +687,21 @@ namespace HeavenStudio.Games
|
||||||
{
|
{
|
||||||
case 2:
|
case 2:
|
||||||
Instance.CameraMan.DoScaledAnimationAsync("Happy", 0.5f);
|
Instance.CameraMan.DoScaledAnimationAsync("Happy", 0.5f);
|
||||||
|
SoundByte.PlayOneShotGame("freezeFrame/result_Hi");
|
||||||
if (audience)
|
if (audience)
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/result_Hi");
|
break;
|
||||||
else
|
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/successNoCrowd");
|
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
Instance.CameraMan.DoScaledAnimationAsync("Oops", 0.5f);
|
Instance.CameraMan.DoScaledAnimationAsync("Oops", 0.5f);
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/result_Ok");
|
SoundByte.PlayOneShotGame("freezeFrame/result_Ok");
|
||||||
|
if (audience)
|
||||||
|
SoundByte.PlayOneShot("applause");
|
||||||
break;
|
break;
|
||||||
case 0:
|
case 0:
|
||||||
Instance.CameraMan.DoScaledAnimationAsync("Cry", 0.5f);
|
Instance.CameraMan.DoScaledAnimationAsync("Cry", 0.5f);
|
||||||
SoundByte.PlayOneShotGame("freezeFrame/result_Ng");
|
SoundByte.PlayOneShotGame("freezeFrame/result_Ng");
|
||||||
|
if (audience)
|
||||||
|
break;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue