diff --git a/Assets/Resources/Music/ForkLifter.ogg b/Assets/Resources/Music/ForkLifter.ogg deleted file mode 100644 index 5fb4d7473..000000000 Binary files a/Assets/Resources/Music/ForkLifter.ogg and /dev/null differ diff --git a/Assets/Resources/Music/ForkLifter.ogg.meta b/Assets/Resources/Music/ForkLifter.ogg.meta deleted file mode 100644 index e91f3f2d7..000000000 --- a/Assets/Resources/Music/ForkLifter.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 51af38323954a8d44874780ba4577fb4 -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: diff --git a/Assets/Resources/Music/Prologue1.ogg b/Assets/Resources/Music/Prologue1.ogg deleted file mode 100644 index 3c24a6629..000000000 Binary files a/Assets/Resources/Music/Prologue1.ogg and /dev/null differ diff --git a/Assets/Resources/Music/Prologue1.ogg.meta b/Assets/Resources/Music/Prologue1.ogg.meta deleted file mode 100644 index 42f47bbc3..000000000 --- a/Assets/Resources/Music/Prologue1.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: d387c17900a3b3646b4b154918e075c0 -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: diff --git a/Assets/Resources/Music/SpaceSoccer.ogg b/Assets/Resources/Music/SpaceSoccer.ogg deleted file mode 100644 index 61f21301b..000000000 Binary files a/Assets/Resources/Music/SpaceSoccer.ogg and /dev/null differ diff --git a/Assets/Resources/Music/SpaceSoccer.ogg.meta b/Assets/Resources/Music/SpaceSoccer.ogg.meta deleted file mode 100644 index ea60729f9..000000000 --- a/Assets/Resources/Music/SpaceSoccer.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: a0589cdba27fb254e90da17b4804c2fe -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: diff --git a/Assets/Resources/Music/Unconfirmed.meta b/Assets/Resources/Music/Unconfirmed.meta deleted file mode 100644 index f5c7934ed..000000000 --- a/Assets/Resources/Music/Unconfirmed.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 14f6177cefd0488409a3e97a592eb2c8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Music/aids.ogg b/Assets/Resources/Music/aids.ogg deleted file mode 100644 index 27d4d30da..000000000 Binary files a/Assets/Resources/Music/aids.ogg and /dev/null differ diff --git a/Assets/Resources/Music/aids.ogg.meta b/Assets/Resources/Music/aids.ogg.meta deleted file mode 100644 index 3f1e8117d..000000000 --- a/Assets/Resources/Music/aids.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: f2b3061e6e227594f84e1cc5865e6812 -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: diff --git a/Assets/Resources/Music/cointoss.wav b/Assets/Resources/Music/cointoss.wav deleted file mode 100644 index f161c623f..000000000 Binary files a/Assets/Resources/Music/cointoss.wav and /dev/null differ diff --git a/Assets/Resources/Music/cointoss.wav.meta b/Assets/Resources/Music/cointoss.wav.meta deleted file mode 100644 index 1fa019bb3..000000000 --- a/Assets/Resources/Music/cointoss.wav.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: e5cf71158cc9bff4a8fbfbca1e73e500 -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: diff --git a/Assets/Resources/Music/karateka.ogg b/Assets/Resources/Music/karateka.ogg deleted file mode 100644 index 50dffb094..000000000 Binary files a/Assets/Resources/Music/karateka.ogg and /dev/null differ diff --git a/Assets/Resources/Music/karateka.ogg.meta b/Assets/Resources/Music/karateka.ogg.meta deleted file mode 100644 index 0f1b36f73..000000000 --- a/Assets/Resources/Music/karateka.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 5fc457d2d31969c44a6734ce4e684ff8 -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: diff --git a/Assets/Resources/Music/lonely storm.ogg b/Assets/Resources/Music/lonely storm.ogg deleted file mode 100644 index b71eb3f7c..000000000 Binary files a/Assets/Resources/Music/lonely storm.ogg and /dev/null differ diff --git a/Assets/Resources/Music/lonely storm.ogg.meta b/Assets/Resources/Music/lonely storm.ogg.meta deleted file mode 100644 index 056d16ace..000000000 --- a/Assets/Resources/Music/lonely storm.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: f3b9f9179bad8394a98f617bda265a62 -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: diff --git a/Assets/Resources/Music/lonely storm.ogg.reapeaks b/Assets/Resources/Music/lonely storm.ogg.reapeaks deleted file mode 100644 index 702345399..000000000 Binary files a/Assets/Resources/Music/lonely storm.ogg.reapeaks and /dev/null differ diff --git a/Assets/Resources/Music/lonely storm.ogg.reapeaks.meta b/Assets/Resources/Music/lonely storm.ogg.reapeaks.meta deleted file mode 100644 index aae700d3a..000000000 --- a/Assets/Resources/Music/lonely storm.ogg.reapeaks.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 64abc3d63d0b45e4fbf97673314b4fd7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Music/practice.json b/Assets/Resources/Music/practice.json deleted file mode 100644 index 45833b3c6..000000000 --- a/Assets/Resources/Music/practice.json +++ /dev/null @@ -1 +0,0 @@ -{"bpm":125.0,"entities":[{"beat":0.0,"track":0,"length":33.0,"datamodel":"karateman/bop"},{"beat":0.0,"track":3,"length":1.0,"datamodel":"gameManager/switchGame/karateman"},{"beat":1.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":3.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":3.5,"track":2,"length":1.0,"datamodel":"karateman/hit3"},{"beat":5.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":6.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":7.0,"track":3,"length":2.0,"datamodel":"karateman/rock"},{"beat":9.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":11.0,"track":1,"length":2.0,"datamodel":"karateman/bulb"},{"beat":13.0,"track":1,"length":4.5,"datamodel":"karateman/kick"},{"beat":17.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":19.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":19.5,"track":2,"length":1.0,"datamodel":"karateman/hit4"},{"beat":21.0,"track":0,"length":2.0,"datamodel":"karateman/pot"},{"beat":22.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":23.0,"track":2,"length":2.0,"datamodel":"karateman/pot"},{"beat":24.0,"track":3,"length":2.0,"datamodel":"karateman/ball"},{"beat":25.0,"track":1,"length":2.0,"datamodel":"karateman/pot"},{"beat":27.0,"track":1,"length":2.0,"datamodel":"karateman/bulb"},{"beat":29.0,"track":1,"length":4.0,"datamodel":"karateman/combo"},{"beat":33.0,"track":1,"length":1.0,"datamodel":"clappyTrio/bop"},{"beat":33.0,"track":0,"length":1.0,"datamodel":"gameManager/switchGame/clappyTrio"},{"beat":34.0,"track":1,"length":1.0,"datamodel":"clappyTrio/bop"},{"beat":35.0,"track":1,"length":1.0,"datamodel":"clappyTrio/prepare_alt"},{"beat":36.5,"track":1,"length":0.75,"datamodel":"clappyTrio/clap"},{"beat":38.5,"track":0,"length":1.0,"datamodel":"clappyTrio/prepare"},{"beat":39.0,"track":1,"length":0.25,"datamodel":"clappyTrio/clap"},{"beat":40.0,"track":1,"length":1.0,"datamodel":"clappyTrio/bop"},{"beat":41.0,"track":0,"length":1.0,"datamodel":"gameManager/switchGame/spaceball"},{"beat":42.0,"track":1,"length":2.0,"datamodel":"spaceball/shoot"},{"beat":45.0,"track":1,"length":3.0,"datamodel":"spaceball/shootHigh"},{"beat":48.0,"track":1,"length":2.0,"datamodel":"spaceball/shoot"},{"beat":50.0,"track":1,"length":2.0,"datamodel":"spaceball/shoot"},{"beat":53.0,"track":1,"length":3.0,"datamodel":"spaceball/shootHigh"},{"beat":57.0,"track":1,"length":2.0,"datamodel":"spaceball/shoot"},{"beat":59.0,"track":1,"length":2.0,"datamodel":"spaceball/shoot"},{"beat":61.0,"track":1,"length":3.0,"datamodel":"spaceball/shootHigh"},{"beat":64.0,"track":0,"length":1.0,"datamodel":"gameManager/switchGame/forkLifter"},{"beat":65.0,"track":1,"length":3.0,"datamodel":"forkLifter/pea"},{"beat":68.0,"track":0,"length":3.0,"datamodel":"forkLifter/pea"},{"beat":70.0,"track":1,"length":3.0,"datamodel":"forkLifter/pea"},{"beat":72.5,"track":2,"length":1.0,"datamodel":"forkLifter/gulp"},{"beat":73.0,"track":1,"length":2.0,"datamodel":"spaceSoccer/ball dispense"},{"beat":73.0,"track":0,"length":1.0,"datamodel":"gameManager/switchGame/spaceSoccer"},{"beat":75.0,"track":1,"length":10.0,"datamodel":"spaceSoccer/keep-up"},{"beat":85.0,"track":1,"length":3.0,"datamodel":"spaceSoccer/high kick-toe!"},{"beat":88.0,"track":1,"length":5.0,"datamodel":"spaceSoccer/keep-up"},{"beat":93.0,"track":1,"length":3.0,"datamodel":"spaceSoccer/high kick-toe!"},{"beat":96.0,"track":1,"length":4.0,"datamodel":"spaceSoccer/keep-up"}],"tempoChanges":[]} diff --git a/Assets/Resources/Music/practice.json.meta b/Assets/Resources/Music/practice.json.meta deleted file mode 100644 index 371beb4d7..000000000 --- a/Assets/Resources/Music/practice.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ad2467f171a3aee4b9be8c26e2e1a42c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Music/practice.ogg b/Assets/Resources/Music/practice.ogg deleted file mode 100644 index 612f9d122..000000000 Binary files a/Assets/Resources/Music/practice.ogg and /dev/null differ diff --git a/Assets/Resources/Music/practice.ogg.meta b/Assets/Resources/Music/practice.ogg.meta deleted file mode 100644 index 150f383a3..000000000 --- a/Assets/Resources/Music/practice.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 7d1a104c87e593f40a262ebbcb2a371b -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: diff --git a/Assets/Resources/Music/rain-002.ogg b/Assets/Resources/Music/rain-002.ogg deleted file mode 100644 index a336b9a5f..000000000 Binary files a/Assets/Resources/Music/rain-002.ogg and /dev/null differ diff --git a/Assets/Resources/Music/rain-002.ogg.meta b/Assets/Resources/Music/rain-002.ogg.meta deleted file mode 100644 index 8e3a4ff5b..000000000 --- a/Assets/Resources/Music/rain-002.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: d6aa7955da64b284589e923dc18c67fb -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: diff --git a/Assets/Resources/Music/remix6ds.ogg b/Assets/Resources/Music/remix6ds.ogg deleted file mode 100644 index db4c8d303..000000000 Binary files a/Assets/Resources/Music/remix6ds.ogg and /dev/null differ diff --git a/Assets/Resources/Music/remix6ds.ogg.meta b/Assets/Resources/Music/remix6ds.ogg.meta deleted file mode 100644 index 2ef2ffcb2..000000000 --- a/Assets/Resources/Music/remix6ds.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 92cf585c80f8fb843964e525aef1406c -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: diff --git a/Assets/Resources/Music/spaceball.ogg b/Assets/Resources/Music/spaceball.ogg deleted file mode 100644 index 5e4bf7d1e..000000000 Binary files a/Assets/Resources/Music/spaceball.ogg and /dev/null differ diff --git a/Assets/Resources/Music/spaceball.ogg.meta b/Assets/Resources/Music/spaceball.ogg.meta deleted file mode 100644 index 6c59db8ba..000000000 --- a/Assets/Resources/Music/spaceball.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: c0b3e65059fb3cd49aa056342f2246c8 -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: diff --git a/Assets/Resources/Music/theclappytrio.ogg b/Assets/Resources/Music/theclappytrio.ogg deleted file mode 100644 index 4be14e2dd..000000000 Binary files a/Assets/Resources/Music/theclappytrio.ogg and /dev/null differ diff --git a/Assets/Resources/Music/theclappytrio.ogg.meta b/Assets/Resources/Music/theclappytrio.ogg.meta deleted file mode 100644 index f13d37451..000000000 --- a/Assets/Resources/Music/theclappytrio.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: ebc898cbaf3e679438e83c68552e527f -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: diff --git a/Assets/Resources/Sfx/audience.meta b/Assets/Resources/Sfx/audience.meta deleted file mode 100644 index cf12ed21e..000000000 --- a/Assets/Resources/Sfx/audience.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dcfa148ffe94506408bee37513c44816 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sfx/audience/disappointed.ogg b/Assets/Resources/Sfx/games/forkLifter/disappointed.ogg similarity index 100% rename from Assets/Resources/Sfx/audience/disappointed.ogg rename to Assets/Resources/Sfx/games/forkLifter/disappointed.ogg diff --git a/Assets/Resources/Sfx/audience/disappointed.ogg.meta b/Assets/Resources/Sfx/games/forkLifter/disappointed.ogg.meta similarity index 100% rename from Assets/Resources/Sfx/audience/disappointed.ogg.meta rename to Assets/Resources/Sfx/games/forkLifter/disappointed.ogg.meta diff --git a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat index 14c88eb20..553643982 100644 --- a/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat +++ b/Assets/Resources/Sprites/GeneralPurpose/ButtonsControllers/ButtonSDFMaterial.mat @@ -100,7 +100,7 @@ Material: - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - - _OffBright: 0.5 + - _OffBright: 0.25 - _OutSmoothness: 0.075 - _OutThickness: 0.6 - _OutlineSoftness: 0 diff --git a/Assets/Resources/Sprites/Trampolines.meta b/Assets/Resources/Sprites/Trampolines.meta deleted file mode 100644 index 6048afbe2..000000000 --- a/Assets/Resources/Sprites/Trampolines.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 47beef580fcf1514099d4f00edc3988c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity deleted file mode 100644 index edfc89178..000000000 --- a/Assets/Scenes/Test.unity +++ /dev/null @@ -1,942 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &477918638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 477918639} - - component: {fileID: 477918642} - - component: {fileID: 477918641} - - component: {fileID: 477918640} - m_Layer: 5 - m_Name: Undo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &477918639 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477918638} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 823867629} - m_Father: {fileID: 1549258973} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -478.5, y: 310.8} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &477918640 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477918638} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 477918641} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1408700917} - m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.CommandManager, Assembly-CSharp - m_MethodName: Undo - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &477918641 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477918638} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &477918642 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 477918638} - m_CullTransparentMesh: 1 ---- !u!1 &520344657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 520344658} - - component: {fileID: 520344660} - - component: {fileID: 520344659} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &520344658 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 520344657} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 984212318} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &520344659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 520344657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Redo - -' ---- !u!222 &520344660 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 520344657} - m_CullTransparentMesh: 1 ---- !u!1 &593752857 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 593752860} - - component: {fileID: 593752859} - - component: {fileID: 593752858} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &593752858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593752857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &593752859 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593752857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &593752860 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 593752857} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &660085351 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 660085353} - - component: {fileID: 660085352} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &660085352 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 660085351} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &660085353 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 660085351} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.8390641, y: 1.7596253, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &823867628 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 823867629} - - component: {fileID: 823867631} - - component: {fileID: 823867630} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &823867629 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823867628} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 477918639} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &823867630 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823867628} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Undo - -' ---- !u!222 &823867631 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823867628} - m_CullTransparentMesh: 1 ---- !u!1 &984212317 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 984212318} - - component: {fileID: 984212321} - - component: {fileID: 984212320} - - component: {fileID: 984212319} - m_Layer: 5 - m_Name: Redo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &984212318 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984212317} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 520344658} - m_Father: {fileID: 1549258973} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -298.8, y: 310.8} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &984212319 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984212317} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 984212320} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1408700917} - m_TargetAssemblyTypeName: RhythmHeavenMania.Editor.CommandManager, Assembly-CSharp - m_MethodName: Redo - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &984212320 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984212317} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &984212321 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 984212317} - m_CullTransparentMesh: 1 ---- !u!1 &1408700916 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408700918} - - component: {fileID: 1408700917} - - component: {fileID: 1408700919} - m_Layer: 0 - m_Name: Test - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1408700917 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408700916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6187911411a100640b5f4f3f2f84b912, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1408700918 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408700916} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.0898438, y: 4.4694767, z: -0.10655786} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1408700919 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408700916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 490e729f742a40644a3a2abd88fce1a3, type: 3} - m_Name: - m_EditorClassIdentifier: - test: {fileID: 660085351} ---- !u!1 &1505402500 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1505402503} - - component: {fileID: 1505402502} - - component: {fileID: 1505402501} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1505402501 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505402500} - m_Enabled: 1 ---- !u!20 &1505402502 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505402500} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1505402503 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505402500} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1549258969 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549258973} - - component: {fileID: 1549258972} - - component: {fileID: 1549258971} - - component: {fileID: 1549258970} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1549258970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549258969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1549258971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549258969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1280, y: 720} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1549258972 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549258969} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 1505402502} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1549258973 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549258969} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 477918639} - - {fileID: 984212318} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} diff --git a/Assets/Scenes/Test.unity.meta b/Assets/Scenes/Test.unity.meta deleted file mode 100644 index 8c9d8dd60..000000000 --- a/Assets/Scenes/Test.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 7f473b35a9dae6345816dc95decb921b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/AudioDspTimeKeeper.cs b/Assets/Scripts/AudioDspTimeKeeper.cs deleted file mode 100644 index f2c1157f7..000000000 --- a/Assets/Scripts/AudioDspTimeKeeper.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -namespace HeavenStudio -{ - public class AudioDspTimeKeeper : MonoBehaviour - { - [SerializeField] private List xValuesL = new List(); - [SerializeField] private List yValuesL = new List(); - - private double coeff1, coeff2; - - private double audioDspStartTime; - - private AudioSource audioSource; - - public double currentSmoothedDSPTime; - - public double dspTime; - public float audioTime; - - private double musicDrift; - - private Conductor conductor; - - public float latencyAdjustment; - - public void Play() - { - audioSource.PlayScheduled(audioDspStartTime); - audioDspStartTime = AudioSettings.dspTime; - } - - private void Start() - { - conductor = GetComponent(); - audioSource = conductor.musicSource; - } - - private void Update() - { - if (!audioSource.isPlaying) return; - - float currentGameTime = Time.realtimeSinceStartup; - double currentDspTime = AudioSettings.dspTime; - - // Update our linear regression model by adding another data point. - UpdateLinearRegression(currentGameTime, currentDspTime); - CheckForDrift(); - - dspTime = GetCurrentTimeInSong(); - audioTime = audioSource.time; - } - - public double SmoothedDSPTime() - { - double result = Time.unscaledTimeAsDouble * coeff1 + coeff2; - if (result > currentSmoothedDSPTime) - { - currentSmoothedDSPTime = result; - } - return currentSmoothedDSPTime; - } - - public double GetCurrentTimeInSong() - { - return this.SmoothedDSPTime() - audioDspStartTime - latencyAdjustment; - } - - private void CheckForDrift() - { - double timeFromDSP = this.SmoothedDSPTime() - audioDspStartTime; - double timeFromAudioSource = audioSource.timeSamples / (float)audioSource.clip.frequency; - - double drift = timeFromDSP - timeFromAudioSource; - musicDrift = drift; - - if (Mathf.Abs((float)drift) > 0.05) - { - Debug.LogWarningFormat("Music drift of {0} detected, resyncing!", musicDrift); - audioDspStartTime += musicDrift; - } - } - - private void UpdateLinearRegression(float currentGameTime, double currentDspTime) - { - if (xValuesL.Count > 3000) - { - xValuesL.RemoveRange(0, 2000); - yValuesL.RemoveRange(0, 2000); - } - - xValuesL.Add((double)currentGameTime); - var xVals = xValuesL.ToArray(); - - yValuesL.Add((double)currentDspTime); - var yVals = yValuesL.ToArray(); - - if (xVals.Length != yVals.Length) - { - throw new Exception("Input values should be with the same length."); - } - - double sumOfX = 0; - double sumOfY = 0; - double sumOfXSq = 0; - double sumOfYSq = 0; - double sumCodeviates = 0; - - for (var i = 0; i < xVals.Length; i++) - { - var x = xVals[i]; - var y = yVals[i]; - sumCodeviates += x * y; - sumOfX += x; - sumOfY += y; - sumOfXSq += x * x; - sumOfYSq += y * y; - } - - var count = xVals.Length; - var ssX = sumOfXSq - ((sumOfX * sumOfX) / count); - var ssY = sumOfYSq - ((sumOfY * sumOfY) / count); - - var rNumerator = (count * sumCodeviates) - (sumOfX * sumOfY); - var rDenom = (count * sumOfXSq - (sumOfX * sumOfX)) * (count * sumOfYSq - (sumOfY * sumOfY)); - var sCo = sumCodeviates - ((sumOfX * sumOfY) / count); - - var meanX = sumOfX / count; - var meanY = sumOfY / count; - var dblR = rNumerator / Math.Sqrt(rDenom); - - // coeff1 = dblR * dblR; - coeff2 = meanY - ((sCo / ssX) * meanX); - coeff1 = sCo / ssX; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/AudioDspTimeKeeper.cs.meta b/Assets/Scripts/AudioDspTimeKeeper.cs.meta deleted file mode 100644 index 84874a3f3..000000000 --- a/Assets/Scripts/AudioDspTimeKeeper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b2e012d929a258243a865112df346c34 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 9acfbf398..0d3b2b17a 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -190,7 +190,7 @@ namespace HeavenStudio } } - public void SeekAheadAndPreload(float start, float seekTime = 8f) + public void SeekAheadAndPreload(double start, float seekTime = 8f) { //seek ahead to preload games that have assetbundles //check game switches first @@ -217,6 +217,7 @@ namespace HeavenStudio if (start + seekTime >= entities[currentPreEvent]) { var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentPreEvent].beat && !EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); + SortEventsByPriority(entitiesAtSameBeat); foreach (DynamicBeatmap.DynamicEntity entity in entitiesAtSameBeat) { string gameName = entity.datamodel.Split('/')[0]; @@ -233,7 +234,7 @@ namespace HeavenStudio } } - public void SeekAheadAndDoPreEvent(float start, float seekTime = 2f) + public void SeekAheadAndDoPreEvent(double start, float seekTime = 2f) { List entities = Beatmap.entities.Select(c => c.beat).ToList(); if (currentPreSequence < Beatmap.entities.Count && currentPreSequence >= 0) @@ -242,8 +243,10 @@ namespace HeavenStudio { float beat = Beatmap.entities[currentPreSequence].beat; var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentPreSequence].beat); + SortEventsByPriority(entitiesAtSameBeat); foreach (DynamicBeatmap.DynamicEntity entity in entitiesAtSameBeat) { + currentPreSequence++; string gameName = entity.datamodel.Split('/')[0]; var inf = GetGameInfo(gameName); if (inf.usesAssetBundle && inf.AssetsLoaded && !inf.SequencesPreloaded) @@ -251,8 +254,10 @@ namespace HeavenStudio Debug.Log($"Preloading game {gameName}"); PreloadGameSequences(gameName); } - eventCaller.CallPreEvent(entity); - currentPreSequence++; + else + { + eventCaller.CallPreEvent(entity); + } } } } @@ -274,7 +279,7 @@ namespace HeavenStudio List tempoChanges = Beatmap.tempoChanges.Select(c => c.beat).ToList(); if (currentTempoEvent < Beatmap.tempoChanges.Count && currentTempoEvent >= 0) { - if (Conductor.instance.songPositionInBeats >= tempoChanges[currentTempoEvent]) + if (Conductor.instance.songPositionInBeatsAsDouble >= tempoChanges[currentTempoEvent]) { Conductor.instance.SetBpm(Beatmap.tempoChanges[currentTempoEvent].tempo); currentTempoEvent++; @@ -284,7 +289,7 @@ namespace HeavenStudio List volumeChanges = Beatmap.volumeChanges.Select(c => c.beat).ToList(); if (currentVolumeEvent < Beatmap.volumeChanges.Count && currentVolumeEvent >= 0) { - if (Conductor.instance.songPositionInBeats >= volumeChanges[currentVolumeEvent]) + if (Conductor.instance.songPositionInBeatsAsDouble >= volumeChanges[currentVolumeEvent]) { Conductor.instance.SetVolume(Beatmap.volumeChanges[currentVolumeEvent].volume); currentVolumeEvent++; @@ -294,7 +299,7 @@ namespace HeavenStudio List chartSections = Beatmap.beatmapSections.Select(c => c.beat).ToList(); if (currentSectionEvent < Beatmap.beatmapSections.Count && currentSectionEvent >= 0) { - if (Conductor.instance.songPositionInBeats >= chartSections[currentSectionEvent]) + if (Conductor.instance.songPositionInBeatsAsDouble >= chartSections[currentSectionEvent]) { Debug.Log("Section " + Beatmap.beatmapSections[currentSectionEvent].sectionName + " started"); currentSection = Beatmap.beatmapSections[currentSectionEvent]; @@ -309,18 +314,21 @@ namespace HeavenStudio float seekTime = 8f; //seek ahead to preload games that have assetbundles - SeekAheadAndPreload(Conductor.instance.songPositionInBeats, seekTime); + SeekAheadAndPreload(Conductor.instance.songPositionInBeatsAsDouble, seekTime); - SeekAheadAndDoPreEvent(Conductor.instance.songPositionInBeats, 2f); + SeekAheadAndDoPreEvent(Conductor.instance.songPositionInBeatsAsDouble, 2f); if (currentEvent < Beatmap.entities.Count && currentEvent >= 0) { - if (Conductor.instance.songPositionInBeats >= entities[currentEvent] /*&& SongPosLessThanClipLength(Conductor.instance.songPositionInBeats)*/) + if (Conductor.instance.songPositionInBeatsAsDouble >= entities[currentEvent]) { // allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat && !EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); var fxEntities = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat && EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); + SortEventsByPriority(fxEntities); + SortEventsByPriority(entitiesAtSameBeat); + // FX entities should ALWAYS execute before gameplay entities for (int i = 0; i < fxEntities.Count; i++) { @@ -427,6 +435,19 @@ namespace HeavenStudio Beatmap.volumeChanges.Sort((x, y) => x.beat.CompareTo(y.beat)); } + void SortEventsByPriority(List entities) + { + entities.Sort((x, y) => { + Minigames.Minigame xGame = EventCaller.instance.GetMinigame(x.datamodel.Split(0)); + Minigames.GameAction xAction = EventCaller.instance.GetGameAction(xGame, x.datamodel.Split(1)); + Minigames.Minigame yGame = EventCaller.instance.GetMinigame(y.datamodel.Split(0)); + Minigames.GameAction yAction = EventCaller.instance.GetGameAction(yGame, y.datamodel.Split(1)); + + return yAction.priority.CompareTo(xAction.priority); + }); + + } + public void SetCurrentEventToClosest(float beat) { SortEventsList(); diff --git a/Assets/Scripts/Games/CropStomp/Farmer.cs b/Assets/Scripts/Games/CropStomp/Farmer.cs index 37e3938f7..7bbb9f4e1 100644 --- a/Assets/Scripts/Games/CropStomp/Farmer.cs +++ b/Assets/Scripts/Games/CropStomp/Farmer.cs @@ -25,7 +25,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp return; Conductor cond = Conductor.instance; - if (stomp == null) + if (stomp == null && cond.isPlaying) { if (GameManager.instance.currentGame == "cropStomp") stomp = game.ScheduleUserInput(nextStompBeat - 1f, 1f, InputType.STANDARD_DOWN, Just, Miss, Out); diff --git a/Assets/Scripts/Games/CropStomp/Veggie.cs b/Assets/Scripts/Games/CropStomp/Veggie.cs index ada9aeccf..a983fb09f 100644 --- a/Assets/Scripts/Games/CropStomp/Veggie.cs +++ b/Assets/Scripts/Games/CropStomp/Veggie.cs @@ -37,7 +37,9 @@ namespace HeavenStudio.Games.Scripts_CropStomp public void Init() { game = CropStomp.instance; - game.ScheduleInput(targetBeat - 1, 1f, InputType.STANDARD_DOWN, StompJust, StompMiss, Out); + + if (Conductor.instance.isPlaying) + game.ScheduleInput(targetBeat - 1, 1f, InputType.STANDARD_DOWN, StompJust, StompMiss, Out); if (!isMole) { diff --git a/Assets/Scripts/Games/FirstContact/FirstContact.cs b/Assets/Scripts/Games/FirstContact/FirstContact.cs index 46f01b947..e3cc84a6d 100644 --- a/Assets/Scripts/Games/FirstContact/FirstContact.cs +++ b/Assets/Scripts/Games/FirstContact/FirstContact.cs @@ -15,7 +15,8 @@ namespace HeavenStudio.Games.Loaders { function = delegate { FirstContact.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, defaultLength = 4f, - resizable = true + resizable = true, + priority = 1, }, new GameAction("alien speak", "Alien Speak") { diff --git a/Assets/Scripts/Games/ForkLifter/Pea.cs b/Assets/Scripts/Games/ForkLifter/Pea.cs index 293e9ab76..bb949d82c 100644 --- a/Assets/Scripts/Games/ForkLifter/Pea.cs +++ b/Assets/Scripts/Games/ForkLifter/Pea.cs @@ -194,7 +194,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter private void Miss(PlayerActionEvent caller) { - Jukebox.PlayOneShot("audience/disappointed"); + Jukebox.PlayOneShot("forkLifter/disappointed"); BeatAction.New(game.gameObject, new List() { new BeatAction.Action(startBeat+ 2.45f, delegate { diff --git a/Assets/Scripts/Games/RhythmTweezers/Hair.cs b/Assets/Scripts/Games/RhythmTweezers/Hair.cs index 727ce2bba..fdf319e15 100644 --- a/Assets/Scripts/Games/RhythmTweezers/Hair.cs +++ b/Assets/Scripts/Games/RhythmTweezers/Hair.cs @@ -15,6 +15,8 @@ namespace HeavenStudio.Games.Scripts_RhythmTweezers private Tweezers tweezers; private bool plucked; + PlayerActionEvent pluckEvent; + private void Awake() { game = RhythmTweezers.instance; @@ -22,7 +24,7 @@ namespace HeavenStudio.Games.Scripts_RhythmTweezers } private void Start() { - game.ScheduleInput(createBeat, game.tweezerBeatOffset + game.beatInterval, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, Just, Miss, Out); + pluckEvent = game.ScheduleInput(createBeat, game.tweezerBeatOffset + game.beatInterval, InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN, Just, Miss, Out); } private void Update() @@ -58,5 +60,11 @@ namespace HeavenStudio.Games.Scripts_RhythmTweezers } private void Out(PlayerActionEvent caller) {} + + void OnDestroy() + { + if (pluckEvent != null) + pluckEvent.Disable(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/RhythmTweezers/LongHair.cs b/Assets/Scripts/Games/RhythmTweezers/LongHair.cs index 61856cdbc..f6d94a9a6 100644 --- a/Assets/Scripts/Games/RhythmTweezers/LongHair.cs +++ b/Assets/Scripts/Games/RhythmTweezers/LongHair.cs @@ -21,6 +21,7 @@ namespace HeavenStudio.Games.Scripts_RhythmTweezers private Sound pullSound; + PlayerActionEvent pluckEvent; PlayerActionEvent endEvent; InputType endInput; @@ -122,5 +123,13 @@ namespace HeavenStudio.Games.Scripts_RhythmTweezers } EndAce(); } + + void OnDestroy() + { + if (pluckEvent != null) + pluckEvent.Disable(); + if (endEvent != null) + endEvent.Disable(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs index 952d1d77c..c44febd9d 100644 --- a/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs +++ b/Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs @@ -19,7 +19,8 @@ namespace HeavenStudio.Games.Loaders { function = delegate { RhythmTweezers.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, defaultLength = 4f, - resizable = true + resizable = true, + priority = 1 }, new GameAction("short hair", "Short Hair") { @@ -41,7 +42,8 @@ namespace HeavenStudio.Games.Loaders new Param("type", RhythmTweezers.VegetableType.Onion, "Type", "The vegetable to switch to"), new Param("colorA", RhythmTweezers.defaultOnionColor, "Onion Color", "The color of the onion"), new Param("colorB", RhythmTweezers.defaultPotatoColor, "Potato Color", "The color of the potato") - } + }, + priority = 3 }, new GameAction("change vegetable", "Change Vegetable (Instant)") { @@ -57,12 +59,14 @@ namespace HeavenStudio.Games.Loaders new GameAction("set tweezer delay", "Offset Tweezer") { function = delegate { RhythmTweezers.instance.tweezerBeatOffset = eventCaller.currentEntity.length; }, - resizable = true + resizable = true, + priority = 2 }, new GameAction("reset tweezer delay", "Reset Tweezer Offset") { function = delegate { RhythmTweezers.instance.tweezerBeatOffset = 0f; }, - defaultLength = 0.5f + defaultLength = 0.5f, + priority = 2 }, new GameAction("set background color", "Background Colour") { @@ -350,7 +354,10 @@ namespace HeavenStudio.Games if (transitioning) { if (transitionTween != null) - transitionTween.Kill(true); + { + transitionTween.Complete(true); + transitionTween.Kill(); + } } } } diff --git a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs index f59662385..a20d9c1ae 100644 --- a/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs +++ b/Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs @@ -19,7 +19,8 @@ namespace HeavenStudio.Games.Loaders { function = delegate { WizardsWaltz.instance.SetIntervalStart(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, defaultLength = 4f, - resizable = true + resizable = true, + priority = 1 }, new GameAction("plant", "Plant") { diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 73b62c9f9..c11fa924d 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -152,6 +152,7 @@ namespace HeavenStudio public bool resizable = false; public List parameters = null; public bool hidden = false; + public int priority = 0; public EventCallback inactiveFunction = delegate { }; public EventCallback preFunction = delegate { }; @@ -169,7 +170,9 @@ namespace HeavenStudio /// What the block does when read while the game it's associated with isn't loaded. /// What the block does when the GameManager seeks to this cue for pre-scheduling. /// Prevents the block from being shown in the game list. Block will still function normally if it is in the timeline. - public GameAction(string actionName, string displayName, float defaultLength = 1, bool resizable = false, List parameters = null, EventCallback function = null, EventCallback inactiveFunction = null, EventCallback prescheduleFunction = null, bool hidden = false) + /// Runs two beats before this event is reached. + /// Priority of this event. Higher priority events will be run first. + public GameAction(string actionName, string displayName, float defaultLength = 1, bool resizable = false, List parameters = null, EventCallback function = null, EventCallback inactiveFunction = null, EventCallback prescheduleFunction = null, bool hidden = false, EventCallback preFunction = null, int priority = 0) { this.actionName = actionName; if (displayName == String.Empty) this.displayName = actionName; @@ -182,6 +185,8 @@ namespace HeavenStudio this.function = function ?? delegate { }; this.inactiveFunction = inactiveFunction ?? delegate { }; this.preFunction = prescheduleFunction ?? delegate { }; + this.priority = priority; + //todo: converting to new versions of GameActions } diff --git a/Assets/Scripts/Util/Audio.cs b/Assets/Scripts/Util/Audio.cs deleted file mode 100644 index b5b8faeee..000000000 --- a/Assets/Scripts/Util/Audio.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.IO; -using UnityEngine; - -namespace HeavenStudio.Util -{ - public class Audio - { - } -} \ No newline at end of file diff --git a/Assets/Scripts/Util/Audio.cs.meta b/Assets/Scripts/Util/Audio.cs.meta deleted file mode 100644 index 7ab5a4cf1..000000000 --- a/Assets/Scripts/Util/Audio.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ecc1c133593e69141b1824b99aace736 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/WTF.cs b/Assets/Scripts/WTF.cs deleted file mode 100644 index c0bdcc6fb..000000000 --- a/Assets/Scripts/WTF.cs +++ /dev/null @@ -1,21 +0,0 @@ -using UnityEngine; - -// this is a script for testing - -using HeavenStudio.Editor; - -namespace HeavenStudio.Tests -{ - public class WTF : MonoBehaviour - { - public GameObject test; - - private void Update() - { - if (Input.GetKeyDown(KeyCode.Z)) - { - GetComponent().Execute(new TestCommand(test, new Vector3(Random.Range(-8f, 8f), Random.Range(-6f, 6f)))); - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/WTF.cs.meta b/Assets/Scripts/WTF.cs.meta deleted file mode 100644 index 837bf591e..000000000 --- a/Assets/Scripts/WTF.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 490e729f742a40644a3a2abd88fce1a3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Test.meta b/Assets/Test.meta deleted file mode 100644 index 149236912..000000000 --- a/Assets/Test.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abcb585155612fc4094edb82cee5f5e8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: