From 706594ea0d63270dd031f9bb3a0ed4ea96bb3058 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 26 Sep 2023 13:24:04 +1000 Subject: [PATCH 1/7] icon and proj settings fullscreen --- Assets/Images/IconAccelerateStroke.png | 3 + Assets/Images/IconAccelerateStroke.png.meta | 140 +++++++++ Assets/Images/IconAccelerateStroke.svg | 327 +++++++++++++++++++- ProjectSettings/ProjectSettings.asset | 44 ++- 4 files changed, 500 insertions(+), 14 deletions(-) create mode 100755 Assets/Images/IconAccelerateStroke.png create mode 100755 Assets/Images/IconAccelerateStroke.png.meta diff --git a/Assets/Images/IconAccelerateStroke.png b/Assets/Images/IconAccelerateStroke.png new file mode 100755 index 0000000..bb3b021 --- /dev/null +++ b/Assets/Images/IconAccelerateStroke.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1290b4dfb15527864b9b56e1c62ee528963f70bd8248138af1e7b290fa8e128f +size 12591 diff --git a/Assets/Images/IconAccelerateStroke.png.meta b/Assets/Images/IconAccelerateStroke.png.meta new file mode 100755 index 0000000..e8d1d3b --- /dev/null +++ b/Assets/Images/IconAccelerateStroke.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e5eff91129e658a43ab06298ac295bed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/IconAccelerateStroke.svg b/Assets/Images/IconAccelerateStroke.svg index 32c37a8..0e457ee 100755 --- a/Assets/Images/IconAccelerateStroke.svg +++ b/Assets/Images/IconAccelerateStroke.svg @@ -8,7 +8,10 @@ version="1.1" id="svg1087" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" - sodipodi:docname="Accelerate.Stroke.svg" + sodipodi:docname="IconAccelerateStroke.svg" + inkscape:export-filename="..\..\..\..\Dropbox\SpaceRace\Steam\AllIcons.png" + inkscape:export-xdpi="52.887711" + inkscape:export-ydpi="52.887711" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -29,16 +32,17 @@ fit-margin-bottom="0" units="px" inkscape:zoom="0.56123737" - inkscape:cx="338.53769" + inkscape:cx="340.31946" inkscape:cy="396.44545" inkscape:window-width="2560" inkscape:window-height="1377" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="layer1" + inkscape:current-layer="g1" inkscape:showpageshadow="0" - inkscape:deskcolor="#505050" /> + inkscape:deskcolor="#505050" + inkscape:export-bgcolor="#00000000" /> + + + + + + + + + + + + + + + - + + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bad87a2..60fafee 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -285,10 +285,52 @@ PlayerSettings: - m_BuildTarget: m_Icons: - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: 76593fe6d2854eb46abdf155211e83e8, type: 3} + m_Icon: {fileID: 2800000, guid: 579166fb2fca6ff48877c43a24b04aac, type: 3} m_Width: 128 m_Height: 128 m_Kind: 0 + - m_BuildTarget: Standalone + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 1024 + m_Height: 1024 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 512 + m_Height: 512 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 256 + m_Height: 256 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 64 + m_Height: 64 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 48 + m_Height: 48 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 32 + m_Height: 32 + m_Kind: 0 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 16 + m_Height: 16 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: From 294701f69aa2cd0a6160f8bbc2f710ac2b00d691 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 26 Sep 2023 20:37:15 +1000 Subject: [PATCH 2/7] ok ok --- Assets/Audio/Accelerate.wav | 3 + ...{MenuHigh.wav.meta => Accelerate.wav.meta} | 2 +- Assets/Audio/Boost-1.wav | 3 + .../{MenuLow.wav.meta => Boost-1.wav.meta} | 2 +- Assets/Audio/Boost-2.wav | 3 + Assets/Audio/Boost-2.wav.meta | 23 +++ Assets/Audio/Decelerate.wav | 3 + Assets/Audio/Decelerate.wav.meta | 23 +++ Assets/Audio/MenuHigh.wav | 3 - Assets/Audio/MenuLow.wav | 3 - Assets/Audio/Strafe.wav | 3 + Assets/Audio/Strafe.wav.meta | 23 +++ Assets/Prefabs/Ship/Ship.prefab | 59 ++++++ Assets/Resources/URPAsset.asset | 0 Assets/Scenes/sr_junglism2.unity | 34 ++-- Assets/Scenes/sr_silverstorage.unity | 46 ++++- Assets/Src/Audio.cs | 56 ------ Assets/Src/ShipAudio.cs | 183 ++++++++++++++++++ .../Src/{Audio.cs.meta => ShipAudio.cs.meta} | 2 +- Assets/Src/ShipControls.cs | 4 + Assets/Src/UI/MenuControls.cs | 2 +- Packages/packages-lock.json | 2 +- ProjectSettings/ProjectSettings.asset | 13 +- ProjectSettings/VFXManager.asset | 2 +- 24 files changed, 407 insertions(+), 90 deletions(-) create mode 100755 Assets/Audio/Accelerate.wav rename Assets/Audio/{MenuHigh.wav.meta => Accelerate.wav.meta} (91%) create mode 100755 Assets/Audio/Boost-1.wav rename Assets/Audio/{MenuLow.wav.meta => Boost-1.wav.meta} (91%) create mode 100755 Assets/Audio/Boost-2.wav create mode 100755 Assets/Audio/Boost-2.wav.meta create mode 100755 Assets/Audio/Decelerate.wav create mode 100755 Assets/Audio/Decelerate.wav.meta delete mode 100755 Assets/Audio/MenuHigh.wav delete mode 100755 Assets/Audio/MenuLow.wav create mode 100755 Assets/Audio/Strafe.wav create mode 100755 Assets/Audio/Strafe.wav.meta mode change 100644 => 100755 Assets/Resources/URPAsset.asset mode change 100644 => 100755 Assets/Scenes/sr_junglism2.unity mode change 100644 => 100755 Assets/Scenes/sr_silverstorage.unity delete mode 100755 Assets/Src/Audio.cs create mode 100755 Assets/Src/ShipAudio.cs rename Assets/Src/{Audio.cs.meta => ShipAudio.cs.meta} (83%) mode change 100644 => 100755 ProjectSettings/ProjectSettings.asset mode change 100644 => 100755 ProjectSettings/VFXManager.asset diff --git a/Assets/Audio/Accelerate.wav b/Assets/Audio/Accelerate.wav new file mode 100755 index 0000000..ebe38c5 --- /dev/null +++ b/Assets/Audio/Accelerate.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc075a81ef80ea493c3e913eec8e47bd1fc18775692f3f5f6ccdc8f4450f63d1 +size 210988 diff --git a/Assets/Audio/MenuHigh.wav.meta b/Assets/Audio/Accelerate.wav.meta similarity index 91% rename from Assets/Audio/MenuHigh.wav.meta rename to Assets/Audio/Accelerate.wav.meta index 45ccfea..d29d6d4 100755 --- a/Assets/Audio/MenuHigh.wav.meta +++ b/Assets/Audio/Accelerate.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10a4e1180cb3be54da0d7d98dd327c8c +guid: 613e0b85af271854f9d89cb48db1445b AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Boost-1.wav b/Assets/Audio/Boost-1.wav new file mode 100755 index 0000000..af4d2d5 --- /dev/null +++ b/Assets/Audio/Boost-1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17663071d7867c318e6f2d1494094b798436399e7e2b7443264030ad893e1dfb +size 1411244 diff --git a/Assets/Audio/MenuLow.wav.meta b/Assets/Audio/Boost-1.wav.meta similarity index 91% rename from Assets/Audio/MenuLow.wav.meta rename to Assets/Audio/Boost-1.wav.meta index 7fa9c8c..44b9deb 100755 --- a/Assets/Audio/MenuLow.wav.meta +++ b/Assets/Audio/Boost-1.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1cdd6e27104267647b16db497f41744f +guid: f5e946c296766694b97892f7386e533e AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Boost-2.wav b/Assets/Audio/Boost-2.wav new file mode 100755 index 0000000..1a535ac --- /dev/null +++ b/Assets/Audio/Boost-2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7659663580bba8c49e12f2193626a34f8d40864249a51fc0539c74edfb44c66 +size 1411244 diff --git a/Assets/Audio/Boost-2.wav.meta b/Assets/Audio/Boost-2.wav.meta new file mode 100755 index 0000000..5c77e7d --- /dev/null +++ b/Assets/Audio/Boost-2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4ba402be6dacb3340a1c791560c97b97 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Decelerate.wav b/Assets/Audio/Decelerate.wav new file mode 100755 index 0000000..bd6a280 --- /dev/null +++ b/Assets/Audio/Decelerate.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:673a54435dc9e583a62a1606ca32647be564d44c8951ab7c3e2744d86dd71f21 +size 427964 diff --git a/Assets/Audio/Decelerate.wav.meta b/Assets/Audio/Decelerate.wav.meta new file mode 100755 index 0000000..b8d56a6 --- /dev/null +++ b/Assets/Audio/Decelerate.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0384b39259118674781276c265b83dec +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/MenuHigh.wav b/Assets/Audio/MenuHigh.wav deleted file mode 100755 index 61d2ff8..0000000 --- a/Assets/Audio/MenuHigh.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49a453239d940b0f4e86f46c23c4fd77740fdf10f2fd0eb7a5fcf72d56229344 -size 1411244 diff --git a/Assets/Audio/MenuLow.wav b/Assets/Audio/MenuLow.wav deleted file mode 100755 index 0d56eff..0000000 --- a/Assets/Audio/MenuLow.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f7d857dc0f784214e924676d4a5c916f3c2621660b0f83193d08f5167b1687a -size 1411244 diff --git a/Assets/Audio/Strafe.wav b/Assets/Audio/Strafe.wav new file mode 100755 index 0000000..98a3f1a --- /dev/null +++ b/Assets/Audio/Strafe.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce1995ebcf201e3d1e7eb28c661ebe8739a1532ed982cc2af441f2521bfa8812 +size 338268 diff --git a/Assets/Audio/Strafe.wav.meta b/Assets/Audio/Strafe.wav.meta new file mode 100755 index 0000000..d27d1bb --- /dev/null +++ b/Assets/Audio/Strafe.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b34b1ec00bb1ba643afcdc88ea960e06 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ship/Ship.prefab b/Assets/Prefabs/Ship/Ship.prefab index 29edaeb..e3d6668 100755 --- a/Assets/Prefabs/Ship/Ship.prefab +++ b/Assets/Prefabs/Ship/Ship.prefab @@ -220,6 +220,64 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ship: {fileID: 1093091269199902593} +--- !u!1 &4508084525431060037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7603488991399315273} + - component: {fileID: 2362953346451262734} + - component: {fileID: 6156246831092198731} + m_Layer: 10 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7603488991399315273 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508084525431060037} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3589635702276405719} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2362953346451262734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508084525431060037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} + m_Name: + m_EditorClassIdentifier: + soundNames: 020000000300000004000000 + clips: + - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} + - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} + - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} +--- !u!81 &6156246831092198731 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4508084525431060037} + m_Enabled: 1 --- !u!1 &5535911989893287240 GameObject: m_ObjectHideFlags: 0 @@ -445,6 +503,7 @@ Transform: - {fileID: 1526924705325842294} - {fileID: 3869627124329100603} - {fileID: 2024927552184032925} + - {fileID: 7603488991399315273} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3273845117821321837 diff --git a/Assets/Resources/URPAsset.asset b/Assets/Resources/URPAsset.asset old mode 100644 new mode 100755 diff --git a/Assets/Scenes/sr_junglism2.unity b/Assets/Scenes/sr_junglism2.unity old mode 100644 new mode 100755 index ee84c3d..9e01f45 --- a/Assets/Scenes/sr_junglism2.unity +++ b/Assets/Scenes/sr_junglism2.unity @@ -865,13 +865,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52048083} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 977.23474, y: -165.7302, z: -2086.4595} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &55853259 PrefabInstance: @@ -3760,6 +3760,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 203474076} + serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} m_LocalPosition: {x: 2578.8755, y: 251.83788, z: 212.81699} m_LocalScale: {x: 1, y: 1, z: 1} @@ -3767,7 +3768,6 @@ Transform: m_Children: - {fileID: 887408362} m_Father: {fileID: 766862835} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!114 &203474082 MonoBehaviour: @@ -7726,13 +7726,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 475149571} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 3146.8, y: 251, z: 311.4} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &475769272 PrefabInstance: @@ -10801,13 +10801,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: -0.27417248, y: -0.3337574, z: 0.3633117, w: 0.8254938} m_LocalPosition: {x: -365.9992, y: -2002.0156, z: -426.01685} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1906469785} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: -167.869, y: 129.88, z: -126.800995} --- !u!114 &705507997 MonoBehaviour: @@ -11918,13 +11918,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 755742072} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9998229, z: -0, w: -0.018819254} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1136171772} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: -182.157, z: 0} --- !u!73398921 &755742074 VFXRenderer: @@ -13763,13 +13763,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 887408361} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 203474081} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!73398921 &887408363 VFXRenderer: @@ -14927,6 +14927,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 955820482} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1773.5925, y: -52.500008, z: 877.1588} m_LocalScale: {x: 1, y: 1, z: 1} @@ -15356,7 +15357,6 @@ Transform: - {fileID: 1651403266} - {fileID: 112688477} m_Father: {fileID: 2050641105} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &956530159 PrefabInstance: @@ -18699,6 +18699,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1136171767} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 1654.8756, y: -183.06215, z: -2418.183} m_LocalScale: {x: 1, y: 1, z: 1} @@ -18706,7 +18707,6 @@ Transform: m_Children: - {fileID: 755742073} m_Father: {fileID: 766862835} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!114 &1136171773 MonoBehaviour: @@ -32197,6 +32197,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906469784} + serializedVersion: 2 m_LocalRotation: {x: 0.71074754, y: 0.5701635, z: -0.3333826, w: 0.24209014} m_LocalPosition: {x: 2416.41, y: 267.92, z: -1402} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32204,7 +32205,6 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1913193847 stripped Transform: @@ -33530,7 +33530,8 @@ PrefabInstance: propertyPath: m_Name value: Ship objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7510218262252450460, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -34160,6 +34161,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050641104} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1773.5925, y: 52.500008, z: -877.1588} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34167,7 +34169,6 @@ Transform: m_Children: - {fileID: 955820483} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2059307177 PrefabInstance: @@ -35798,3 +35799,14 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a51212e10250274a8feda6be865b7c, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 52048085} + - {fileID: 1906469785} + - {fileID: 2050641105} + - {fileID: 475149573} + - {fileID: 766862834} + - {fileID: 327871849} + - {fileID: 2015948213} diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity old mode 100644 new mode 100755 index 1f9e464..efe04c9 --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -333,13 +333,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: -0.27417248, y: -0.3337574, z: 0.3633117, w: 0.8254938} m_LocalPosition: {x: 0, y: 100, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1906469785} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: -167.869, y: 129.88, z: -126.800995} --- !u!114 &705507997 MonoBehaviour: @@ -536,6 +536,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965851723} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9914445, z: -0, w: 0.13052872} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} @@ -543,7 +544,6 @@ Transform: m_Children: - {fileID: 1556238047} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -165, z: 0} --- !u!114 &1088368772 stripped MonoBehaviour: @@ -556,6 +556,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1359172646 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 5198188376350273124} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1359172648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359172646} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: + soundNames: 020000000300000004000000 + clips: + - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} + - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} + - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} --- !u!1001 &1556238046 PrefabInstance: m_ObjectHideFlags: 0 @@ -865,6 +887,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906469784} + serializedVersion: 2 m_LocalRotation: {x: 0.71074754, y: 0.5701635, z: -0.3333826, w: 0.24209014} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -872,7 +895,6 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1972710421 stripped MonoBehaviour: @@ -1157,10 +1179,15 @@ PrefabInstance: propertyPath: m_Name value: Ship objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2362953346451262734, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + - {fileID: 6156246831092198731, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + insertIndex: -1 + addedObject: {fileID: 1359172648} m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} --- !u!114 &5198188376350273125 stripped MonoBehaviour: @@ -1195,3 +1222,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1906469785} + - {fileID: 965851724} + - {fileID: 656092325660581143} + - {fileID: 5198188376350273124} + - {fileID: 766862834} diff --git a/Assets/Src/Audio.cs b/Assets/Src/Audio.cs deleted file mode 100755 index 21f1917..0000000 --- a/Assets/Src/Audio.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System.Collections; -using System.Collections.Generic; - -using UnityEngine; - -public enum Sound { - MenuLow, - MenuHigh, - - Accelerate, - Decelerate, - Strafe, - - Damage, - Respawn, - - BoostAcceleration, - BoostDeceleration, - BoostStrafe, - BoostShield, - - BoostGenerate, - BoostAvailable, - BoostFull, - BoostDrain, -} - -[RequireComponent(typeof(AudioSource))] -public class Audio : MonoBehaviour { - [SerializeField] - Sound[] soundNames; - - [SerializeField] - AudioClip[] clips; - - Dictionary sounds = new(); - - AudioSource source; - - void Start() { - source = GetComponent(); - - for (int i = 0; i < clips.Length; i++) { - sounds.Add(soundNames[i], clips[i]); - } - } - - public void PlaySound(Sound s) { - AudioClip clip; - bool found = sounds.TryGetValue(s, out clip); - if (clip) { - source.clip = clip; - source.Play(0); - } - } -} \ No newline at end of file diff --git a/Assets/Src/ShipAudio.cs b/Assets/Src/ShipAudio.cs new file mode 100755 index 0000000..dde6374 --- /dev/null +++ b/Assets/Src/ShipAudio.cs @@ -0,0 +1,183 @@ +using System; +using System.Collections; +using System.Collections.Generic; + +using UnityEngine; +using UnityEngine.InputSystem; + +public enum Sound { + MenuLow, + MenuHigh, + + Accelerate, + Decelerate, + Strafe, + + Damage, + Respawn, + + BoostAcceleration, + BoostDeceleration, + BoostStrafe, + BoostShield, + + BoostGenerate, + BoostAvailable, + BoostFull, + BoostDrain, +} + +public class ShipAudio : MonoBehaviour { + // Match these two up + [SerializeField] + Sound[] soundNames; + + [SerializeField] + AudioClip[] clips; + + Dictionary sounds = new(); + + AudioSource srcAccel; + AudioSource srcDecel; + AudioSource srcStrafe; + + SpaceRaceInput input; + ShipControls ship; + + void Awake() { + for (int i = 0; i < clips.Length; i++) { + sounds.Add(soundNames[i], clips[i]); + } + + ship = GetComponentInParent(); + + srcAccel = gameObject.AddComponent(); + srcAccel.clip = sounds[Sound.Accelerate]; + srcAccel.loop = true; + srcAccel.volume = 0f; + srcAccel.Play(); + + srcDecel = gameObject.AddComponent(); + srcDecel.clip = sounds[Sound.Decelerate]; + srcDecel.loop = true; + srcDecel.volume = 0f; + srcDecel.Play(); + + srcStrafe = gameObject.AddComponent(); + srcStrafe.clip = sounds[Sound.Strafe]; + srcStrafe.loop = true; + srcStrafe.volume = 0f; + srcStrafe.Play(); + + RegisterEvents(); + } + + void Update() { + srcAccel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcDecel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcStrafe.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + + // Super fucking annoying + // stops all the clicks and pops of starting / stopping the clips + // 0.125s to get max volume + // == 8x per second... + float volumeDelta = Time.deltaTime / 8000; + + bool accelerating = input.ship.accelerate.ReadValue() > 0; + bool decelerating = input.ship.decelerate.ReadValue() > 0; + bool strafing = input.ship.strafe.ReadValue().magnitude > 0; + + if (accelerating) { + srcAccel.volume = Math.Max(1f, srcAccel.volume + volumeDelta); + } else { + srcAccel.volume = Math.Min(0f, srcAccel.volume - volumeDelta); + } + + if (decelerating) { + srcDecel.volume = Math.Max(1f, srcDecel.volume + volumeDelta); + } else { + srcDecel.volume = Math.Min(0f, srcDecel.volume - volumeDelta); + } + + if (strafing) { + srcStrafe.volume = Math.Max(1f, srcStrafe.volume + volumeDelta); + } else { + srcStrafe.volume = Math.Min(0f, srcStrafe.volume - volumeDelta); + } + } + + + // public void PlaySound(Sound s) { + // AudioSource src = sounds[s]; + // src.Play(0); + // } + + void RegisterEvents() { + if (input == null) + input = new SpaceRaceInput(); + + input.ship.Enable(); + + // input.ship.accelerate.started += OnAccelerateStart; + // input.ship.accelerate.canceled += OnAccelerateCancel; + // input.ship.decelerate.started += OnDecelerateStart; + // input.ship.decelerate.canceled += OnDecelerateCancel; + // input.ship.strafe.started += OnStrafeStart; + // input.ship.strafe.canceled += OnStrafeCancel; + + // these we only care about the initial press + // input.ship.respawn.started += OnRespawn; + // input.ship.quit.started += OnQuit; + // input.ship.powerUnit1.started += OnPowerUnit1; + // input.ship.powerUnit2.started += OnPowerUnit2; + // input.ship.powerUnit3.started += OnPowerUnit3; + // input.ship.powerUnit4.started += OnPowerUnit4; + } + + // void OnDestroy() { + // input.ship.accelerate.started -= OnAccelerateStart; + // input.ship.accelerate.canceled -= OnAccelerateCancel; + // input.ship.decelerate.started -= OnDecelerateStart; + // input.ship.decelerate.canceled -= OnDecelerateCancel; + // input.ship.strafe.started -= OnStrafeStart; + // input.ship.strafe.canceled -= OnStrafeCancel; + + + // // these we only care about the initial press + // input.ship.respawn.started -= OnRespawn; + // input.ship.quit.started -= OnQuit; + // input.ship.powerUnit1.started -= OnPowerUnit1; + // input.ship.powerUnit2.started -= OnPowerUnit2; + // input.ship.powerUnit3.started -= OnPowerUnit3; + // input.ship.powerUnit4.started -= OnPowerUnit4; + // } + + // void OnAcceleratePerformed(InputAction.CallbackContext _ctx) { + // Debug.Log(_ctx.duration); + // } + + // void OnAccelerateStart(InputAction.CallbackContext _ctx) { + // srcAccel.Play(); + // } + + // void OnAccelerateCancel(InputAction.CallbackContext _ctx) { + // srcAccel.Stop(); + // } + + // void OnDecelerateStart(InputAction.CallbackContext _ctx) { + // srcDecel.Play(); + // } + + // void OnDecelerateCancel(InputAction.CallbackContext _ctx) { + // srcDecel.Stop(); + // } + + // void OnStrafeStart(InputAction.CallbackContext _ctx) { + // srcStrafe.Play(); + // } + + // void OnStrafeCancel(InputAction.CallbackContext _ctx) { + // srcStrafe.Stop(); + // } +} + diff --git a/Assets/Src/Audio.cs.meta b/Assets/Src/ShipAudio.cs.meta similarity index 83% rename from Assets/Src/Audio.cs.meta rename to Assets/Src/ShipAudio.cs.meta index ff72c4a..bd9f3ca 100755 --- a/Assets/Src/Audio.cs.meta +++ b/Assets/Src/ShipAudio.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2 +guid: 566ffe93221add0489d9a9a01670b93a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Src/ShipControls.cs b/Assets/Src/ShipControls.cs index c7119c6..619e271 100755 --- a/Assets/Src/ShipControls.cs +++ b/Assets/Src/ShipControls.cs @@ -47,6 +47,10 @@ public class ShipControls : MonoBehaviour { public float Speed => rigidBody.velocity.magnitude; + // used for audio + public bool Accelerating => input.ship.accelerate.ReadValue() > 0; + public bool Decelerating => input.ship.decelerate.ReadValue() > 0; + void Start() { Cursor.lockState = CursorLockMode.Locked; rigidBody = GetComponent(); diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs index 833dea4..5d86d34 100644 --- a/Assets/Src/UI/MenuControls.cs +++ b/Assets/Src/UI/MenuControls.cs @@ -29,7 +29,7 @@ public class MenuControls : MonoBehaviour { ControlsUI controlsUI; [SerializeField] - Audio audio; + ShipAudio audio; SpaceRaceInput input; diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cd5a96f..1271455 100755 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,7 +7,7 @@ "dependencies": {} }, "com.unity.burst": { - "version": "1.8.7", + "version": "1.8.8", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset old mode 100644 new mode 100755 index e78549c..ac57a9d --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -88,6 +88,7 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -127,6 +128,7 @@ PlayerSettings: switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -136,8 +138,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 1.0 - preloadedAssets: - - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -186,8 +187,8 @@ PlayerSettings: tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 tvOSTargetOSVersionString: 12.0 - bratwurstSdkVersion: 0 - bratwurstTargetOSVersionString: 16.4 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -235,10 +236,10 @@ PlayerSettings: appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: - bratwurstManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 - bratwurstManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset old mode 100644 new mode 100755 index 807920d..87823a9 --- a/ProjectSettings/VFXManager.asset +++ b/ProjectSettings/VFXManager.asset @@ -12,6 +12,6 @@ VFXManager: m_MaxDeltaTime: 0.05 m_MaxScrubTime: 30 m_CompiledVersion: 7 - m_RuntimeVersion: 33 + m_RuntimeVersion: 35 m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2} m_BatchEmptyLifetime: 300 From 336945533bbe3498376c5ab3ea853ba2391525ac Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 26 Sep 2023 20:46:38 +1000 Subject: [PATCH 3/7] backoff sounds --- Assets/Src/ShipAudio.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/Src/ShipAudio.cs b/Assets/Src/ShipAudio.cs index dde6374..bfc567e 100755 --- a/Assets/Src/ShipAudio.cs +++ b/Assets/Src/ShipAudio.cs @@ -81,28 +81,29 @@ public class ShipAudio : MonoBehaviour { // stops all the clicks and pops of starting / stopping the clips // 0.125s to get max volume // == 8x per second... - float volumeDelta = Time.deltaTime / 8000; + float volumeDelta = Time.deltaTime * 8; + float decelDelta = (1 / ship.Speed); bool accelerating = input.ship.accelerate.ReadValue() > 0; bool decelerating = input.ship.decelerate.ReadValue() > 0; bool strafing = input.ship.strafe.ReadValue().magnitude > 0; if (accelerating) { - srcAccel.volume = Math.Max(1f, srcAccel.volume + volumeDelta); + srcAccel.volume = Math.Min(1f, srcAccel.volume + volumeDelta); } else { - srcAccel.volume = Math.Min(0f, srcAccel.volume - volumeDelta); + srcAccel.volume = Math.Max(0f, srcAccel.volume - decelDelta); } if (decelerating) { - srcDecel.volume = Math.Max(1f, srcDecel.volume + volumeDelta); + srcDecel.volume = Math.Min(1f, srcDecel.volume + volumeDelta); } else { - srcDecel.volume = Math.Min(0f, srcDecel.volume - volumeDelta); + srcDecel.volume = Math.Max(0f, srcDecel.volume - decelDelta); } if (strafing) { - srcStrafe.volume = Math.Max(1f, srcStrafe.volume + volumeDelta); + srcStrafe.volume = Math.Min(1f, srcStrafe.volume + volumeDelta); } else { - srcStrafe.volume = Math.Min(0f, srcStrafe.volume - volumeDelta); + srcStrafe.volume = Math.Max(0f, srcStrafe.volume - decelDelta); } } From 9f6e615653ee76159c11061b2e7d66467c9b78ed Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 01:34:36 +1000 Subject: [PATCH 4/7] we poppin --- Assets/Audio/Boost-1.wav | 3 - Assets/Audio/Boost-2.wav | 3 - Assets/Audio/Noise.meta | 8 + Assets/Audio/Noise/01.meta | 8 + Assets/Audio/Noise/01/1.BIG.wav | 3 + .../01/1.BIG.wav.meta} | 2 +- Assets/Audio/Noise/01/10.wav | 3 + .../01/10.wav.meta} | 2 +- Assets/Audio/Noise/01/11.wav | 3 + .../01/11.wav.meta} | 2 +- Assets/Audio/Noise/01/12.wav | 3 + Assets/Audio/Noise/01/12.wav.meta | 23 +++ Assets/Audio/Noise/01/13.wav | 3 + Assets/Audio/Noise/01/13.wav.meta | 23 +++ Assets/Audio/Noise/01/14.wav | 3 + Assets/Audio/Noise/01/14.wav.meta | 23 +++ Assets/Audio/Noise/01/2.wav | 3 + Assets/Audio/Noise/01/2.wav.meta | 23 +++ Assets/Audio/Noise/01/3.wav | 3 + Assets/Audio/Noise/01/3.wav.meta | 23 +++ Assets/Audio/Noise/01/4.wav | 3 + Assets/Audio/Noise/01/4.wav.meta | 23 +++ Assets/Audio/Noise/01/5.wav | 3 + Assets/Audio/Noise/01/5.wav.meta | 23 +++ Assets/Audio/Noise/01/6.wav | 3 + Assets/Audio/Noise/01/6.wav.meta | 23 +++ Assets/Audio/Noise/01/7.wav | 3 + Assets/Audio/Noise/01/7.wav.meta | 23 +++ Assets/Audio/Noise/01/8.wav | 3 + Assets/Audio/Noise/01/8.wav.meta | 23 +++ Assets/Audio/Noise/01/9.wav | 3 + Assets/Audio/Noise/01/9.wav.meta | 23 +++ Assets/Audio/Noise/02.meta | 8 + Assets/Audio/Noise/02/16.wav | 3 + Assets/Audio/Noise/02/16.wav.meta | 23 +++ Assets/Audio/Noise/07.meta | 8 + Assets/Audio/Noise/07/0.wav | 3 + Assets/Audio/Noise/07/0.wav.meta | 23 +++ Assets/Audio/Noise/07/1.wav | 3 + Assets/Audio/Noise/07/1.wav.meta | 23 +++ Assets/Audio/Noise/07/10.wav | 3 + Assets/Audio/Noise/07/10.wav.meta | 23 +++ Assets/Audio/Noise/07/11.wav | 3 + Assets/Audio/Noise/07/11.wav.meta | 23 +++ Assets/Audio/Noise/07/12.wav | 3 + Assets/Audio/Noise/07/12.wav.meta | 23 +++ Assets/Audio/Noise/07/13.wav | 3 + Assets/Audio/Noise/07/13.wav.meta | 23 +++ Assets/Audio/Noise/07/14.wav | 3 + Assets/Audio/Noise/07/14.wav.meta | 23 +++ Assets/Audio/Noise/07/15.wav | 3 + Assets/Audio/Noise/07/15.wav.meta | 23 +++ Assets/Audio/Noise/07/16.wav | 3 + Assets/Audio/Noise/07/16.wav.meta | 23 +++ Assets/Audio/Noise/07/17.wav | 3 + Assets/Audio/Noise/07/17.wav.meta | 23 +++ Assets/Audio/Noise/07/2.wav | 3 + Assets/Audio/Noise/07/2.wav.meta | 23 +++ Assets/Audio/Noise/07/3.wav | 3 + Assets/Audio/Noise/07/3.wav.meta | 23 +++ Assets/Audio/Noise/07/4.wav | 3 + Assets/Audio/Noise/07/4.wav.meta | 23 +++ Assets/Audio/Noise/07/5.wav | 3 + Assets/Audio/Noise/07/5.wav.meta | 23 +++ Assets/Audio/Noise/07/6.wav | 3 + Assets/Audio/Noise/07/6.wav.meta | 23 +++ Assets/Audio/Noise/07/7.wav | 3 + Assets/Audio/Noise/07/7.wav.meta | 23 +++ Assets/Audio/Noise/07/8.wav | 3 + Assets/Audio/Noise/07/8.wav.meta | 23 +++ Assets/Audio/Noise/07/9.wav | 3 + Assets/Audio/Noise/07/9.wav.meta | 23 +++ ...ccelerate.wav => PowerUnit.Accelerate.wav} | 0 ...wav.meta => PowerUnit.Accelerate.wav.meta} | 0 ...ecelerate.wav => PowerUnit.Decelerate.wav} | 0 ...wav.meta => PowerUnit.Decelerate.wav.meta} | 0 .../{Strafe.wav => PowerUnit.Strafe.wav} | 0 ...afe.wav.meta => PowerUnit.Strafe.wav.meta} | 0 Assets/Audio/ZTCT_Clap_24 R.wav | 3 - Assets/Prefabs/Ship/Ship.prefab | 53 +++++-- Assets/Scenes/sr_pascal.unity | 21 ++- Assets/Scenes/sr_silverstorage.unity | 35 ++-- Assets/Src/PowerUnit.cs | 11 +- Assets/Src/ShipAudio.cs | 150 ++++++------------ Assets/Src/ShipControls.cs | 17 +- Assets/Src/Timing.cs | 7 + Assets/Src/UI/MenuControls.cs | 1 + TODO.md | 18 ++- 88 files changed, 979 insertions(+), 170 deletions(-) delete mode 100755 Assets/Audio/Boost-1.wav delete mode 100755 Assets/Audio/Boost-2.wav create mode 100755 Assets/Audio/Noise.meta create mode 100755 Assets/Audio/Noise/01.meta create mode 100755 Assets/Audio/Noise/01/1.BIG.wav rename Assets/Audio/{ZTCT_Clap_24 R.wav.meta => Noise/01/1.BIG.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/10.wav rename Assets/Audio/{Boost-1.wav.meta => Noise/01/10.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/11.wav rename Assets/Audio/{Boost-2.wav.meta => Noise/01/11.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/12.wav create mode 100755 Assets/Audio/Noise/01/12.wav.meta create mode 100755 Assets/Audio/Noise/01/13.wav create mode 100755 Assets/Audio/Noise/01/13.wav.meta create mode 100755 Assets/Audio/Noise/01/14.wav create mode 100755 Assets/Audio/Noise/01/14.wav.meta create mode 100755 Assets/Audio/Noise/01/2.wav create mode 100755 Assets/Audio/Noise/01/2.wav.meta create mode 100755 Assets/Audio/Noise/01/3.wav create mode 100755 Assets/Audio/Noise/01/3.wav.meta create mode 100755 Assets/Audio/Noise/01/4.wav create mode 100755 Assets/Audio/Noise/01/4.wav.meta create mode 100755 Assets/Audio/Noise/01/5.wav create mode 100755 Assets/Audio/Noise/01/5.wav.meta create mode 100755 Assets/Audio/Noise/01/6.wav create mode 100755 Assets/Audio/Noise/01/6.wav.meta create mode 100755 Assets/Audio/Noise/01/7.wav create mode 100755 Assets/Audio/Noise/01/7.wav.meta create mode 100755 Assets/Audio/Noise/01/8.wav create mode 100755 Assets/Audio/Noise/01/8.wav.meta create mode 100755 Assets/Audio/Noise/01/9.wav create mode 100755 Assets/Audio/Noise/01/9.wav.meta create mode 100755 Assets/Audio/Noise/02.meta create mode 100755 Assets/Audio/Noise/02/16.wav create mode 100755 Assets/Audio/Noise/02/16.wav.meta create mode 100755 Assets/Audio/Noise/07.meta create mode 100755 Assets/Audio/Noise/07/0.wav create mode 100755 Assets/Audio/Noise/07/0.wav.meta create mode 100755 Assets/Audio/Noise/07/1.wav create mode 100755 Assets/Audio/Noise/07/1.wav.meta create mode 100755 Assets/Audio/Noise/07/10.wav create mode 100755 Assets/Audio/Noise/07/10.wav.meta create mode 100755 Assets/Audio/Noise/07/11.wav create mode 100755 Assets/Audio/Noise/07/11.wav.meta create mode 100755 Assets/Audio/Noise/07/12.wav create mode 100755 Assets/Audio/Noise/07/12.wav.meta create mode 100755 Assets/Audio/Noise/07/13.wav create mode 100755 Assets/Audio/Noise/07/13.wav.meta create mode 100755 Assets/Audio/Noise/07/14.wav create mode 100755 Assets/Audio/Noise/07/14.wav.meta create mode 100755 Assets/Audio/Noise/07/15.wav create mode 100755 Assets/Audio/Noise/07/15.wav.meta create mode 100755 Assets/Audio/Noise/07/16.wav create mode 100755 Assets/Audio/Noise/07/16.wav.meta create mode 100755 Assets/Audio/Noise/07/17.wav create mode 100755 Assets/Audio/Noise/07/17.wav.meta create mode 100755 Assets/Audio/Noise/07/2.wav create mode 100755 Assets/Audio/Noise/07/2.wav.meta create mode 100755 Assets/Audio/Noise/07/3.wav create mode 100755 Assets/Audio/Noise/07/3.wav.meta create mode 100755 Assets/Audio/Noise/07/4.wav create mode 100755 Assets/Audio/Noise/07/4.wav.meta create mode 100755 Assets/Audio/Noise/07/5.wav create mode 100755 Assets/Audio/Noise/07/5.wav.meta create mode 100755 Assets/Audio/Noise/07/6.wav create mode 100755 Assets/Audio/Noise/07/6.wav.meta create mode 100755 Assets/Audio/Noise/07/7.wav create mode 100755 Assets/Audio/Noise/07/7.wav.meta create mode 100755 Assets/Audio/Noise/07/8.wav create mode 100755 Assets/Audio/Noise/07/8.wav.meta create mode 100755 Assets/Audio/Noise/07/9.wav create mode 100755 Assets/Audio/Noise/07/9.wav.meta rename Assets/Audio/{Accelerate.wav => PowerUnit.Accelerate.wav} (100%) rename Assets/Audio/{Accelerate.wav.meta => PowerUnit.Accelerate.wav.meta} (100%) rename Assets/Audio/{Decelerate.wav => PowerUnit.Decelerate.wav} (100%) rename Assets/Audio/{Decelerate.wav.meta => PowerUnit.Decelerate.wav.meta} (100%) rename Assets/Audio/{Strafe.wav => PowerUnit.Strafe.wav} (100%) rename Assets/Audio/{Strafe.wav.meta => PowerUnit.Strafe.wav.meta} (100%) delete mode 100755 Assets/Audio/ZTCT_Clap_24 R.wav diff --git a/Assets/Audio/Boost-1.wav b/Assets/Audio/Boost-1.wav deleted file mode 100755 index af4d2d5..0000000 --- a/Assets/Audio/Boost-1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17663071d7867c318e6f2d1494094b798436399e7e2b7443264030ad893e1dfb -size 1411244 diff --git a/Assets/Audio/Boost-2.wav b/Assets/Audio/Boost-2.wav deleted file mode 100755 index 1a535ac..0000000 --- a/Assets/Audio/Boost-2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7659663580bba8c49e12f2193626a34f8d40864249a51fc0539c74edfb44c66 -size 1411244 diff --git a/Assets/Audio/Noise.meta b/Assets/Audio/Noise.meta new file mode 100755 index 0000000..cd05cb5 --- /dev/null +++ b/Assets/Audio/Noise.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d7a9b3e791f03741b3f274c2dd078a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01.meta b/Assets/Audio/Noise/01.meta new file mode 100755 index 0000000..ace773c --- /dev/null +++ b/Assets/Audio/Noise/01.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2158f8f18d19cf48a507472c3707172 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/1.BIG.wav b/Assets/Audio/Noise/01/1.BIG.wav new file mode 100755 index 0000000..7c33eb8 --- /dev/null +++ b/Assets/Audio/Noise/01/1.BIG.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:624b259643a9d67b3de386440812427e06ab31ae7389f62d9a08d5a74a266b8e +size 705644 diff --git a/Assets/Audio/ZTCT_Clap_24 R.wav.meta b/Assets/Audio/Noise/01/1.BIG.wav.meta similarity index 91% rename from Assets/Audio/ZTCT_Clap_24 R.wav.meta rename to Assets/Audio/Noise/01/1.BIG.wav.meta index 17c0cb9..a661a27 100755 --- a/Assets/Audio/ZTCT_Clap_24 R.wav.meta +++ b/Assets/Audio/Noise/01/1.BIG.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62a5d2dd32e500a4fbb1d247c09bed24 +guid: c52fc17ffbb62644c88b20980a6246d7 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/10.wav b/Assets/Audio/Noise/01/10.wav new file mode 100755 index 0000000..8ad3e62 --- /dev/null +++ b/Assets/Audio/Noise/01/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:425cb7383ed9a476695cfe5d6d585a67d275c159657c32128d46c0f1bb62d444 +size 705644 diff --git a/Assets/Audio/Boost-1.wav.meta b/Assets/Audio/Noise/01/10.wav.meta similarity index 91% rename from Assets/Audio/Boost-1.wav.meta rename to Assets/Audio/Noise/01/10.wav.meta index 44b9deb..270f15b 100755 --- a/Assets/Audio/Boost-1.wav.meta +++ b/Assets/Audio/Noise/01/10.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5e946c296766694b97892f7386e533e +guid: fb6b7c1f2ddcfa5419fdf904f58ec1bf AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/11.wav b/Assets/Audio/Noise/01/11.wav new file mode 100755 index 0000000..152e653 --- /dev/null +++ b/Assets/Audio/Noise/01/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab4e84e7da12b78e2a6a4378bdbe11410b286052ad6c94a28255bfe3f3cbf246 +size 705644 diff --git a/Assets/Audio/Boost-2.wav.meta b/Assets/Audio/Noise/01/11.wav.meta similarity index 91% rename from Assets/Audio/Boost-2.wav.meta rename to Assets/Audio/Noise/01/11.wav.meta index 5c77e7d..23547e8 100755 --- a/Assets/Audio/Boost-2.wav.meta +++ b/Assets/Audio/Noise/01/11.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ba402be6dacb3340a1c791560c97b97 +guid: 3a2e4df8d17fd2b4a83afa676a843344 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/12.wav b/Assets/Audio/Noise/01/12.wav new file mode 100755 index 0000000..9acb125 --- /dev/null +++ b/Assets/Audio/Noise/01/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75d6f8d072471908c433f8b82a94ac1ece41e69838d3d55fb57d3037b5edafae +size 705644 diff --git a/Assets/Audio/Noise/01/12.wav.meta b/Assets/Audio/Noise/01/12.wav.meta new file mode 100755 index 0000000..a38fae0 --- /dev/null +++ b/Assets/Audio/Noise/01/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f583924dc9b327e4cae85a01bcac9fbb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/13.wav b/Assets/Audio/Noise/01/13.wav new file mode 100755 index 0000000..4b1fc35 --- /dev/null +++ b/Assets/Audio/Noise/01/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67b6694ac2c11df52e9655882d6d5f0c829fc6688950237f8446151117c352cb +size 705644 diff --git a/Assets/Audio/Noise/01/13.wav.meta b/Assets/Audio/Noise/01/13.wav.meta new file mode 100755 index 0000000..d2b694a --- /dev/null +++ b/Assets/Audio/Noise/01/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 52c705ef6868d2f428af01b1cba8b467 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/14.wav b/Assets/Audio/Noise/01/14.wav new file mode 100755 index 0000000..503ee52 --- /dev/null +++ b/Assets/Audio/Noise/01/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7897b1500869cd349f21de9460a2f74393d85d8c05bbdd69f08a5179aad9053e +size 705644 diff --git a/Assets/Audio/Noise/01/14.wav.meta b/Assets/Audio/Noise/01/14.wav.meta new file mode 100755 index 0000000..307fb95 --- /dev/null +++ b/Assets/Audio/Noise/01/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4e3236145e30dfc408fb66aad5be6784 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/2.wav b/Assets/Audio/Noise/01/2.wav new file mode 100755 index 0000000..ee65967 --- /dev/null +++ b/Assets/Audio/Noise/01/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6c3a42095820e4331d6de53a84703e55f5a699197100b8bb2cf894ccc586058 +size 705644 diff --git a/Assets/Audio/Noise/01/2.wav.meta b/Assets/Audio/Noise/01/2.wav.meta new file mode 100755 index 0000000..687c92d --- /dev/null +++ b/Assets/Audio/Noise/01/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0ed6ecab922275046bd752b40dd51ef3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/3.wav b/Assets/Audio/Noise/01/3.wav new file mode 100755 index 0000000..0ac47f4 --- /dev/null +++ b/Assets/Audio/Noise/01/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80cc6e0c3ad127ddeae4f348e3c8b7533fc4ea20431218e561e95fa93a2c5667 +size 705644 diff --git a/Assets/Audio/Noise/01/3.wav.meta b/Assets/Audio/Noise/01/3.wav.meta new file mode 100755 index 0000000..47a5bc8 --- /dev/null +++ b/Assets/Audio/Noise/01/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 45f55665bcea07d4390cd6b59f8ca6fa +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/4.wav b/Assets/Audio/Noise/01/4.wav new file mode 100755 index 0000000..97d5a67 --- /dev/null +++ b/Assets/Audio/Noise/01/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086742cf73b29c44590b6179acbe8296f4e879b6bcb2473d5f77a2eceee1d4a6 +size 705644 diff --git a/Assets/Audio/Noise/01/4.wav.meta b/Assets/Audio/Noise/01/4.wav.meta new file mode 100755 index 0000000..6abbb82 --- /dev/null +++ b/Assets/Audio/Noise/01/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 63478e3e2acdf794ea501d3eab9bb7a2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/5.wav b/Assets/Audio/Noise/01/5.wav new file mode 100755 index 0000000..04946d9 --- /dev/null +++ b/Assets/Audio/Noise/01/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcbb5dbcc428a462a5e77e7f0f6c82cfc8a8e8b312ae835b8f987984b68a6b1f +size 705644 diff --git a/Assets/Audio/Noise/01/5.wav.meta b/Assets/Audio/Noise/01/5.wav.meta new file mode 100755 index 0000000..9f11627 --- /dev/null +++ b/Assets/Audio/Noise/01/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d2ea8fc23ab87bc4cb3789939efcf439 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/6.wav b/Assets/Audio/Noise/01/6.wav new file mode 100755 index 0000000..c12c57d --- /dev/null +++ b/Assets/Audio/Noise/01/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b6e505426b8043b52f0c4ddbeb7fdf54f34d986dfeb4f0714161f025f6476c4 +size 705644 diff --git a/Assets/Audio/Noise/01/6.wav.meta b/Assets/Audio/Noise/01/6.wav.meta new file mode 100755 index 0000000..39ca119 --- /dev/null +++ b/Assets/Audio/Noise/01/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4545f08003ebef14f8734a8872612e21 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/7.wav b/Assets/Audio/Noise/01/7.wav new file mode 100755 index 0000000..87a48c8 --- /dev/null +++ b/Assets/Audio/Noise/01/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccb683ca86496de33d7b12c52a8632a5e2eb80e1a2117e6b09931a79a8d42f64 +size 705644 diff --git a/Assets/Audio/Noise/01/7.wav.meta b/Assets/Audio/Noise/01/7.wav.meta new file mode 100755 index 0000000..2d3e34d --- /dev/null +++ b/Assets/Audio/Noise/01/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a38b77da486de4e40b024459b4a92a8a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/8.wav b/Assets/Audio/Noise/01/8.wav new file mode 100755 index 0000000..5c8d590 --- /dev/null +++ b/Assets/Audio/Noise/01/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:977693f34bd61bb0f943901b95799d5304c4ac61d8e152835063b296663ed539 +size 705644 diff --git a/Assets/Audio/Noise/01/8.wav.meta b/Assets/Audio/Noise/01/8.wav.meta new file mode 100755 index 0000000..8c73be4 --- /dev/null +++ b/Assets/Audio/Noise/01/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 32199418c77542547b4b46a7fcc6f218 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/9.wav b/Assets/Audio/Noise/01/9.wav new file mode 100755 index 0000000..7affa86 --- /dev/null +++ b/Assets/Audio/Noise/01/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4fed348af693d6de90cfa82b8723cb4f4d2c3d7ba8e42ba9bb347976aa3b906 +size 705644 diff --git a/Assets/Audio/Noise/01/9.wav.meta b/Assets/Audio/Noise/01/9.wav.meta new file mode 100755 index 0000000..b26f6f4 --- /dev/null +++ b/Assets/Audio/Noise/01/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e66117d9890e0804b95f62379c8d53bf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02.meta b/Assets/Audio/Noise/02.meta new file mode 100755 index 0000000..d2a3749 --- /dev/null +++ b/Assets/Audio/Noise/02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7db28024917df8843805d13e839bd7f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/16.wav b/Assets/Audio/Noise/02/16.wav new file mode 100755 index 0000000..08b5ee0 --- /dev/null +++ b/Assets/Audio/Noise/02/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c7b658307096818dd916f35c0b74fc791098795bb9fb13c4d8dd8fa54e540a9 +size 705644 diff --git a/Assets/Audio/Noise/02/16.wav.meta b/Assets/Audio/Noise/02/16.wav.meta new file mode 100755 index 0000000..d4c90c9 --- /dev/null +++ b/Assets/Audio/Noise/02/16.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 71d125ff384d86a4fb44b6942b74306d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07.meta b/Assets/Audio/Noise/07.meta new file mode 100755 index 0000000..ba63168 --- /dev/null +++ b/Assets/Audio/Noise/07.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00c2ca68da5a0ff499091c78c9d8d844 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/0.wav b/Assets/Audio/Noise/07/0.wav new file mode 100755 index 0000000..7e4d647 --- /dev/null +++ b/Assets/Audio/Noise/07/0.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2563808b5ad1f93d684a9bb817e800f679684dc6beb6da865c843259a0185287 +size 705644 diff --git a/Assets/Audio/Noise/07/0.wav.meta b/Assets/Audio/Noise/07/0.wav.meta new file mode 100755 index 0000000..96ab20f --- /dev/null +++ b/Assets/Audio/Noise/07/0.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 95082891fb63e274abda1ad451ffe39f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/1.wav b/Assets/Audio/Noise/07/1.wav new file mode 100755 index 0000000..55705d7 --- /dev/null +++ b/Assets/Audio/Noise/07/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fb33c91bb8572f12ac7f2e0bad5fa889b96b6f062468d07103c66f5db3538f0 +size 705644 diff --git a/Assets/Audio/Noise/07/1.wav.meta b/Assets/Audio/Noise/07/1.wav.meta new file mode 100755 index 0000000..e72bdcc --- /dev/null +++ b/Assets/Audio/Noise/07/1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d6ffb0204d35fb04daa131fb572a72cb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/10.wav b/Assets/Audio/Noise/07/10.wav new file mode 100755 index 0000000..063bbc4 --- /dev/null +++ b/Assets/Audio/Noise/07/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d95c26eaf0b68a62eaeab758b838646bcf3a0be701f03b24b8d48f7d1c95acdc +size 705644 diff --git a/Assets/Audio/Noise/07/10.wav.meta b/Assets/Audio/Noise/07/10.wav.meta new file mode 100755 index 0000000..22d967b --- /dev/null +++ b/Assets/Audio/Noise/07/10.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fc5640ccfc4aab24b83ff89a7ab4348e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/11.wav b/Assets/Audio/Noise/07/11.wav new file mode 100755 index 0000000..a39b93a --- /dev/null +++ b/Assets/Audio/Noise/07/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5696336aae456156ffde9154f682796d8fd43c9fdd92803d22f3288acf1139da +size 705644 diff --git a/Assets/Audio/Noise/07/11.wav.meta b/Assets/Audio/Noise/07/11.wav.meta new file mode 100755 index 0000000..6124ffe --- /dev/null +++ b/Assets/Audio/Noise/07/11.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c0bedc4d9738b4a4ab6459177c080265 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/12.wav b/Assets/Audio/Noise/07/12.wav new file mode 100755 index 0000000..21b90d3 --- /dev/null +++ b/Assets/Audio/Noise/07/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0050060f880b18cedaa30895ea69a4b0eb701a9fa79a070ebcf1b81bfeffb174 +size 705644 diff --git a/Assets/Audio/Noise/07/12.wav.meta b/Assets/Audio/Noise/07/12.wav.meta new file mode 100755 index 0000000..f9f76f6 --- /dev/null +++ b/Assets/Audio/Noise/07/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b9e6166ef51af684daaecef0a60f1a7d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/13.wav b/Assets/Audio/Noise/07/13.wav new file mode 100755 index 0000000..ed55bcc --- /dev/null +++ b/Assets/Audio/Noise/07/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4b9a97183c3f3f57b145bcf99808f1be2bf3a824fd23e3481c5dfc1b101ec9b +size 705644 diff --git a/Assets/Audio/Noise/07/13.wav.meta b/Assets/Audio/Noise/07/13.wav.meta new file mode 100755 index 0000000..32f2578 --- /dev/null +++ b/Assets/Audio/Noise/07/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e03e3e2d19a1c944b96467bdca7c5229 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/14.wav b/Assets/Audio/Noise/07/14.wav new file mode 100755 index 0000000..d8ddf66 --- /dev/null +++ b/Assets/Audio/Noise/07/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ff53c0ee94e6f109a74120cd54743ab9302ffe5b10c1c8f66a459518dd563e0 +size 705644 diff --git a/Assets/Audio/Noise/07/14.wav.meta b/Assets/Audio/Noise/07/14.wav.meta new file mode 100755 index 0000000..c0a2688 --- /dev/null +++ b/Assets/Audio/Noise/07/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f3b05da298ab5184ea638320bafc3e7d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/15.wav b/Assets/Audio/Noise/07/15.wav new file mode 100755 index 0000000..946e483 --- /dev/null +++ b/Assets/Audio/Noise/07/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ba5368aa6961436308c1ef1077b20669764e51f916c7ed34b9f69bcaedd25e +size 705644 diff --git a/Assets/Audio/Noise/07/15.wav.meta b/Assets/Audio/Noise/07/15.wav.meta new file mode 100755 index 0000000..7833da0 --- /dev/null +++ b/Assets/Audio/Noise/07/15.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3b48017148865ce4f913ff5538760f68 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/16.wav b/Assets/Audio/Noise/07/16.wav new file mode 100755 index 0000000..0afe9e3 --- /dev/null +++ b/Assets/Audio/Noise/07/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb3d409290e823280a17fa4180b5ba47eb32eb32c3d5bbcaab24e283f2d7f900 +size 705644 diff --git a/Assets/Audio/Noise/07/16.wav.meta b/Assets/Audio/Noise/07/16.wav.meta new file mode 100755 index 0000000..34b61cf --- /dev/null +++ b/Assets/Audio/Noise/07/16.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f5b1a57155bed7a45b2f35c4be2b5219 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/17.wav b/Assets/Audio/Noise/07/17.wav new file mode 100755 index 0000000..f40b2c4 --- /dev/null +++ b/Assets/Audio/Noise/07/17.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1cf2e8d3d456bd13876d8188ef0c14ad88463418de8b3295cc3068a7a4afd96 +size 705644 diff --git a/Assets/Audio/Noise/07/17.wav.meta b/Assets/Audio/Noise/07/17.wav.meta new file mode 100755 index 0000000..ae4746e --- /dev/null +++ b/Assets/Audio/Noise/07/17.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b1543c3d498188c4b8dabd083d1943f1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/2.wav b/Assets/Audio/Noise/07/2.wav new file mode 100755 index 0000000..8107390 --- /dev/null +++ b/Assets/Audio/Noise/07/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c04715a76c5c627e029a1f0d6b3c18249c32cc8e727036624ac61abec791d33 +size 705644 diff --git a/Assets/Audio/Noise/07/2.wav.meta b/Assets/Audio/Noise/07/2.wav.meta new file mode 100755 index 0000000..4a9994e --- /dev/null +++ b/Assets/Audio/Noise/07/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 28f5a0ee7f0629f4ab87f4b57c992f79 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/3.wav b/Assets/Audio/Noise/07/3.wav new file mode 100755 index 0000000..a1611cb --- /dev/null +++ b/Assets/Audio/Noise/07/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e10810fa0962071fe6954d9663b210af9a2684e61261bde9081267c9ae73e28f +size 705644 diff --git a/Assets/Audio/Noise/07/3.wav.meta b/Assets/Audio/Noise/07/3.wav.meta new file mode 100755 index 0000000..77bfea7 --- /dev/null +++ b/Assets/Audio/Noise/07/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2b849e93bc97aaf4da970fc6d59495ef +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/4.wav b/Assets/Audio/Noise/07/4.wav new file mode 100755 index 0000000..3c2373b --- /dev/null +++ b/Assets/Audio/Noise/07/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58089d87b605f3b9e65eddf5d76e1c7362ccf52c95a42be26be6d2f390ba42c8 +size 705644 diff --git a/Assets/Audio/Noise/07/4.wav.meta b/Assets/Audio/Noise/07/4.wav.meta new file mode 100755 index 0000000..94eb27c --- /dev/null +++ b/Assets/Audio/Noise/07/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 25d81a68c24e55544a2187d435d99047 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/5.wav b/Assets/Audio/Noise/07/5.wav new file mode 100755 index 0000000..5756205 --- /dev/null +++ b/Assets/Audio/Noise/07/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f303ebe8a1b0d0793e8aca5c3df6aef7aae8c7bc3c4a70d242a3e37df8546741 +size 705644 diff --git a/Assets/Audio/Noise/07/5.wav.meta b/Assets/Audio/Noise/07/5.wav.meta new file mode 100755 index 0000000..c02abbf --- /dev/null +++ b/Assets/Audio/Noise/07/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b11037c5d5643be4b8ba075972eceb13 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/6.wav b/Assets/Audio/Noise/07/6.wav new file mode 100755 index 0000000..d3163f3 --- /dev/null +++ b/Assets/Audio/Noise/07/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6b260c5cb8699d91a21babfa8028ff6c19c06a1821e22a5abe62705e67f7510 +size 705644 diff --git a/Assets/Audio/Noise/07/6.wav.meta b/Assets/Audio/Noise/07/6.wav.meta new file mode 100755 index 0000000..16192d3 --- /dev/null +++ b/Assets/Audio/Noise/07/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9a1266476578fad489d533b3ee050e33 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/7.wav b/Assets/Audio/Noise/07/7.wav new file mode 100755 index 0000000..1b32080 --- /dev/null +++ b/Assets/Audio/Noise/07/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d20e26a89e4c0ed0a00f12cda8554f67c2884e37a05aad4187cb3a17bb600c0 +size 705644 diff --git a/Assets/Audio/Noise/07/7.wav.meta b/Assets/Audio/Noise/07/7.wav.meta new file mode 100755 index 0000000..55c9b7c --- /dev/null +++ b/Assets/Audio/Noise/07/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a8152d2c983b4e04baf801f14660818a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/8.wav b/Assets/Audio/Noise/07/8.wav new file mode 100755 index 0000000..71dea01 --- /dev/null +++ b/Assets/Audio/Noise/07/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d25e6e05b65a60315dff0462eb823fd4179d14e9db2d58b0cd8d3df151b57d +size 705644 diff --git a/Assets/Audio/Noise/07/8.wav.meta b/Assets/Audio/Noise/07/8.wav.meta new file mode 100755 index 0000000..da7c73d --- /dev/null +++ b/Assets/Audio/Noise/07/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4591aa6320e8be6429df59d5d46a0a4c +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/9.wav b/Assets/Audio/Noise/07/9.wav new file mode 100755 index 0000000..b7b4c8a --- /dev/null +++ b/Assets/Audio/Noise/07/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1fe455609c0e66b69cec9d1a89fdf89797be481138ba7268b3f03b90218f374 +size 705644 diff --git a/Assets/Audio/Noise/07/9.wav.meta b/Assets/Audio/Noise/07/9.wav.meta new file mode 100755 index 0000000..20a8d9d --- /dev/null +++ b/Assets/Audio/Noise/07/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1229af9bd596d1f49bf5343790b2cda1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Accelerate.wav b/Assets/Audio/PowerUnit.Accelerate.wav similarity index 100% rename from Assets/Audio/Accelerate.wav rename to Assets/Audio/PowerUnit.Accelerate.wav diff --git a/Assets/Audio/Accelerate.wav.meta b/Assets/Audio/PowerUnit.Accelerate.wav.meta similarity index 100% rename from Assets/Audio/Accelerate.wav.meta rename to Assets/Audio/PowerUnit.Accelerate.wav.meta diff --git a/Assets/Audio/Decelerate.wav b/Assets/Audio/PowerUnit.Decelerate.wav similarity index 100% rename from Assets/Audio/Decelerate.wav rename to Assets/Audio/PowerUnit.Decelerate.wav diff --git a/Assets/Audio/Decelerate.wav.meta b/Assets/Audio/PowerUnit.Decelerate.wav.meta similarity index 100% rename from Assets/Audio/Decelerate.wav.meta rename to Assets/Audio/PowerUnit.Decelerate.wav.meta diff --git a/Assets/Audio/Strafe.wav b/Assets/Audio/PowerUnit.Strafe.wav similarity index 100% rename from Assets/Audio/Strafe.wav rename to Assets/Audio/PowerUnit.Strafe.wav diff --git a/Assets/Audio/Strafe.wav.meta b/Assets/Audio/PowerUnit.Strafe.wav.meta similarity index 100% rename from Assets/Audio/Strafe.wav.meta rename to Assets/Audio/PowerUnit.Strafe.wav.meta diff --git a/Assets/Audio/ZTCT_Clap_24 R.wav b/Assets/Audio/ZTCT_Clap_24 R.wav deleted file mode 100755 index 2965fc8..0000000 --- a/Assets/Audio/ZTCT_Clap_24 R.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae8ae85123f665e87ba137d8c4bb3fdb13413202f0a9b5d65d6cc8cb36773a19 -size 252044 diff --git a/Assets/Prefabs/Ship/Ship.prefab b/Assets/Prefabs/Ship/Ship.prefab index e3d6668..98d56c1 100755 --- a/Assets/Prefabs/Ship/Ship.prefab +++ b/Assets/Prefabs/Ship/Ship.prefab @@ -229,8 +229,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7603488991399315273} - - component: {fileID: 2362953346451262734} - - component: {fileID: 6156246831092198731} + - component: {fileID: 2140192433735284883} m_Layer: 10 m_Name: Audio m_TagString: Untagged @@ -253,7 +252,7 @@ Transform: m_Children: [] m_Father: {fileID: 3589635702276405719} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2362953346451262734 +--- !u!114 &2140192433735284883 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,22 +261,48 @@ MonoBehaviour: m_GameObject: {fileID: 4508084525431060037} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} m_Name: m_EditorClassIdentifier: - soundNames: 020000000300000004000000 - clips: + powerUnitSounds: 020000000300000004000000 + powerUnitClips: - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} ---- !u!81 &6156246831092198731 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4508084525431060037} - m_Enabled: 1 + noiseClips: + - {fileID: 8300000, guid: c52fc17ffbb62644c88b20980a6246d7, type: 3} + - {fileID: 8300000, guid: 0ed6ecab922275046bd752b40dd51ef3, type: 3} + - {fileID: 8300000, guid: 45f55665bcea07d4390cd6b59f8ca6fa, type: 3} + - {fileID: 8300000, guid: 63478e3e2acdf794ea501d3eab9bb7a2, type: 3} + - {fileID: 8300000, guid: d2ea8fc23ab87bc4cb3789939efcf439, type: 3} + - {fileID: 8300000, guid: 4545f08003ebef14f8734a8872612e21, type: 3} + - {fileID: 8300000, guid: a38b77da486de4e40b024459b4a92a8a, type: 3} + - {fileID: 8300000, guid: 32199418c77542547b4b46a7fcc6f218, type: 3} + - {fileID: 8300000, guid: e66117d9890e0804b95f62379c8d53bf, type: 3} + - {fileID: 8300000, guid: fb6b7c1f2ddcfa5419fdf904f58ec1bf, type: 3} + - {fileID: 8300000, guid: 3a2e4df8d17fd2b4a83afa676a843344, type: 3} + - {fileID: 8300000, guid: f583924dc9b327e4cae85a01bcac9fbb, type: 3} + - {fileID: 8300000, guid: 52c705ef6868d2f428af01b1cba8b467, type: 3} + - {fileID: 8300000, guid: 4e3236145e30dfc408fb66aad5be6784, type: 3} + - {fileID: 8300000, guid: 95082891fb63e274abda1ad451ffe39f, type: 3} + - {fileID: 8300000, guid: d6ffb0204d35fb04daa131fb572a72cb, type: 3} + - {fileID: 8300000, guid: 28f5a0ee7f0629f4ab87f4b57c992f79, type: 3} + - {fileID: 8300000, guid: 2b849e93bc97aaf4da970fc6d59495ef, type: 3} + - {fileID: 8300000, guid: 25d81a68c24e55544a2187d435d99047, type: 3} + - {fileID: 8300000, guid: b11037c5d5643be4b8ba075972eceb13, type: 3} + - {fileID: 8300000, guid: 9a1266476578fad489d533b3ee050e33, type: 3} + - {fileID: 8300000, guid: a8152d2c983b4e04baf801f14660818a, type: 3} + - {fileID: 8300000, guid: 4591aa6320e8be6429df59d5d46a0a4c, type: 3} + - {fileID: 8300000, guid: 1229af9bd596d1f49bf5343790b2cda1, type: 3} + - {fileID: 8300000, guid: fc5640ccfc4aab24b83ff89a7ab4348e, type: 3} + - {fileID: 8300000, guid: c0bedc4d9738b4a4ab6459177c080265, type: 3} + - {fileID: 8300000, guid: b9e6166ef51af684daaecef0a60f1a7d, type: 3} + - {fileID: 8300000, guid: e03e3e2d19a1c944b96467bdca7c5229, type: 3} + - {fileID: 8300000, guid: f3b05da298ab5184ea638320bafc3e7d, type: 3} + - {fileID: 8300000, guid: 3b48017148865ce4f913ff5538760f68, type: 3} + - {fileID: 8300000, guid: f5b1a57155bed7a45b2f35c4be2b5219, type: 3} + - {fileID: 8300000, guid: b1543c3d498188c4b8dabd083d1943f1, type: 3} + bigNoiseClips: [] --- !u!1 &5535911989893287240 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_pascal.unity b/Assets/Scenes/sr_pascal.unity index 86be359..fa7acca 100755 --- a/Assets/Scenes/sr_pascal.unity +++ b/Assets/Scenes/sr_pascal.unity @@ -801,6 +801,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 1972710421} + - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 5198188376350273128} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -1280,10 +1284,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} m_Name: m_EditorClassIdentifier: - soundNames: 0000000001000000 - clips: - - {fileID: 8300000, guid: 1cdd6e27104267647b16db497f41744f, type: 3} - - {fileID: 8300000, guid: 10a4e1180cb3be54da0d7d98dd327c8c, type: 3} --- !u!82 &1800093234 AudioSource: m_ObjectHideFlags: 0 @@ -1457,7 +1457,7 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: audio value: - objectReference: {fileID: 1800093233} + objectReference: {fileID: 5198188376350273128} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1638,6 +1638,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5198188376350273128 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 5198188376350273124} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity index efe04c9..a5e8414 100755 --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -464,6 +464,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 1972710421} + - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -556,28 +560,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1359172646 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - m_PrefabInstance: {fileID: 5198188376350273124} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1359172648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1359172646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} - m_Name: - m_EditorClassIdentifier: - soundNames: 020000000300000004000000 - clips: - - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} - - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} - - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} --- !u!1001 &1556238046 PrefabInstance: m_ObjectHideFlags: 0 @@ -923,6 +905,10 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1184,10 +1170,7 @@ PrefabInstance: - {fileID: 6156246831092198731, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - insertIndex: -1 - addedObject: {fileID: 1359172648} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} --- !u!114 &5198188376350273125 stripped MonoBehaviour: diff --git a/Assets/Src/PowerUnit.cs b/Assets/Src/PowerUnit.cs index 6fa1dbf..10e45f8 100644 --- a/Assets/Src/PowerUnit.cs +++ b/Assets/Src/PowerUnit.cs @@ -54,6 +54,7 @@ public class PowerUnit { public List<(Output output, double expiresAt)> BoostActive = new(); public double BoostProgress => boostProgress / boostMax; public int BoostCharges => (int)(boostMax / boostDurationSeconds); + public int BoostChargesAvailable => (int)(boostAvailable / boostDurationSeconds); public float Acceleration => acceleration + BoostActive.Count(b => b.output == Output.Acceleration) * baseOutput; @@ -78,12 +79,13 @@ public class PowerUnit { shieldCurrent = initialShieldMax; } - public void Deploy(Output output) { - if (boostAvailable < boostDurationSeconds) return; + public bool Deploy(Output output) { + if (boostAvailable < boostDurationSeconds) return false; BoostActive.Add((output, Time.timeAsDouble + boostDurationSeconds)); boostAvailable -= boostDurationSeconds; if (output == Output.Shield) ShieldsBoost(); + return true; } public void Tick() { @@ -99,11 +101,6 @@ public class PowerUnit { int count => count * Time.fixedDeltaTime * -1f, }; - // boost available gets dragged up by the clock - // when the delta is positive - // which can only happen when there are no active boosts - // check it vvvv - // Debug.Log($"Progress={boostProgress} actualAvailability={boostAvailable}"); double next = Math.Min(boostProgress + delta, boostMax); boostProgress = Math.Max(0f, next); if (delta > 0f) boostAvailable = boostProgress; diff --git a/Assets/Src/ShipAudio.cs b/Assets/Src/ShipAudio.cs index bfc567e..67982ee 100755 --- a/Assets/Src/ShipAudio.cs +++ b/Assets/Src/ShipAudio.cs @@ -13,11 +13,11 @@ public enum Sound { Decelerate, Strafe, - Damage, - Respawn, + Damage, // noise pop + Respawn, // noise pop - BoostAcceleration, - BoostDeceleration, + BoostAccelerate, + BoostDecelerate, BoostStrafe, BoostShield, @@ -30,55 +30,64 @@ public enum Sound { public class ShipAudio : MonoBehaviour { // Match these two up [SerializeField] - Sound[] soundNames; + Sound[] powerUnitSounds; [SerializeField] - AudioClip[] clips; + AudioClip[] powerUnitClips; + + [SerializeField] + AudioClip[] noiseClips; + [SerializeField] + AudioClip[] bigNoiseClips; Dictionary sounds = new(); - AudioSource srcAccel; - AudioSource srcDecel; - AudioSource srcStrafe; + AudioSource srcShipAccel; + AudioSource srcShipDecel; + AudioSource srcShipStrafe; + + AudioSource src; SpaceRaceInput input; ShipControls ship; void Awake() { - for (int i = 0; i < clips.Length; i++) { - sounds.Add(soundNames[i], clips[i]); + for (int i = 0; i < powerUnitClips.Length; i++) { + sounds.Add(powerUnitSounds[i], powerUnitClips[i]); } ship = GetComponentInParent(); - srcAccel = gameObject.AddComponent(); - srcAccel.clip = sounds[Sound.Accelerate]; - srcAccel.loop = true; - srcAccel.volume = 0f; - srcAccel.Play(); + src = gameObject.AddComponent(); - srcDecel = gameObject.AddComponent(); - srcDecel.clip = sounds[Sound.Decelerate]; - srcDecel.loop = true; - srcDecel.volume = 0f; - srcDecel.Play(); + srcShipAccel = gameObject.AddComponent(); + srcShipAccel.clip = sounds[Sound.Accelerate]; + srcShipAccel.loop = true; + srcShipAccel.volume = 0f; + srcShipAccel.Play(); - srcStrafe = gameObject.AddComponent(); - srcStrafe.clip = sounds[Sound.Strafe]; - srcStrafe.loop = true; - srcStrafe.volume = 0f; - srcStrafe.Play(); + srcShipDecel = gameObject.AddComponent(); + srcShipDecel.clip = sounds[Sound.Decelerate]; + srcShipDecel.loop = true; + srcShipDecel.volume = 0f; + srcShipDecel.Play(); + + srcShipStrafe = gameObject.AddComponent(); + srcShipStrafe.clip = sounds[Sound.Strafe]; + srcShipStrafe.loop = true; + srcShipStrafe.volume = 0f; + srcShipStrafe.Play(); RegisterEvents(); } void Update() { - srcAccel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); - srcDecel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); - srcStrafe.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipAccel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipDecel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipStrafe.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); // Super fucking annoying - // stops all the clicks and pops of starting / stopping the clips + // stops all the clicks and pops of starting / stopping the powerUnitClips // 0.125s to get max volume // == 8x per second... float volumeDelta = Time.deltaTime * 8; @@ -89,96 +98,35 @@ public class ShipAudio : MonoBehaviour { bool strafing = input.ship.strafe.ReadValue().magnitude > 0; if (accelerating) { - srcAccel.volume = Math.Min(1f, srcAccel.volume + volumeDelta); + srcShipAccel.volume = Math.Min(1f, srcShipAccel.volume + volumeDelta); } else { - srcAccel.volume = Math.Max(0f, srcAccel.volume - decelDelta); + srcShipAccel.volume = Math.Max(0f, srcShipAccel.volume - decelDelta); } if (decelerating) { - srcDecel.volume = Math.Min(1f, srcDecel.volume + volumeDelta); + srcShipDecel.volume = Math.Min(1f, srcShipDecel.volume + volumeDelta); } else { - srcDecel.volume = Math.Max(0f, srcDecel.volume - decelDelta); + srcShipDecel.volume = Math.Max(0f, srcShipDecel.volume - decelDelta); } if (strafing) { - srcStrafe.volume = Math.Min(1f, srcStrafe.volume + volumeDelta); + srcShipStrafe.volume = Math.Min(1f, srcShipStrafe.volume + volumeDelta); } else { - srcStrafe.volume = Math.Max(0f, srcStrafe.volume - decelDelta); + srcShipStrafe.volume = Math.Max(0f, srcShipStrafe.volume - decelDelta); } } - // public void PlaySound(Sound s) { - // AudioSource src = sounds[s]; - // src.Play(0); - // } + public void PlayNoise() { + int noiseIndex = UnityEngine.Random.Range(0, noiseClips.Length); + src.PlayOneShot(noiseClips[noiseIndex]); + } void RegisterEvents() { if (input == null) input = new SpaceRaceInput(); input.ship.Enable(); - - // input.ship.accelerate.started += OnAccelerateStart; - // input.ship.accelerate.canceled += OnAccelerateCancel; - // input.ship.decelerate.started += OnDecelerateStart; - // input.ship.decelerate.canceled += OnDecelerateCancel; - // input.ship.strafe.started += OnStrafeStart; - // input.ship.strafe.canceled += OnStrafeCancel; - - // these we only care about the initial press - // input.ship.respawn.started += OnRespawn; - // input.ship.quit.started += OnQuit; - // input.ship.powerUnit1.started += OnPowerUnit1; - // input.ship.powerUnit2.started += OnPowerUnit2; - // input.ship.powerUnit3.started += OnPowerUnit3; - // input.ship.powerUnit4.started += OnPowerUnit4; } - - // void OnDestroy() { - // input.ship.accelerate.started -= OnAccelerateStart; - // input.ship.accelerate.canceled -= OnAccelerateCancel; - // input.ship.decelerate.started -= OnDecelerateStart; - // input.ship.decelerate.canceled -= OnDecelerateCancel; - // input.ship.strafe.started -= OnStrafeStart; - // input.ship.strafe.canceled -= OnStrafeCancel; - - - // // these we only care about the initial press - // input.ship.respawn.started -= OnRespawn; - // input.ship.quit.started -= OnQuit; - // input.ship.powerUnit1.started -= OnPowerUnit1; - // input.ship.powerUnit2.started -= OnPowerUnit2; - // input.ship.powerUnit3.started -= OnPowerUnit3; - // input.ship.powerUnit4.started -= OnPowerUnit4; - // } - - // void OnAcceleratePerformed(InputAction.CallbackContext _ctx) { - // Debug.Log(_ctx.duration); - // } - - // void OnAccelerateStart(InputAction.CallbackContext _ctx) { - // srcAccel.Play(); - // } - - // void OnAccelerateCancel(InputAction.CallbackContext _ctx) { - // srcAccel.Stop(); - // } - - // void OnDecelerateStart(InputAction.CallbackContext _ctx) { - // srcDecel.Play(); - // } - - // void OnDecelerateCancel(InputAction.CallbackContext _ctx) { - // srcDecel.Stop(); - // } - - // void OnStrafeStart(InputAction.CallbackContext _ctx) { - // srcStrafe.Play(); - // } - - // void OnStrafeCancel(InputAction.CallbackContext _ctx) { - // srcStrafe.Stop(); - // } } diff --git a/Assets/Src/ShipControls.cs b/Assets/Src/ShipControls.cs index 619e271..de96e79 100755 --- a/Assets/Src/ShipControls.cs +++ b/Assets/Src/ShipControls.cs @@ -9,6 +9,7 @@ public class ShipControls : MonoBehaviour { public Camera aim; public Timing timing; + ShipAudio audio; SpaceRaceInput input; Rigidbody rigidBody; @@ -54,6 +55,7 @@ public class ShipControls : MonoBehaviour { void Start() { Cursor.lockState = CursorLockMode.Locked; rigidBody = GetComponent(); + audio = GetComponentInChildren(); // just stop the body from being affected by rotation for now // until the 3p camera is in to explain why @@ -115,7 +117,10 @@ public class ShipControls : MonoBehaviour { rigidBody.rotation = Quaternion.RotateTowards(transform.rotation, aim.transform.rotation, step); if (timing.timerEnabled) { + int boostBefore = powerUnit.BoostChargesAvailable; powerUnit.Tick(); + + if (powerUnit.BoostChargesAvailable > boostBefore) OnBoostCharge(); } } @@ -160,6 +165,7 @@ public class ShipControls : MonoBehaviour { } public void Respawn() { + audio.PlayNoise(); // IMPORTANT // stop the timer before we move the ship or anything // otherwise it might generate a checkpoint time @@ -188,15 +194,19 @@ public class ShipControls : MonoBehaviour { public void Damage(float amt, string src) { Debug.Log($"Damage {amt} from {src}"); + audio.PlayNoise(); + bool destroyed = powerUnit.ShieldReduce(amt); if (destroyed) { Debug.Log($"Ddddestroyed by {src}"); + // play big noise! Respawn(); } } void Deploy(Output output) { - powerUnit.Deploy(output); + bool deployed = powerUnit.Deploy(output); + if (deployed) audio.PlayNoise(); } // I prefer doing it this way than registering the callbacks etc @@ -250,6 +260,11 @@ public class ShipControls : MonoBehaviour { void OnPowerUnit3(InputAction.CallbackContext ctx) => Deploy(Output.Strafing); void OnPowerUnit4(InputAction.CallbackContext ctx) => Deploy(Output.Shield); + void OnBoostCharge() { + // audio.PlayNoise(); + // do some ui fx whatever + } + void OnDrawGizmosSelected() { if (Application.isPlaying == false) return; diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index ad035fe..4d5af90 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -16,6 +16,9 @@ public class Timing: MonoBehaviour { public List sectorTimes; public bool timerEnabled; + [SerializeField] + ShipAudio audio; + public string mapName; public double sectorTime; public double lapTime; @@ -106,9 +109,13 @@ public class Timing: MonoBehaviour { sectorTimes.Add(s); Debug.Log($"{sectorTimes.Count} / {sectors.Length}"); + // play a sound :) + if (audio != null) audio.PlayNoise(); + // restart the timer for the next sector sectorStart = Time.timeAsDouble; + // they finished a lap! if (sectorTimes.Count == sectors.Length) { EndLap(); diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs index 5d86d34..44ad8ca 100644 --- a/Assets/Src/UI/MenuControls.cs +++ b/Assets/Src/UI/MenuControls.cs @@ -110,6 +110,7 @@ public class MenuControls : MonoBehaviour { } void OnToggleMenu(InputAction.CallbackContext _ctx) { + audio.PlayNoise(); visible = !visible; if (visible) { diff --git a/TODO.md b/TODO.md index f3b704d..901c58c 100644 --- a/TODO.md +++ b/TODO.md @@ -1,11 +1,23 @@ ## TODO +- git lfs + - its time + +- fix up dependency chain + - applications - steam - improve descriptions - - add icons for A D T S + - talk about sound + - minimal soundtrack + - pops clicks noise, asmr + - win store + - make public cause it's fked -- sound + +- audio + - add more noises + - menu disable - murals - flames at end of red corner in junglism2 @@ -19,8 +31,6 @@ - try to post - if fail store the lap in userdata -- git lfs - - minimap - really want this? - would make map source obvious From fdabaad61893183167ef7544e821f9702f8519ce Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 17:37:48 +1000 Subject: [PATCH 5/7] noise 3 --- Assets/Audio/Noise/02/1.wav | 3 +++ Assets/Audio/Noise/02/1.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/10.wav | 3 +++ Assets/Audio/Noise/02/10.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/11.wav | 3 +++ Assets/Audio/Noise/02/11.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/12.wav | 3 +++ Assets/Audio/Noise/02/12.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/13.wav | 3 +++ Assets/Audio/Noise/02/13.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/14.wav | 3 +++ Assets/Audio/Noise/02/14.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/15.wav | 3 +++ Assets/Audio/Noise/02/15.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/16.wav | 2 +- Assets/Audio/Noise/02/2.wav | 3 +++ Assets/Audio/Noise/02/2.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/3.wav | 3 +++ Assets/Audio/Noise/02/3.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/4.wav | 3 +++ Assets/Audio/Noise/02/4.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/5.wav | 3 +++ Assets/Audio/Noise/02/5.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/6.wav | 3 +++ Assets/Audio/Noise/02/6.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/7.wav | 3 +++ Assets/Audio/Noise/02/7.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/8.wav | 3 +++ Assets/Audio/Noise/02/8.wav.meta | 23 +++++++++++++++++++++++ Assets/Audio/Noise/02/9.wav | 3 +++ Assets/Audio/Noise/02/9.wav.meta | 23 +++++++++++++++++++++++ 31 files changed, 391 insertions(+), 1 deletion(-) create mode 100755 Assets/Audio/Noise/02/1.wav create mode 100755 Assets/Audio/Noise/02/1.wav.meta create mode 100755 Assets/Audio/Noise/02/10.wav create mode 100755 Assets/Audio/Noise/02/10.wav.meta create mode 100755 Assets/Audio/Noise/02/11.wav create mode 100755 Assets/Audio/Noise/02/11.wav.meta create mode 100755 Assets/Audio/Noise/02/12.wav create mode 100755 Assets/Audio/Noise/02/12.wav.meta create mode 100755 Assets/Audio/Noise/02/13.wav create mode 100755 Assets/Audio/Noise/02/13.wav.meta create mode 100755 Assets/Audio/Noise/02/14.wav create mode 100755 Assets/Audio/Noise/02/14.wav.meta create mode 100755 Assets/Audio/Noise/02/15.wav create mode 100755 Assets/Audio/Noise/02/15.wav.meta create mode 100755 Assets/Audio/Noise/02/2.wav create mode 100755 Assets/Audio/Noise/02/2.wav.meta create mode 100755 Assets/Audio/Noise/02/3.wav create mode 100755 Assets/Audio/Noise/02/3.wav.meta create mode 100755 Assets/Audio/Noise/02/4.wav create mode 100755 Assets/Audio/Noise/02/4.wav.meta create mode 100755 Assets/Audio/Noise/02/5.wav create mode 100755 Assets/Audio/Noise/02/5.wav.meta create mode 100755 Assets/Audio/Noise/02/6.wav create mode 100755 Assets/Audio/Noise/02/6.wav.meta create mode 100755 Assets/Audio/Noise/02/7.wav create mode 100755 Assets/Audio/Noise/02/7.wav.meta create mode 100755 Assets/Audio/Noise/02/8.wav create mode 100755 Assets/Audio/Noise/02/8.wav.meta create mode 100755 Assets/Audio/Noise/02/9.wav create mode 100755 Assets/Audio/Noise/02/9.wav.meta diff --git a/Assets/Audio/Noise/02/1.wav b/Assets/Audio/Noise/02/1.wav new file mode 100755 index 0000000..c30da58 --- /dev/null +++ b/Assets/Audio/Noise/02/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b608ad459d783af2f265e21292789cb757da85477c845fb1adeac1628a55adeb +size 705644 diff --git a/Assets/Audio/Noise/02/1.wav.meta b/Assets/Audio/Noise/02/1.wav.meta new file mode 100755 index 0000000..e50012d --- /dev/null +++ b/Assets/Audio/Noise/02/1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b03343745eb6b5d4a86663369bd72c28 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/10.wav b/Assets/Audio/Noise/02/10.wav new file mode 100755 index 0000000..1725d22 --- /dev/null +++ b/Assets/Audio/Noise/02/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:894354390ade8c83e63e4c0e77908ee3c6e81842cd439d8012495188743d21d0 +size 705644 diff --git a/Assets/Audio/Noise/02/10.wav.meta b/Assets/Audio/Noise/02/10.wav.meta new file mode 100755 index 0000000..de2f5d1 --- /dev/null +++ b/Assets/Audio/Noise/02/10.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fb5739451e9e4574499f1a60f5354d98 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/11.wav b/Assets/Audio/Noise/02/11.wav new file mode 100755 index 0000000..dca7536 --- /dev/null +++ b/Assets/Audio/Noise/02/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ccbec2441410631884218346877be3807d6408caeb57c9374bd78a916ce9959 +size 705644 diff --git a/Assets/Audio/Noise/02/11.wav.meta b/Assets/Audio/Noise/02/11.wav.meta new file mode 100755 index 0000000..1f5f820 --- /dev/null +++ b/Assets/Audio/Noise/02/11.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 27e54ed3aafb80946af0789c1b57ca57 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/12.wav b/Assets/Audio/Noise/02/12.wav new file mode 100755 index 0000000..3347197 --- /dev/null +++ b/Assets/Audio/Noise/02/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ff1c7c3691c7d5f450c980fc6d3c94774122db214a4bcf40b2a292dfea2fb91 +size 705644 diff --git a/Assets/Audio/Noise/02/12.wav.meta b/Assets/Audio/Noise/02/12.wav.meta new file mode 100755 index 0000000..25fac3b --- /dev/null +++ b/Assets/Audio/Noise/02/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 99db5b15b74a4ac439ce3123b2cb00c1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/13.wav b/Assets/Audio/Noise/02/13.wav new file mode 100755 index 0000000..ead4f93 --- /dev/null +++ b/Assets/Audio/Noise/02/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67c5ac8bfff3a8ec921afe506116f6fbcbfff4c6ec3713622bd1bf62271ee5d9 +size 705644 diff --git a/Assets/Audio/Noise/02/13.wav.meta b/Assets/Audio/Noise/02/13.wav.meta new file mode 100755 index 0000000..b39e818 --- /dev/null +++ b/Assets/Audio/Noise/02/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4a44973e6e426834d8e1347edee67857 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/14.wav b/Assets/Audio/Noise/02/14.wav new file mode 100755 index 0000000..dd3e3f7 --- /dev/null +++ b/Assets/Audio/Noise/02/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:134ff6044e0035ea0b6da5c519102263d5546f6c0428eb4d50340caf97658c05 +size 705644 diff --git a/Assets/Audio/Noise/02/14.wav.meta b/Assets/Audio/Noise/02/14.wav.meta new file mode 100755 index 0000000..b6c0fdb --- /dev/null +++ b/Assets/Audio/Noise/02/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b17e2b600e58b804fb4344edfd7b4199 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/15.wav b/Assets/Audio/Noise/02/15.wav new file mode 100755 index 0000000..f75822c --- /dev/null +++ b/Assets/Audio/Noise/02/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:938af234e45ccd530408b9a2afff3f77b4aa36b97950e35455e7ebf6a0a5885f +size 705644 diff --git a/Assets/Audio/Noise/02/15.wav.meta b/Assets/Audio/Noise/02/15.wav.meta new file mode 100755 index 0000000..3289290 --- /dev/null +++ b/Assets/Audio/Noise/02/15.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e401bbcc9c4aaf249a5205bd77d42702 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/16.wav b/Assets/Audio/Noise/02/16.wav index 08b5ee0..fe4a1ea 100755 --- a/Assets/Audio/Noise/02/16.wav +++ b/Assets/Audio/Noise/02/16.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c7b658307096818dd916f35c0b74fc791098795bb9fb13c4d8dd8fa54e540a9 +oid sha256:fc86a8c4a08de163e66592bd385edd3808146353ab276a80d579997dd59d6674 size 705644 diff --git a/Assets/Audio/Noise/02/2.wav b/Assets/Audio/Noise/02/2.wav new file mode 100755 index 0000000..2412412 --- /dev/null +++ b/Assets/Audio/Noise/02/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95b11aebdb69f5600af1f93c2bd9151b78dc5264aaa485325233dbc9ced2fcce +size 705644 diff --git a/Assets/Audio/Noise/02/2.wav.meta b/Assets/Audio/Noise/02/2.wav.meta new file mode 100755 index 0000000..8ff1b69 --- /dev/null +++ b/Assets/Audio/Noise/02/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5dd8f95d772c7394580e7d7a09739737 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/3.wav b/Assets/Audio/Noise/02/3.wav new file mode 100755 index 0000000..50813fc --- /dev/null +++ b/Assets/Audio/Noise/02/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c8975a26db38ceb7c6563329acf3b320f0de9f4a849e1cc0803830c0f97832f +size 705644 diff --git a/Assets/Audio/Noise/02/3.wav.meta b/Assets/Audio/Noise/02/3.wav.meta new file mode 100755 index 0000000..66f8f75 --- /dev/null +++ b/Assets/Audio/Noise/02/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 91728f1b5f0dae440ad5f4230d889a81 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/4.wav b/Assets/Audio/Noise/02/4.wav new file mode 100755 index 0000000..dd0ab52 --- /dev/null +++ b/Assets/Audio/Noise/02/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4438a0203fa5df0f90d62dcc443531efe8fbe6697c7d0e5b0da674c945f98fc9 +size 705644 diff --git a/Assets/Audio/Noise/02/4.wav.meta b/Assets/Audio/Noise/02/4.wav.meta new file mode 100755 index 0000000..42afa6f --- /dev/null +++ b/Assets/Audio/Noise/02/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3323931b12f255344b832f7eb71a111a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/5.wav b/Assets/Audio/Noise/02/5.wav new file mode 100755 index 0000000..92281c4 --- /dev/null +++ b/Assets/Audio/Noise/02/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7780846cbb23e134beb6071093a7caf8fffa2e8776e3cae1b0bc853a92ec5f55 +size 705644 diff --git a/Assets/Audio/Noise/02/5.wav.meta b/Assets/Audio/Noise/02/5.wav.meta new file mode 100755 index 0000000..dc8a5ec --- /dev/null +++ b/Assets/Audio/Noise/02/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2aa01028ecf4743429856bc2e07af835 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/6.wav b/Assets/Audio/Noise/02/6.wav new file mode 100755 index 0000000..136d740 --- /dev/null +++ b/Assets/Audio/Noise/02/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:266ed76b399d7b78660f8ae2862790241032010626f5a93750c8eeac7d2d6500 +size 705644 diff --git a/Assets/Audio/Noise/02/6.wav.meta b/Assets/Audio/Noise/02/6.wav.meta new file mode 100755 index 0000000..56ac84a --- /dev/null +++ b/Assets/Audio/Noise/02/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9fff106a08efbdd46a7640bd2ed53227 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/7.wav b/Assets/Audio/Noise/02/7.wav new file mode 100755 index 0000000..2a2ca58 --- /dev/null +++ b/Assets/Audio/Noise/02/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f22cfaefc597e74292d74b0d202361a67b4294bcc2997724392f77d20af4a218 +size 705644 diff --git a/Assets/Audio/Noise/02/7.wav.meta b/Assets/Audio/Noise/02/7.wav.meta new file mode 100755 index 0000000..341677d --- /dev/null +++ b/Assets/Audio/Noise/02/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: dab9499ab887d1346b03da58f1d820ff +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/8.wav b/Assets/Audio/Noise/02/8.wav new file mode 100755 index 0000000..e106a76 --- /dev/null +++ b/Assets/Audio/Noise/02/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54a14f1bcf5c00cf40c1b9cc374e944e8bfa41591df6237f401e8c456d5840be +size 705644 diff --git a/Assets/Audio/Noise/02/8.wav.meta b/Assets/Audio/Noise/02/8.wav.meta new file mode 100755 index 0000000..e56325d --- /dev/null +++ b/Assets/Audio/Noise/02/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 145a90462178f5149b19bebf66c110c0 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/9.wav b/Assets/Audio/Noise/02/9.wav new file mode 100755 index 0000000..7680c4b --- /dev/null +++ b/Assets/Audio/Noise/02/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47846c4d2ff0ab9c6ad9cb7ff9acee7e3cf0c76cb6601bdd9034ef7a6f9ede04 +size 705644 diff --git a/Assets/Audio/Noise/02/9.wav.meta b/Assets/Audio/Noise/02/9.wav.meta new file mode 100755 index 0000000..0c9ee35 --- /dev/null +++ b/Assets/Audio/Noise/02/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 700fa2fbd5f5c474d815e2e638747699 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: From 1ccf728a8707c35afb19c9342a2e0c2fa7f8d859 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 19:25:10 +1000 Subject: [PATCH 6/7] skybox for pascal --- .gitattributes | 2 +- Assets/Audio/Noise/01/1.BIG.wav | 2 +- Assets/Audio/Noise/01/10.wav | 2 +- Assets/Audio/Noise/01/11.wav | 2 +- Assets/Audio/Noise/01/12.wav | 2 +- Assets/Audio/Noise/01/13.wav | 2 +- Assets/Audio/Noise/01/14.wav | 2 +- Assets/Audio/Noise/01/15.wav | 3 + Assets/Audio/Noise/{07 => 01}/15.wav.meta | 2 +- Assets/Audio/Noise/01/16.wav | 3 + Assets/Audio/Noise/{07 => 01}/16.wav.meta | 2 +- Assets/Audio/Noise/01/2.wav | 2 +- Assets/Audio/Noise/01/3.wav | 2 +- Assets/Audio/Noise/01/4.wav | 2 +- Assets/Audio/Noise/01/5.wav | 2 +- Assets/Audio/Noise/01/6.wav | 2 +- Assets/Audio/Noise/01/7.wav | 2 +- Assets/Audio/Noise/01/8.wav | 2 +- Assets/Audio/Noise/01/9.wav | 2 +- Assets/Audio/Noise/02/3.wav | 2 +- Assets/Audio/Noise/{07.meta => 03.meta} | 2 +- Assets/Audio/Noise/03/1.wav | 3 + Assets/Audio/Noise/{07 => 03}/1.wav.meta | 2 +- Assets/Audio/Noise/03/10.wav | 3 + Assets/Audio/Noise/{07 => 03}/10.wav.meta | 2 +- Assets/Audio/Noise/03/11.wav | 3 + Assets/Audio/Noise/{07 => 03}/11.wav.meta | 2 +- Assets/Audio/Noise/03/12.wav | 3 + Assets/Audio/Noise/{07 => 03}/12.wav.meta | 2 +- Assets/Audio/Noise/03/13.wav | 3 + Assets/Audio/Noise/{07 => 03}/13.wav.meta | 2 +- Assets/Audio/Noise/03/14.wav | 3 + Assets/Audio/Noise/{07 => 03}/14.wav.meta | 2 +- Assets/Audio/Noise/03/15.wav | 3 + .../Noise/{07/0.wav.meta => 03/15.wav.meta} | 2 +- Assets/Audio/Noise/03/16.wav | 3 + Assets/Audio/Noise/03/16.wav.meta | 23 ++ Assets/Audio/Noise/03/2.wav | 3 + Assets/Audio/Noise/{07 => 03}/2.wav.meta | 2 +- Assets/Audio/Noise/03/3.wav | 3 + Assets/Audio/Noise/{07 => 03}/3.wav.meta | 2 +- Assets/Audio/Noise/03/4.wav | 3 + Assets/Audio/Noise/{07 => 03}/4.wav.meta | 2 +- Assets/Audio/Noise/03/5.wav | 3 + Assets/Audio/Noise/{07 => 03}/5.wav.meta | 2 +- Assets/Audio/Noise/03/6.wav | 3 + Assets/Audio/Noise/{07 => 03}/6.wav.meta | 2 +- Assets/Audio/Noise/03/7.wav | 3 + Assets/Audio/Noise/{07 => 03}/7.wav.meta | 2 +- Assets/Audio/Noise/03/8.wav | 3 + Assets/Audio/Noise/{07 => 03}/8.wav.meta | 2 +- Assets/Audio/Noise/03/9.wav | 3 + Assets/Audio/Noise/{07 => 03}/9.wav.meta | 2 +- Assets/Audio/Noise/04.meta | 8 + Assets/Audio/Noise/04/1.wav | 3 + Assets/Audio/Noise/04/1.wav.meta | 23 ++ Assets/Audio/Noise/04/10.wav | 3 + Assets/Audio/Noise/04/10.wav.meta | 23 ++ Assets/Audio/Noise/04/11.wav | 3 + Assets/Audio/Noise/04/11.wav.meta | 23 ++ Assets/Audio/Noise/04/12.wav | 3 + Assets/Audio/Noise/04/12.wav.meta | 23 ++ Assets/Audio/Noise/04/13.wav | 3 + Assets/Audio/Noise/04/13.wav.meta | 23 ++ Assets/Audio/Noise/04/14.wav | 3 + Assets/Audio/Noise/04/14.wav.meta | 23 ++ Assets/Audio/Noise/04/15.wav | 3 + Assets/Audio/Noise/04/15.wav.meta | 23 ++ Assets/Audio/Noise/04/2.wav | 3 + Assets/Audio/Noise/04/2.wav.meta | 23 ++ Assets/Audio/Noise/04/3.wav | 3 + Assets/Audio/Noise/04/3.wav.meta | 23 ++ Assets/Audio/Noise/04/4.wav | 3 + Assets/Audio/Noise/04/4.wav.meta | 23 ++ Assets/Audio/Noise/04/5.wav | 3 + Assets/Audio/Noise/04/5.wav.meta | 23 ++ Assets/Audio/Noise/04/6.wav | 3 + Assets/Audio/Noise/04/6.wav.meta | 23 ++ Assets/Audio/Noise/04/7.wav | 3 + Assets/Audio/Noise/04/7.wav.meta | 23 ++ Assets/Audio/Noise/04/8.wav | 3 + Assets/Audio/Noise/04/8.wav.meta | 23 ++ Assets/Audio/Noise/04/9.wav | 3 + Assets/Audio/Noise/04/9.wav.meta | 23 ++ Assets/Audio/Noise/07/0.wav | 3 - Assets/Audio/Noise/07/1.wav | 3 - Assets/Audio/Noise/07/10.wav | 3 - Assets/Audio/Noise/07/11.wav | 3 - Assets/Audio/Noise/07/12.wav | 3 - Assets/Audio/Noise/07/13.wav | 3 - Assets/Audio/Noise/07/14.wav | 3 - Assets/Audio/Noise/07/15.wav | 3 - Assets/Audio/Noise/07/16.wav | 3 - Assets/Audio/Noise/07/17.wav | 3 - Assets/Audio/Noise/07/17.wav.meta | 23 -- Assets/Audio/Noise/07/2.wav | 3 - Assets/Audio/Noise/07/3.wav | 3 - Assets/Audio/Noise/07/4.wav | 3 - Assets/Audio/Noise/07/5.wav | 3 - Assets/Audio/Noise/07/6.wav | 3 - Assets/Audio/Noise/07/7.wav | 3 - Assets/Audio/Noise/07/8.wav | 3 - Assets/Audio/Noise/07/9.wav | 3 - .../{00015.clip.png => 00015.HAS.SD.META.png} | 0 ...ip.png.meta => 00015.HAS.SD.META.png.meta} | 0 Assets/Prefabs/Ship/Ship.prefab | 68 ++++-- Assets/Scenes/sr_alpha_centaurus.unity | 227 ++++++------------ Assets/Scenes/sr_junglism2.unity | 18 +- Assets/Scenes/sr_pascal.unity | 4 +- Assets/Scenes/sr_pascal/00000.png | 3 + Assets/Scenes/sr_pascal/00000.png.meta | 140 +++++++++++ Assets/Scenes/sr_pascal/00005-1222362291.png | 3 + .../sr_pascal/00005-1222362291.png.meta | 140 +++++++++++ Assets/Scenes/sr_pascal/LightingData 1.asset | Bin 0 -> 18200 bytes .../sr_pascal/LightingData 1.asset.meta | 8 + Assets/Scenes/sr_pascal/PascalSkybox.mat | 176 ++++++++++++++ Assets/Scenes/sr_pascal/PascalSkybox.mat.meta | 8 + .../Scenes/sr_pascal/france-nebula.pano.png | 3 + .../sr_pascal/france-nebula.pano.png.meta | 140 +++++++++++ Assets/Scenes/sr_silverstorage.unity | 13 +- Assets/Src/ShipAudio.cs | 2 - 121 files changed, 1289 insertions(+), 284 deletions(-) create mode 100755 Assets/Audio/Noise/01/15.wav rename Assets/Audio/Noise/{07 => 01}/15.wav.meta (91%) create mode 100755 Assets/Audio/Noise/01/16.wav rename Assets/Audio/Noise/{07 => 01}/16.wav.meta (91%) rename Assets/Audio/Noise/{07.meta => 03.meta} (77%) create mode 100755 Assets/Audio/Noise/03/1.wav rename Assets/Audio/Noise/{07 => 03}/1.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/10.wav rename Assets/Audio/Noise/{07 => 03}/10.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/11.wav rename Assets/Audio/Noise/{07 => 03}/11.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/12.wav rename Assets/Audio/Noise/{07 => 03}/12.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/13.wav rename Assets/Audio/Noise/{07 => 03}/13.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/14.wav rename Assets/Audio/Noise/{07 => 03}/14.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/15.wav rename Assets/Audio/Noise/{07/0.wav.meta => 03/15.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/03/16.wav create mode 100755 Assets/Audio/Noise/03/16.wav.meta create mode 100755 Assets/Audio/Noise/03/2.wav rename Assets/Audio/Noise/{07 => 03}/2.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/3.wav rename Assets/Audio/Noise/{07 => 03}/3.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/4.wav rename Assets/Audio/Noise/{07 => 03}/4.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/5.wav rename Assets/Audio/Noise/{07 => 03}/5.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/6.wav rename Assets/Audio/Noise/{07 => 03}/6.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/7.wav rename Assets/Audio/Noise/{07 => 03}/7.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/8.wav rename Assets/Audio/Noise/{07 => 03}/8.wav.meta (91%) create mode 100755 Assets/Audio/Noise/03/9.wav rename Assets/Audio/Noise/{07 => 03}/9.wav.meta (91%) create mode 100755 Assets/Audio/Noise/04.meta create mode 100755 Assets/Audio/Noise/04/1.wav create mode 100755 Assets/Audio/Noise/04/1.wav.meta create mode 100755 Assets/Audio/Noise/04/10.wav create mode 100755 Assets/Audio/Noise/04/10.wav.meta create mode 100755 Assets/Audio/Noise/04/11.wav create mode 100755 Assets/Audio/Noise/04/11.wav.meta create mode 100755 Assets/Audio/Noise/04/12.wav create mode 100755 Assets/Audio/Noise/04/12.wav.meta create mode 100755 Assets/Audio/Noise/04/13.wav create mode 100755 Assets/Audio/Noise/04/13.wav.meta create mode 100755 Assets/Audio/Noise/04/14.wav create mode 100755 Assets/Audio/Noise/04/14.wav.meta create mode 100755 Assets/Audio/Noise/04/15.wav create mode 100755 Assets/Audio/Noise/04/15.wav.meta create mode 100755 Assets/Audio/Noise/04/2.wav create mode 100755 Assets/Audio/Noise/04/2.wav.meta create mode 100755 Assets/Audio/Noise/04/3.wav create mode 100755 Assets/Audio/Noise/04/3.wav.meta create mode 100755 Assets/Audio/Noise/04/4.wav create mode 100755 Assets/Audio/Noise/04/4.wav.meta create mode 100755 Assets/Audio/Noise/04/5.wav create mode 100755 Assets/Audio/Noise/04/5.wav.meta create mode 100755 Assets/Audio/Noise/04/6.wav create mode 100755 Assets/Audio/Noise/04/6.wav.meta create mode 100755 Assets/Audio/Noise/04/7.wav create mode 100755 Assets/Audio/Noise/04/7.wav.meta create mode 100755 Assets/Audio/Noise/04/8.wav create mode 100755 Assets/Audio/Noise/04/8.wav.meta create mode 100755 Assets/Audio/Noise/04/9.wav create mode 100755 Assets/Audio/Noise/04/9.wav.meta delete mode 100755 Assets/Audio/Noise/07/0.wav delete mode 100755 Assets/Audio/Noise/07/1.wav delete mode 100755 Assets/Audio/Noise/07/10.wav delete mode 100755 Assets/Audio/Noise/07/11.wav delete mode 100755 Assets/Audio/Noise/07/12.wav delete mode 100755 Assets/Audio/Noise/07/13.wav delete mode 100755 Assets/Audio/Noise/07/14.wav delete mode 100755 Assets/Audio/Noise/07/15.wav delete mode 100755 Assets/Audio/Noise/07/16.wav delete mode 100755 Assets/Audio/Noise/07/17.wav delete mode 100755 Assets/Audio/Noise/07/17.wav.meta delete mode 100755 Assets/Audio/Noise/07/2.wav delete mode 100755 Assets/Audio/Noise/07/3.wav delete mode 100755 Assets/Audio/Noise/07/4.wav delete mode 100755 Assets/Audio/Noise/07/5.wav delete mode 100755 Assets/Audio/Noise/07/6.wav delete mode 100755 Assets/Audio/Noise/07/7.wav delete mode 100755 Assets/Audio/Noise/07/8.wav delete mode 100755 Assets/Audio/Noise/07/9.wav rename Assets/Materials/{00015.clip.png => 00015.HAS.SD.META.png} (100%) rename Assets/Materials/{00015.clip.png.meta => 00015.HAS.SD.META.png.meta} (100%) create mode 100755 Assets/Scenes/sr_pascal/00000.png create mode 100755 Assets/Scenes/sr_pascal/00000.png.meta create mode 100755 Assets/Scenes/sr_pascal/00005-1222362291.png create mode 100755 Assets/Scenes/sr_pascal/00005-1222362291.png.meta create mode 100755 Assets/Scenes/sr_pascal/LightingData 1.asset create mode 100755 Assets/Scenes/sr_pascal/LightingData 1.asset.meta create mode 100755 Assets/Scenes/sr_pascal/PascalSkybox.mat create mode 100755 Assets/Scenes/sr_pascal/PascalSkybox.mat.meta create mode 100755 Assets/Scenes/sr_pascal/france-nebula.pano.png create mode 100755 Assets/Scenes/sr_pascal/france-nebula.pano.png.meta diff --git a/.gitattributes b/.gitattributes index c74f908..f7e36dc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,7 @@ +*.wav filter=lfs diff=lfs merge=lfs -text *.blend filter=lfs diff=lfs merge=lfs -text *.blend1 filter=lfs diff=lfs merge=lfs -text *.png filter=lfs diff=lfs merge=lfs -text -*.wav filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text *.exr filter=lfs diff=lfs merge=lfs -text *.otf filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/Audio/Noise/01/1.BIG.wav b/Assets/Audio/Noise/01/1.BIG.wav index 7c33eb8..c4a02f0 100755 --- a/Assets/Audio/Noise/01/1.BIG.wav +++ b/Assets/Audio/Noise/01/1.BIG.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:624b259643a9d67b3de386440812427e06ab31ae7389f62d9a08d5a74a266b8e +oid sha256:1fc1264149fec50de83dfb27dc9427e3fa66b215f3133d7a81c893eccb5f2036 size 705644 diff --git a/Assets/Audio/Noise/01/10.wav b/Assets/Audio/Noise/01/10.wav index 8ad3e62..6221e67 100755 --- a/Assets/Audio/Noise/01/10.wav +++ b/Assets/Audio/Noise/01/10.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:425cb7383ed9a476695cfe5d6d585a67d275c159657c32128d46c0f1bb62d444 +oid sha256:e0d6b190fe2c3c121d465be04c019c79f45cd6a6fa9d6a8a266700c1fb6106e5 size 705644 diff --git a/Assets/Audio/Noise/01/11.wav b/Assets/Audio/Noise/01/11.wav index 152e653..e69fa64 100755 --- a/Assets/Audio/Noise/01/11.wav +++ b/Assets/Audio/Noise/01/11.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab4e84e7da12b78e2a6a4378bdbe11410b286052ad6c94a28255bfe3f3cbf246 +oid sha256:8bbfdc75d6703ec2951a30ad9a51aea846131d0067f43dc1371b8512ea313385 size 705644 diff --git a/Assets/Audio/Noise/01/12.wav b/Assets/Audio/Noise/01/12.wav index 9acb125..6c8773a 100755 --- a/Assets/Audio/Noise/01/12.wav +++ b/Assets/Audio/Noise/01/12.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75d6f8d072471908c433f8b82a94ac1ece41e69838d3d55fb57d3037b5edafae +oid sha256:3b2153b46d4ff094822bfad4a34b6b5a8db9a2e7351db06163a92bf7d4046638 size 705644 diff --git a/Assets/Audio/Noise/01/13.wav b/Assets/Audio/Noise/01/13.wav index 4b1fc35..0cbb834 100755 --- a/Assets/Audio/Noise/01/13.wav +++ b/Assets/Audio/Noise/01/13.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67b6694ac2c11df52e9655882d6d5f0c829fc6688950237f8446151117c352cb +oid sha256:04032ca03cc03a0f08b83b6119a78d4f7f79822e8a55e76207a0a7241a57e1cd size 705644 diff --git a/Assets/Audio/Noise/01/14.wav b/Assets/Audio/Noise/01/14.wav index 503ee52..ac82068 100755 --- a/Assets/Audio/Noise/01/14.wav +++ b/Assets/Audio/Noise/01/14.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7897b1500869cd349f21de9460a2f74393d85d8c05bbdd69f08a5179aad9053e +oid sha256:b8708e3825c13cef6e20b5902e7bd3937f67a7a20b88441963876faa485af041 size 705644 diff --git a/Assets/Audio/Noise/01/15.wav b/Assets/Audio/Noise/01/15.wav new file mode 100755 index 0000000..68f490e --- /dev/null +++ b/Assets/Audio/Noise/01/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b10591c5def1a7eb7ac7a8ddb74b1c7c80c6afdb0425e44dafa209023368245 +size 705644 diff --git a/Assets/Audio/Noise/07/15.wav.meta b/Assets/Audio/Noise/01/15.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/15.wav.meta rename to Assets/Audio/Noise/01/15.wav.meta index 7833da0..2918446 100755 --- a/Assets/Audio/Noise/07/15.wav.meta +++ b/Assets/Audio/Noise/01/15.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3b48017148865ce4f913ff5538760f68 +guid: 4fd0738f9cbdc5e478f71e3d9c939a6d AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/16.wav b/Assets/Audio/Noise/01/16.wav new file mode 100755 index 0000000..4417d79 --- /dev/null +++ b/Assets/Audio/Noise/01/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab46f29003dad5c4f4be6cdcd13ffe3e3300f1445084db98638eaf3a2f562339 +size 705644 diff --git a/Assets/Audio/Noise/07/16.wav.meta b/Assets/Audio/Noise/01/16.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/16.wav.meta rename to Assets/Audio/Noise/01/16.wav.meta index 34b61cf..c2551e4 100755 --- a/Assets/Audio/Noise/07/16.wav.meta +++ b/Assets/Audio/Noise/01/16.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5b1a57155bed7a45b2f35c4be2b5219 +guid: 0c8fff027b65a9d4986bad978c666890 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/2.wav b/Assets/Audio/Noise/01/2.wav index ee65967..ea83317 100755 --- a/Assets/Audio/Noise/01/2.wav +++ b/Assets/Audio/Noise/01/2.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6c3a42095820e4331d6de53a84703e55f5a699197100b8bb2cf894ccc586058 +oid sha256:57106099dcb02a0d5983e93bc0e5213c12ccbc9198e6990c97ee0fab8ab188df size 705644 diff --git a/Assets/Audio/Noise/01/3.wav b/Assets/Audio/Noise/01/3.wav index 0ac47f4..c8ae4eb 100755 --- a/Assets/Audio/Noise/01/3.wav +++ b/Assets/Audio/Noise/01/3.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80cc6e0c3ad127ddeae4f348e3c8b7533fc4ea20431218e561e95fa93a2c5667 +oid sha256:93537a5d12996c635b659f763ccd68ddacd51d12d7a0601433ea78d5d893adde size 705644 diff --git a/Assets/Audio/Noise/01/4.wav b/Assets/Audio/Noise/01/4.wav index 97d5a67..8dd040b 100755 --- a/Assets/Audio/Noise/01/4.wav +++ b/Assets/Audio/Noise/01/4.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:086742cf73b29c44590b6179acbe8296f4e879b6bcb2473d5f77a2eceee1d4a6 +oid sha256:91a45e2c32f5432a086f6325571aec052b24e0264cb74dd66fb8742f53b2c8a6 size 705644 diff --git a/Assets/Audio/Noise/01/5.wav b/Assets/Audio/Noise/01/5.wav index 04946d9..03c16d4 100755 --- a/Assets/Audio/Noise/01/5.wav +++ b/Assets/Audio/Noise/01/5.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fcbb5dbcc428a462a5e77e7f0f6c82cfc8a8e8b312ae835b8f987984b68a6b1f +oid sha256:b76dbb65a5a150e03269b598eeff15fa26a19b7ecd387cad5f4b218b5dd7d616 size 705644 diff --git a/Assets/Audio/Noise/01/6.wav b/Assets/Audio/Noise/01/6.wav index c12c57d..d8036b0 100755 --- a/Assets/Audio/Noise/01/6.wav +++ b/Assets/Audio/Noise/01/6.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b6e505426b8043b52f0c4ddbeb7fdf54f34d986dfeb4f0714161f025f6476c4 +oid sha256:0fedad48f543feb322fac6051a8e1558347312011a036fedaf5076b686b16f7d size 705644 diff --git a/Assets/Audio/Noise/01/7.wav b/Assets/Audio/Noise/01/7.wav index 87a48c8..e7eccb1 100755 --- a/Assets/Audio/Noise/01/7.wav +++ b/Assets/Audio/Noise/01/7.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccb683ca86496de33d7b12c52a8632a5e2eb80e1a2117e6b09931a79a8d42f64 +oid sha256:02eb12240fd963cd4f20e5cdc724b794ea47670557d8a169451df3a4ad89f3a2 size 705644 diff --git a/Assets/Audio/Noise/01/8.wav b/Assets/Audio/Noise/01/8.wav index 5c8d590..86e971a 100755 --- a/Assets/Audio/Noise/01/8.wav +++ b/Assets/Audio/Noise/01/8.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:977693f34bd61bb0f943901b95799d5304c4ac61d8e152835063b296663ed539 +oid sha256:060994b109383b36f89c761ffd5a8924a7133f06a4d477b726cffc96fea61497 size 705644 diff --git a/Assets/Audio/Noise/01/9.wav b/Assets/Audio/Noise/01/9.wav index 7affa86..4430f0e 100755 --- a/Assets/Audio/Noise/01/9.wav +++ b/Assets/Audio/Noise/01/9.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4fed348af693d6de90cfa82b8723cb4f4d2c3d7ba8e42ba9bb347976aa3b906 +oid sha256:8fd44c6b4e7cfe0959adcb5e2c0dc98ef86ccdaf510359d9d0979a17214fb1de size 705644 diff --git a/Assets/Audio/Noise/02/3.wav b/Assets/Audio/Noise/02/3.wav index 50813fc..0844497 100755 --- a/Assets/Audio/Noise/02/3.wav +++ b/Assets/Audio/Noise/02/3.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c8975a26db38ceb7c6563329acf3b320f0de9f4a849e1cc0803830c0f97832f +oid sha256:4eb0c9b86fa20835e8e5a433231274dbe4c077a39b1913920c81f2c92e7ca53a size 705644 diff --git a/Assets/Audio/Noise/07.meta b/Assets/Audio/Noise/03.meta similarity index 77% rename from Assets/Audio/Noise/07.meta rename to Assets/Audio/Noise/03.meta index ba63168..f4ae64f 100755 --- a/Assets/Audio/Noise/07.meta +++ b/Assets/Audio/Noise/03.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 00c2ca68da5a0ff499091c78c9d8d844 +guid: 550a198216ffc1a4d9523aad21e625b8 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Audio/Noise/03/1.wav b/Assets/Audio/Noise/03/1.wav new file mode 100755 index 0000000..b651e67 --- /dev/null +++ b/Assets/Audio/Noise/03/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cc5814663bf68f916a4f850de5f06aec6935599a82c54b4335d4821af8065d1 +size 705644 diff --git a/Assets/Audio/Noise/07/1.wav.meta b/Assets/Audio/Noise/03/1.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/1.wav.meta rename to Assets/Audio/Noise/03/1.wav.meta index e72bdcc..c78d9ab 100755 --- a/Assets/Audio/Noise/07/1.wav.meta +++ b/Assets/Audio/Noise/03/1.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6ffb0204d35fb04daa131fb572a72cb +guid: c4cc2bd1c26d8f44f8aed1c701a0569e AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/10.wav b/Assets/Audio/Noise/03/10.wav new file mode 100755 index 0000000..3eff08f --- /dev/null +++ b/Assets/Audio/Noise/03/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84c74b803ee1e8481cf86db9aa32f972023e6d747468a9c0beb5b3713132ad95 +size 705644 diff --git a/Assets/Audio/Noise/07/10.wav.meta b/Assets/Audio/Noise/03/10.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/10.wav.meta rename to Assets/Audio/Noise/03/10.wav.meta index 22d967b..f23cae3 100755 --- a/Assets/Audio/Noise/07/10.wav.meta +++ b/Assets/Audio/Noise/03/10.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc5640ccfc4aab24b83ff89a7ab4348e +guid: 129c76fbff01e17458ac7752b42daaf9 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/11.wav b/Assets/Audio/Noise/03/11.wav new file mode 100755 index 0000000..7685d3a --- /dev/null +++ b/Assets/Audio/Noise/03/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21e7810ccbe7912db6d9f3618230ee31cccb7e61151d41c63ac4d08c02973a70 +size 705644 diff --git a/Assets/Audio/Noise/07/11.wav.meta b/Assets/Audio/Noise/03/11.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/11.wav.meta rename to Assets/Audio/Noise/03/11.wav.meta index 6124ffe..d1f718c 100755 --- a/Assets/Audio/Noise/07/11.wav.meta +++ b/Assets/Audio/Noise/03/11.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c0bedc4d9738b4a4ab6459177c080265 +guid: 02800c4d0201c7547bc355f35bb8477b AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/12.wav b/Assets/Audio/Noise/03/12.wav new file mode 100755 index 0000000..1063785 --- /dev/null +++ b/Assets/Audio/Noise/03/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72ad84d3ebe38f9e6051723d166269ef65dd374f6e6812c3d4095a2516fdb0f0 +size 705644 diff --git a/Assets/Audio/Noise/07/12.wav.meta b/Assets/Audio/Noise/03/12.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/12.wav.meta rename to Assets/Audio/Noise/03/12.wav.meta index f9f76f6..e730edc 100755 --- a/Assets/Audio/Noise/07/12.wav.meta +++ b/Assets/Audio/Noise/03/12.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b9e6166ef51af684daaecef0a60f1a7d +guid: 73e6f0746355c3e44a244c93b29491c0 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/13.wav b/Assets/Audio/Noise/03/13.wav new file mode 100755 index 0000000..195be84 --- /dev/null +++ b/Assets/Audio/Noise/03/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b42948fc0131f8f633088e307f5ae044669e2b8117db69fc3778d51377f73aa +size 705644 diff --git a/Assets/Audio/Noise/07/13.wav.meta b/Assets/Audio/Noise/03/13.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/13.wav.meta rename to Assets/Audio/Noise/03/13.wav.meta index 32f2578..7f44661 100755 --- a/Assets/Audio/Noise/07/13.wav.meta +++ b/Assets/Audio/Noise/03/13.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e03e3e2d19a1c944b96467bdca7c5229 +guid: 249ce68b47233f24d85701dc0a375fd0 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/14.wav b/Assets/Audio/Noise/03/14.wav new file mode 100755 index 0000000..3598f78 --- /dev/null +++ b/Assets/Audio/Noise/03/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2fda8373fbfaa2472086c44c2b253b2f591aa01cfc139e131d707682dbd80b7 +size 705644 diff --git a/Assets/Audio/Noise/07/14.wav.meta b/Assets/Audio/Noise/03/14.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/14.wav.meta rename to Assets/Audio/Noise/03/14.wav.meta index c0a2688..104d359 100755 --- a/Assets/Audio/Noise/07/14.wav.meta +++ b/Assets/Audio/Noise/03/14.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3b05da298ab5184ea638320bafc3e7d +guid: a12b362ecc927e541b53336c948281ff AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/15.wav b/Assets/Audio/Noise/03/15.wav new file mode 100755 index 0000000..4d62522 --- /dev/null +++ b/Assets/Audio/Noise/03/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8367872571e302af8909c5c7a0e60711c9a3228f8055badbbfc71efce5d2fb42 +size 705644 diff --git a/Assets/Audio/Noise/07/0.wav.meta b/Assets/Audio/Noise/03/15.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/0.wav.meta rename to Assets/Audio/Noise/03/15.wav.meta index 96ab20f..57e106e 100755 --- a/Assets/Audio/Noise/07/0.wav.meta +++ b/Assets/Audio/Noise/03/15.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95082891fb63e274abda1ad451ffe39f +guid: 220ebb468eaaec24aace499b11a4bd34 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/16.wav b/Assets/Audio/Noise/03/16.wav new file mode 100755 index 0000000..69a981e --- /dev/null +++ b/Assets/Audio/Noise/03/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e71f7cdb6bb3adec1f26c14edb543d5e20b7c22290a26dcc150c9965383a6336 +size 705644 diff --git a/Assets/Audio/Noise/03/16.wav.meta b/Assets/Audio/Noise/03/16.wav.meta new file mode 100755 index 0000000..f064bbe --- /dev/null +++ b/Assets/Audio/Noise/03/16.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 617bc9baadd0a6940b27ae5bcbd8ad33 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/03/2.wav b/Assets/Audio/Noise/03/2.wav new file mode 100755 index 0000000..4e6ac06 --- /dev/null +++ b/Assets/Audio/Noise/03/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:177eb6ee65136e6486e3bd3447566d9159b630c34f4ee7d18626a60de63fadce +size 705644 diff --git a/Assets/Audio/Noise/07/2.wav.meta b/Assets/Audio/Noise/03/2.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/2.wav.meta rename to Assets/Audio/Noise/03/2.wav.meta index 4a9994e..5bc2b36 100755 --- a/Assets/Audio/Noise/07/2.wav.meta +++ b/Assets/Audio/Noise/03/2.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 28f5a0ee7f0629f4ab87f4b57c992f79 +guid: 838e5534274656341bd1f7bd33dbea18 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/3.wav b/Assets/Audio/Noise/03/3.wav new file mode 100755 index 0000000..c30a086 --- /dev/null +++ b/Assets/Audio/Noise/03/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e237a437aef862b974e4b1e9547991c93f728f577060a51e4bb3fb99bd2aaf0 +size 705644 diff --git a/Assets/Audio/Noise/07/3.wav.meta b/Assets/Audio/Noise/03/3.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/3.wav.meta rename to Assets/Audio/Noise/03/3.wav.meta index 77bfea7..82bd8fe 100755 --- a/Assets/Audio/Noise/07/3.wav.meta +++ b/Assets/Audio/Noise/03/3.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2b849e93bc97aaf4da970fc6d59495ef +guid: 1012483a3eea65e4bacd2680b00e3471 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/4.wav b/Assets/Audio/Noise/03/4.wav new file mode 100755 index 0000000..98c8f70 --- /dev/null +++ b/Assets/Audio/Noise/03/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f595e8df3aac2a2108167c27c58acc6ecd29b8a55ed55da98ddaa23888f9832 +size 705644 diff --git a/Assets/Audio/Noise/07/4.wav.meta b/Assets/Audio/Noise/03/4.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/4.wav.meta rename to Assets/Audio/Noise/03/4.wav.meta index 94eb27c..967a0dc 100755 --- a/Assets/Audio/Noise/07/4.wav.meta +++ b/Assets/Audio/Noise/03/4.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 25d81a68c24e55544a2187d435d99047 +guid: a6e008e791cde8d4a963c145c2d9cba4 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/5.wav b/Assets/Audio/Noise/03/5.wav new file mode 100755 index 0000000..4d535e5 --- /dev/null +++ b/Assets/Audio/Noise/03/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1645ddf1e77879a73e805905dc45fee41c3d12fc295567096637e0822528c4e +size 705644 diff --git a/Assets/Audio/Noise/07/5.wav.meta b/Assets/Audio/Noise/03/5.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/5.wav.meta rename to Assets/Audio/Noise/03/5.wav.meta index c02abbf..87e44fd 100755 --- a/Assets/Audio/Noise/07/5.wav.meta +++ b/Assets/Audio/Noise/03/5.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b11037c5d5643be4b8ba075972eceb13 +guid: 1b6ffccc095d0c24eb262a62055d6e49 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/6.wav b/Assets/Audio/Noise/03/6.wav new file mode 100755 index 0000000..d09a9c1 --- /dev/null +++ b/Assets/Audio/Noise/03/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1772c5726e056dcd53157b269660ac1736d18f60a5cc4fb63c463509499a8e3 +size 705644 diff --git a/Assets/Audio/Noise/07/6.wav.meta b/Assets/Audio/Noise/03/6.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/6.wav.meta rename to Assets/Audio/Noise/03/6.wav.meta index 16192d3..29b280c 100755 --- a/Assets/Audio/Noise/07/6.wav.meta +++ b/Assets/Audio/Noise/03/6.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a1266476578fad489d533b3ee050e33 +guid: c7de38af507129f4f8e128f297909446 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/7.wav b/Assets/Audio/Noise/03/7.wav new file mode 100755 index 0000000..65d7533 --- /dev/null +++ b/Assets/Audio/Noise/03/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23492b48013fb3f273b616dad872c6bd5cee9ef2559fcd1e79e84a172e794bcc +size 705644 diff --git a/Assets/Audio/Noise/07/7.wav.meta b/Assets/Audio/Noise/03/7.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/7.wav.meta rename to Assets/Audio/Noise/03/7.wav.meta index 55c9b7c..c590115 100755 --- a/Assets/Audio/Noise/07/7.wav.meta +++ b/Assets/Audio/Noise/03/7.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8152d2c983b4e04baf801f14660818a +guid: 6d2f27a6e0492b943a0278965d173d55 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/8.wav b/Assets/Audio/Noise/03/8.wav new file mode 100755 index 0000000..7883686 --- /dev/null +++ b/Assets/Audio/Noise/03/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1645c2868309c9a37889b501324a523885c52b10905d211a5000333ec2ceb74d +size 705644 diff --git a/Assets/Audio/Noise/07/8.wav.meta b/Assets/Audio/Noise/03/8.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/8.wav.meta rename to Assets/Audio/Noise/03/8.wav.meta index da7c73d..576c0ff 100755 --- a/Assets/Audio/Noise/07/8.wav.meta +++ b/Assets/Audio/Noise/03/8.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4591aa6320e8be6429df59d5d46a0a4c +guid: 26914c9ff860b944db94a85a57f6b31c AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/03/9.wav b/Assets/Audio/Noise/03/9.wav new file mode 100755 index 0000000..c80d2e1 --- /dev/null +++ b/Assets/Audio/Noise/03/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afd4ffac68e3946179b547f3ca366cc239111a4652ae0df07fc3abbb82970214 +size 705644 diff --git a/Assets/Audio/Noise/07/9.wav.meta b/Assets/Audio/Noise/03/9.wav.meta similarity index 91% rename from Assets/Audio/Noise/07/9.wav.meta rename to Assets/Audio/Noise/03/9.wav.meta index 20a8d9d..d3e688c 100755 --- a/Assets/Audio/Noise/07/9.wav.meta +++ b/Assets/Audio/Noise/03/9.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1229af9bd596d1f49bf5343790b2cda1 +guid: abe4f255acb5b31478fd2edee26f9a0e AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/04.meta b/Assets/Audio/Noise/04.meta new file mode 100755 index 0000000..9ef97b6 --- /dev/null +++ b/Assets/Audio/Noise/04.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5168c48104cb365439fcf4c4d9ba157d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/1.wav b/Assets/Audio/Noise/04/1.wav new file mode 100755 index 0000000..c595112 --- /dev/null +++ b/Assets/Audio/Noise/04/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63ca3b3d24c6d7f9c58fc7c411400372769282951f005defe906d6438cc35d3e +size 705644 diff --git a/Assets/Audio/Noise/04/1.wav.meta b/Assets/Audio/Noise/04/1.wav.meta new file mode 100755 index 0000000..99a3576 --- /dev/null +++ b/Assets/Audio/Noise/04/1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1cd9ee8c5c8377b4b9300c9af64ed5e5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/10.wav b/Assets/Audio/Noise/04/10.wav new file mode 100755 index 0000000..385fccd --- /dev/null +++ b/Assets/Audio/Noise/04/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8c090453ab0d4609562f7e31149a20a40a7c6853821371e04bbce9f098dcee6 +size 705644 diff --git a/Assets/Audio/Noise/04/10.wav.meta b/Assets/Audio/Noise/04/10.wav.meta new file mode 100755 index 0000000..1cc557e --- /dev/null +++ b/Assets/Audio/Noise/04/10.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e681b9918e51cf348a1d4fea42cc440f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/11.wav b/Assets/Audio/Noise/04/11.wav new file mode 100755 index 0000000..5bc475e --- /dev/null +++ b/Assets/Audio/Noise/04/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5c47558998b99ca8f0ca98657b2b4ef5787121af8757edf4796769cdb3597a2 +size 705644 diff --git a/Assets/Audio/Noise/04/11.wav.meta b/Assets/Audio/Noise/04/11.wav.meta new file mode 100755 index 0000000..40e43c3 --- /dev/null +++ b/Assets/Audio/Noise/04/11.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a65104e38b846e645b6dbbfbd824fd2a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/12.wav b/Assets/Audio/Noise/04/12.wav new file mode 100755 index 0000000..54ab8cd --- /dev/null +++ b/Assets/Audio/Noise/04/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:008b911873608a51ff10fdaa2b26ed7dfc6d412318f011b0cc4f02833c3327fd +size 705644 diff --git a/Assets/Audio/Noise/04/12.wav.meta b/Assets/Audio/Noise/04/12.wav.meta new file mode 100755 index 0000000..f5db072 --- /dev/null +++ b/Assets/Audio/Noise/04/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 96f989546384eee4dba8defbf006d9e0 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/13.wav b/Assets/Audio/Noise/04/13.wav new file mode 100755 index 0000000..eb5ef27 --- /dev/null +++ b/Assets/Audio/Noise/04/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8dd5dcdd6a8d30f72079116bb9bdc772392dc57ea52a1b432d5af02b5ee502b8 +size 705644 diff --git a/Assets/Audio/Noise/04/13.wav.meta b/Assets/Audio/Noise/04/13.wav.meta new file mode 100755 index 0000000..3a531d0 --- /dev/null +++ b/Assets/Audio/Noise/04/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8619faa6de5ce3443a33831ca6ce3469 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/14.wav b/Assets/Audio/Noise/04/14.wav new file mode 100755 index 0000000..7ff52b3 --- /dev/null +++ b/Assets/Audio/Noise/04/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01c38638d43f1f5983911f8d3e5e70251cd8b9b8172e15cd35a4c98151ecd180 +size 705644 diff --git a/Assets/Audio/Noise/04/14.wav.meta b/Assets/Audio/Noise/04/14.wav.meta new file mode 100755 index 0000000..385fa48 --- /dev/null +++ b/Assets/Audio/Noise/04/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e5214dec31c635e47861af547f5a1ac6 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/15.wav b/Assets/Audio/Noise/04/15.wav new file mode 100755 index 0000000..2910eff --- /dev/null +++ b/Assets/Audio/Noise/04/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:997470ed0bba4df20144f60f53c0c44809230cf57857e52725a2122ff6cdee60 +size 705644 diff --git a/Assets/Audio/Noise/04/15.wav.meta b/Assets/Audio/Noise/04/15.wav.meta new file mode 100755 index 0000000..568e03e --- /dev/null +++ b/Assets/Audio/Noise/04/15.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f92fad536101f014093493cd7a949612 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/2.wav b/Assets/Audio/Noise/04/2.wav new file mode 100755 index 0000000..e204546 --- /dev/null +++ b/Assets/Audio/Noise/04/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b1cb41da9c79079691a2b9c2e57ee0ef1d55616df42cd6db471d0130ad54fcf +size 705644 diff --git a/Assets/Audio/Noise/04/2.wav.meta b/Assets/Audio/Noise/04/2.wav.meta new file mode 100755 index 0000000..6aec74d --- /dev/null +++ b/Assets/Audio/Noise/04/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 51cf0c8cc2e3a49428a74557465ad866 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/3.wav b/Assets/Audio/Noise/04/3.wav new file mode 100755 index 0000000..4b5c43b --- /dev/null +++ b/Assets/Audio/Noise/04/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b0227018e928cf794be37b29641c09fd311846d69c0a9ae20c86deb38dccbfa +size 705644 diff --git a/Assets/Audio/Noise/04/3.wav.meta b/Assets/Audio/Noise/04/3.wav.meta new file mode 100755 index 0000000..5f2e2b2 --- /dev/null +++ b/Assets/Audio/Noise/04/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: dd6fd0aca15c2cc49875a237b6a4336e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/4.wav b/Assets/Audio/Noise/04/4.wav new file mode 100755 index 0000000..f6bf4f7 --- /dev/null +++ b/Assets/Audio/Noise/04/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e87d5ad5cdc88c68c90078ed1d217d9639f922cb2f2151c1f8a770d64811cac4 +size 705644 diff --git a/Assets/Audio/Noise/04/4.wav.meta b/Assets/Audio/Noise/04/4.wav.meta new file mode 100755 index 0000000..a2f897f --- /dev/null +++ b/Assets/Audio/Noise/04/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c685983bc620c5a409a7de988c3933b8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/5.wav b/Assets/Audio/Noise/04/5.wav new file mode 100755 index 0000000..ea38fa5 --- /dev/null +++ b/Assets/Audio/Noise/04/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64f3c74b97086756bd7b182da72eeecda8550655352a31bc0fe2c75f67b2ea95 +size 705644 diff --git a/Assets/Audio/Noise/04/5.wav.meta b/Assets/Audio/Noise/04/5.wav.meta new file mode 100755 index 0000000..17bd5ce --- /dev/null +++ b/Assets/Audio/Noise/04/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c640e2613b642cb42bf31de37f515189 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/6.wav b/Assets/Audio/Noise/04/6.wav new file mode 100755 index 0000000..506ef0a --- /dev/null +++ b/Assets/Audio/Noise/04/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e03c77e353cef94513dd9865e982441e0e0f03d6daa930e4c3308648eed377a +size 705644 diff --git a/Assets/Audio/Noise/04/6.wav.meta b/Assets/Audio/Noise/04/6.wav.meta new file mode 100755 index 0000000..77387d2 --- /dev/null +++ b/Assets/Audio/Noise/04/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d8d5ae6ca83895f49937e7c525345228 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/7.wav b/Assets/Audio/Noise/04/7.wav new file mode 100755 index 0000000..568aa09 --- /dev/null +++ b/Assets/Audio/Noise/04/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6aa0996e62ef5cf68fc4996efad1448d1712936d18be94a98ba6aac8b7c20fad +size 705644 diff --git a/Assets/Audio/Noise/04/7.wav.meta b/Assets/Audio/Noise/04/7.wav.meta new file mode 100755 index 0000000..6312539 --- /dev/null +++ b/Assets/Audio/Noise/04/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f8e05080d00fa5c4ebf8209c03a3dcab +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/8.wav b/Assets/Audio/Noise/04/8.wav new file mode 100755 index 0000000..2f7ecbd --- /dev/null +++ b/Assets/Audio/Noise/04/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa3b83ac416d5002c06d757dd901d8e3408c5458e2b31245f28ae4b758475eeb +size 705644 diff --git a/Assets/Audio/Noise/04/8.wav.meta b/Assets/Audio/Noise/04/8.wav.meta new file mode 100755 index 0000000..5ab9d9b --- /dev/null +++ b/Assets/Audio/Noise/04/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d9ee341a8cc11f849b0a3d60cf475994 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/04/9.wav b/Assets/Audio/Noise/04/9.wav new file mode 100755 index 0000000..d45f86c --- /dev/null +++ b/Assets/Audio/Noise/04/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb77e93125ba18afae08aa524222df1609aab9947c5c9f78164bc234fb9a6191 +size 705644 diff --git a/Assets/Audio/Noise/04/9.wav.meta b/Assets/Audio/Noise/04/9.wav.meta new file mode 100755 index 0000000..ae8e66c --- /dev/null +++ b/Assets/Audio/Noise/04/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 06043b12a5fafa64db40e2e2e0d40976 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/0.wav b/Assets/Audio/Noise/07/0.wav deleted file mode 100755 index 7e4d647..0000000 --- a/Assets/Audio/Noise/07/0.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2563808b5ad1f93d684a9bb817e800f679684dc6beb6da865c843259a0185287 -size 705644 diff --git a/Assets/Audio/Noise/07/1.wav b/Assets/Audio/Noise/07/1.wav deleted file mode 100755 index 55705d7..0000000 --- a/Assets/Audio/Noise/07/1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fb33c91bb8572f12ac7f2e0bad5fa889b96b6f062468d07103c66f5db3538f0 -size 705644 diff --git a/Assets/Audio/Noise/07/10.wav b/Assets/Audio/Noise/07/10.wav deleted file mode 100755 index 063bbc4..0000000 --- a/Assets/Audio/Noise/07/10.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d95c26eaf0b68a62eaeab758b838646bcf3a0be701f03b24b8d48f7d1c95acdc -size 705644 diff --git a/Assets/Audio/Noise/07/11.wav b/Assets/Audio/Noise/07/11.wav deleted file mode 100755 index a39b93a..0000000 --- a/Assets/Audio/Noise/07/11.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5696336aae456156ffde9154f682796d8fd43c9fdd92803d22f3288acf1139da -size 705644 diff --git a/Assets/Audio/Noise/07/12.wav b/Assets/Audio/Noise/07/12.wav deleted file mode 100755 index 21b90d3..0000000 --- a/Assets/Audio/Noise/07/12.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0050060f880b18cedaa30895ea69a4b0eb701a9fa79a070ebcf1b81bfeffb174 -size 705644 diff --git a/Assets/Audio/Noise/07/13.wav b/Assets/Audio/Noise/07/13.wav deleted file mode 100755 index ed55bcc..0000000 --- a/Assets/Audio/Noise/07/13.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4b9a97183c3f3f57b145bcf99808f1be2bf3a824fd23e3481c5dfc1b101ec9b -size 705644 diff --git a/Assets/Audio/Noise/07/14.wav b/Assets/Audio/Noise/07/14.wav deleted file mode 100755 index d8ddf66..0000000 --- a/Assets/Audio/Noise/07/14.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ff53c0ee94e6f109a74120cd54743ab9302ffe5b10c1c8f66a459518dd563e0 -size 705644 diff --git a/Assets/Audio/Noise/07/15.wav b/Assets/Audio/Noise/07/15.wav deleted file mode 100755 index 946e483..0000000 --- a/Assets/Audio/Noise/07/15.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02ba5368aa6961436308c1ef1077b20669764e51f916c7ed34b9f69bcaedd25e -size 705644 diff --git a/Assets/Audio/Noise/07/16.wav b/Assets/Audio/Noise/07/16.wav deleted file mode 100755 index 0afe9e3..0000000 --- a/Assets/Audio/Noise/07/16.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb3d409290e823280a17fa4180b5ba47eb32eb32c3d5bbcaab24e283f2d7f900 -size 705644 diff --git a/Assets/Audio/Noise/07/17.wav b/Assets/Audio/Noise/07/17.wav deleted file mode 100755 index f40b2c4..0000000 --- a/Assets/Audio/Noise/07/17.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1cf2e8d3d456bd13876d8188ef0c14ad88463418de8b3295cc3068a7a4afd96 -size 705644 diff --git a/Assets/Audio/Noise/07/17.wav.meta b/Assets/Audio/Noise/07/17.wav.meta deleted file mode 100755 index ae4746e..0000000 --- a/Assets/Audio/Noise/07/17.wav.meta +++ /dev/null @@ -1,23 +0,0 @@ -fileFormatVersion: 2 -guid: b1543c3d498188c4b8dabd083d1943f1 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Audio/Noise/07/2.wav b/Assets/Audio/Noise/07/2.wav deleted file mode 100755 index 8107390..0000000 --- a/Assets/Audio/Noise/07/2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c04715a76c5c627e029a1f0d6b3c18249c32cc8e727036624ac61abec791d33 -size 705644 diff --git a/Assets/Audio/Noise/07/3.wav b/Assets/Audio/Noise/07/3.wav deleted file mode 100755 index a1611cb..0000000 --- a/Assets/Audio/Noise/07/3.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e10810fa0962071fe6954d9663b210af9a2684e61261bde9081267c9ae73e28f -size 705644 diff --git a/Assets/Audio/Noise/07/4.wav b/Assets/Audio/Noise/07/4.wav deleted file mode 100755 index 3c2373b..0000000 --- a/Assets/Audio/Noise/07/4.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58089d87b605f3b9e65eddf5d76e1c7362ccf52c95a42be26be6d2f390ba42c8 -size 705644 diff --git a/Assets/Audio/Noise/07/5.wav b/Assets/Audio/Noise/07/5.wav deleted file mode 100755 index 5756205..0000000 --- a/Assets/Audio/Noise/07/5.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f303ebe8a1b0d0793e8aca5c3df6aef7aae8c7bc3c4a70d242a3e37df8546741 -size 705644 diff --git a/Assets/Audio/Noise/07/6.wav b/Assets/Audio/Noise/07/6.wav deleted file mode 100755 index d3163f3..0000000 --- a/Assets/Audio/Noise/07/6.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6b260c5cb8699d91a21babfa8028ff6c19c06a1821e22a5abe62705e67f7510 -size 705644 diff --git a/Assets/Audio/Noise/07/7.wav b/Assets/Audio/Noise/07/7.wav deleted file mode 100755 index 1b32080..0000000 --- a/Assets/Audio/Noise/07/7.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d20e26a89e4c0ed0a00f12cda8554f67c2884e37a05aad4187cb3a17bb600c0 -size 705644 diff --git a/Assets/Audio/Noise/07/8.wav b/Assets/Audio/Noise/07/8.wav deleted file mode 100755 index 71dea01..0000000 --- a/Assets/Audio/Noise/07/8.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3d25e6e05b65a60315dff0462eb823fd4179d14e9db2d58b0cd8d3df151b57d -size 705644 diff --git a/Assets/Audio/Noise/07/9.wav b/Assets/Audio/Noise/07/9.wav deleted file mode 100755 index b7b4c8a..0000000 --- a/Assets/Audio/Noise/07/9.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1fe455609c0e66b69cec9d1a89fdf89797be481138ba7268b3f03b90218f374 -size 705644 diff --git a/Assets/Materials/00015.clip.png b/Assets/Materials/00015.HAS.SD.META.png similarity index 100% rename from Assets/Materials/00015.clip.png rename to Assets/Materials/00015.HAS.SD.META.png diff --git a/Assets/Materials/00015.clip.png.meta b/Assets/Materials/00015.HAS.SD.META.png.meta similarity index 100% rename from Assets/Materials/00015.clip.png.meta rename to Assets/Materials/00015.HAS.SD.META.png.meta diff --git a/Assets/Prefabs/Ship/Ship.prefab b/Assets/Prefabs/Ship/Ship.prefab index 98d56c1..bad7ff2 100755 --- a/Assets/Prefabs/Ship/Ship.prefab +++ b/Assets/Prefabs/Ship/Ship.prefab @@ -284,25 +284,55 @@ MonoBehaviour: - {fileID: 8300000, guid: f583924dc9b327e4cae85a01bcac9fbb, type: 3} - {fileID: 8300000, guid: 52c705ef6868d2f428af01b1cba8b467, type: 3} - {fileID: 8300000, guid: 4e3236145e30dfc408fb66aad5be6784, type: 3} - - {fileID: 8300000, guid: 95082891fb63e274abda1ad451ffe39f, type: 3} - - {fileID: 8300000, guid: d6ffb0204d35fb04daa131fb572a72cb, type: 3} - - {fileID: 8300000, guid: 28f5a0ee7f0629f4ab87f4b57c992f79, type: 3} - - {fileID: 8300000, guid: 2b849e93bc97aaf4da970fc6d59495ef, type: 3} - - {fileID: 8300000, guid: 25d81a68c24e55544a2187d435d99047, type: 3} - - {fileID: 8300000, guid: b11037c5d5643be4b8ba075972eceb13, type: 3} - - {fileID: 8300000, guid: 9a1266476578fad489d533b3ee050e33, type: 3} - - {fileID: 8300000, guid: a8152d2c983b4e04baf801f14660818a, type: 3} - - {fileID: 8300000, guid: 4591aa6320e8be6429df59d5d46a0a4c, type: 3} - - {fileID: 8300000, guid: 1229af9bd596d1f49bf5343790b2cda1, type: 3} - - {fileID: 8300000, guid: fc5640ccfc4aab24b83ff89a7ab4348e, type: 3} - - {fileID: 8300000, guid: c0bedc4d9738b4a4ab6459177c080265, type: 3} - - {fileID: 8300000, guid: b9e6166ef51af684daaecef0a60f1a7d, type: 3} - - {fileID: 8300000, guid: e03e3e2d19a1c944b96467bdca7c5229, type: 3} - - {fileID: 8300000, guid: f3b05da298ab5184ea638320bafc3e7d, type: 3} - - {fileID: 8300000, guid: 3b48017148865ce4f913ff5538760f68, type: 3} - - {fileID: 8300000, guid: f5b1a57155bed7a45b2f35c4be2b5219, type: 3} - - {fileID: 8300000, guid: b1543c3d498188c4b8dabd083d1943f1, type: 3} - bigNoiseClips: [] + - {fileID: 8300000, guid: 4fd0738f9cbdc5e478f71e3d9c939a6d, type: 3} + - {fileID: 8300000, guid: 0c8fff027b65a9d4986bad978c666890, type: 3} + - {fileID: 8300000, guid: b03343745eb6b5d4a86663369bd72c28, type: 3} + - {fileID: 8300000, guid: 5dd8f95d772c7394580e7d7a09739737, type: 3} + - {fileID: 8300000, guid: 91728f1b5f0dae440ad5f4230d889a81, type: 3} + - {fileID: 8300000, guid: 3323931b12f255344b832f7eb71a111a, type: 3} + - {fileID: 8300000, guid: 2aa01028ecf4743429856bc2e07af835, type: 3} + - {fileID: 8300000, guid: 9fff106a08efbdd46a7640bd2ed53227, type: 3} + - {fileID: 8300000, guid: dab9499ab887d1346b03da58f1d820ff, type: 3} + - {fileID: 8300000, guid: 145a90462178f5149b19bebf66c110c0, type: 3} + - {fileID: 8300000, guid: 700fa2fbd5f5c474d815e2e638747699, type: 3} + - {fileID: 8300000, guid: fb5739451e9e4574499f1a60f5354d98, type: 3} + - {fileID: 8300000, guid: 27e54ed3aafb80946af0789c1b57ca57, type: 3} + - {fileID: 8300000, guid: 99db5b15b74a4ac439ce3123b2cb00c1, type: 3} + - {fileID: 8300000, guid: 4a44973e6e426834d8e1347edee67857, type: 3} + - {fileID: 8300000, guid: b17e2b600e58b804fb4344edfd7b4199, type: 3} + - {fileID: 8300000, guid: e401bbcc9c4aaf249a5205bd77d42702, type: 3} + - {fileID: 8300000, guid: 71d125ff384d86a4fb44b6942b74306d, type: 3} + - {fileID: 8300000, guid: c4cc2bd1c26d8f44f8aed1c701a0569e, type: 3} + - {fileID: 8300000, guid: 838e5534274656341bd1f7bd33dbea18, type: 3} + - {fileID: 8300000, guid: 1012483a3eea65e4bacd2680b00e3471, type: 3} + - {fileID: 8300000, guid: a6e008e791cde8d4a963c145c2d9cba4, type: 3} + - {fileID: 8300000, guid: 1b6ffccc095d0c24eb262a62055d6e49, type: 3} + - {fileID: 8300000, guid: c7de38af507129f4f8e128f297909446, type: 3} + - {fileID: 8300000, guid: 6d2f27a6e0492b943a0278965d173d55, type: 3} + - {fileID: 8300000, guid: 26914c9ff860b944db94a85a57f6b31c, type: 3} + - {fileID: 8300000, guid: abe4f255acb5b31478fd2edee26f9a0e, type: 3} + - {fileID: 8300000, guid: 129c76fbff01e17458ac7752b42daaf9, type: 3} + - {fileID: 8300000, guid: 02800c4d0201c7547bc355f35bb8477b, type: 3} + - {fileID: 8300000, guid: 73e6f0746355c3e44a244c93b29491c0, type: 3} + - {fileID: 8300000, guid: 249ce68b47233f24d85701dc0a375fd0, type: 3} + - {fileID: 8300000, guid: a12b362ecc927e541b53336c948281ff, type: 3} + - {fileID: 8300000, guid: 220ebb468eaaec24aace499b11a4bd34, type: 3} + - {fileID: 8300000, guid: 617bc9baadd0a6940b27ae5bcbd8ad33, type: 3} + - {fileID: 8300000, guid: 1cd9ee8c5c8377b4b9300c9af64ed5e5, type: 3} + - {fileID: 8300000, guid: 51cf0c8cc2e3a49428a74557465ad866, type: 3} + - {fileID: 8300000, guid: dd6fd0aca15c2cc49875a237b6a4336e, type: 3} + - {fileID: 8300000, guid: c685983bc620c5a409a7de988c3933b8, type: 3} + - {fileID: 8300000, guid: c640e2613b642cb42bf31de37f515189, type: 3} + - {fileID: 8300000, guid: d8d5ae6ca83895f49937e7c525345228, type: 3} + - {fileID: 8300000, guid: f8e05080d00fa5c4ebf8209c03a3dcab, type: 3} + - {fileID: 8300000, guid: d9ee341a8cc11f849b0a3d60cf475994, type: 3} + - {fileID: 8300000, guid: 06043b12a5fafa64db40e2e2e0d40976, type: 3} + - {fileID: 8300000, guid: e681b9918e51cf348a1d4fea42cc440f, type: 3} + - {fileID: 8300000, guid: a65104e38b846e645b6dbbfbd824fd2a, type: 3} + - {fileID: 8300000, guid: 96f989546384eee4dba8defbf006d9e0, type: 3} + - {fileID: 8300000, guid: 8619faa6de5ce3443a33831ca6ce3469, type: 3} + - {fileID: 8300000, guid: e5214dec31c635e47861af547f5a1ac6, type: 3} + - {fileID: 8300000, guid: f92fad536101f014093493cd7a949612, type: 3} --- !u!1 &5535911989893287240 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_alpha_centaurus.unity b/Assets/Scenes/sr_alpha_centaurus.unity index 1ff96f3..ad5e152 100755 --- a/Assets/Scenes/sr_alpha_centaurus.unity +++ b/Assets/Scenes/sr_alpha_centaurus.unity @@ -538,6 +538,17 @@ MonoBehaviour: m_EditorClassIdentifier: sector: 1 timing: {fileID: 1088368772} +--- !u!114 &618591844 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 5198188376350273124} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -1205,151 +1216,6 @@ Transform: m_Children: [] m_Father: {fileID: 1197749570} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!1 &1800093232 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1800093235} - - component: {fileID: 1800093234} - - component: {fileID: 1800093233} - m_Layer: 0 - m_Name: Audio Source - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1800093233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1800093232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} - m_Name: - m_EditorClassIdentifier: - soundNames: 0000000001000000 - clips: - - {fileID: 8300000, guid: 1cdd6e27104267647b16db497f41744f, type: 3} - - {fileID: 8300000, guid: 10a4e1180cb3be54da0d7d98dd327c8c, type: 3} ---- !u!82 &1800093234 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1800093232} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 1cdd6e27104267647b16db497f41744f, type: 3} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1800093235 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1800093232} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1881957564 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1426,7 +1292,7 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: audio value: - objectReference: {fileID: 1800093233} + objectReference: {fileID: 618591844} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1517,6 +1383,74 @@ PrefabInstance: propertyPath: timing value: objectReference: {fileID: 1088368772} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.size + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[0] + value: + objectReference: {fileID: 8300000, guid: b03343745eb6b5d4a86663369bd72c28, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[1] + value: + objectReference: {fileID: 8300000, guid: 5dd8f95d772c7394580e7d7a09739737, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[2] + value: + objectReference: {fileID: 8300000, guid: 91728f1b5f0dae440ad5f4230d889a81, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[3] + value: + objectReference: {fileID: 8300000, guid: 3323931b12f255344b832f7eb71a111a, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[4] + value: + objectReference: {fileID: 8300000, guid: 2aa01028ecf4743429856bc2e07af835, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[5] + value: + objectReference: {fileID: 8300000, guid: 9fff106a08efbdd46a7640bd2ed53227, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[6] + value: + objectReference: {fileID: 8300000, guid: dab9499ab887d1346b03da58f1d820ff, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[7] + value: + objectReference: {fileID: 8300000, guid: 145a90462178f5149b19bebf66c110c0, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[8] + value: + objectReference: {fileID: 8300000, guid: 700fa2fbd5f5c474d815e2e638747699, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[9] + value: + objectReference: {fileID: 8300000, guid: fb5739451e9e4574499f1a60f5354d98, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[10] + value: + objectReference: {fileID: 8300000, guid: 27e54ed3aafb80946af0789c1b57ca57, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[11] + value: + objectReference: {fileID: 8300000, guid: 99db5b15b74a4ac439ce3123b2cb00c1, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[12] + value: + objectReference: {fileID: 8300000, guid: 4a44973e6e426834d8e1347edee67857, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[13] + value: + objectReference: {fileID: 8300000, guid: b17e2b600e58b804fb4344edfd7b4199, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[14] + value: + objectReference: {fileID: 8300000, guid: e401bbcc9c4aaf249a5205bd77d42702, type: 3} + - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + propertyPath: noiseClips.Array.data[15] + value: + objectReference: {fileID: 8300000, guid: 71d125ff384d86a4fb44b6942b74306d, type: 3} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_RootOrder value: 4 @@ -1618,5 +1552,4 @@ SceneRoots: - {fileID: 137910247} - {fileID: 263013887} - {fileID: 286157496} - - {fileID: 1800093235} - {fileID: 1197749570} diff --git a/Assets/Scenes/sr_junglism2.unity b/Assets/Scenes/sr_junglism2.unity index 9e01f45..32e6c9d 100755 --- a/Assets/Scenes/sr_junglism2.unity +++ b/Assets/Scenes/sr_junglism2.unity @@ -5750,6 +5750,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 2015948217} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -33530,8 +33534,7 @@ PrefabInstance: propertyPath: m_Name value: Ship objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7510218262252450460, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] @@ -33569,6 +33572,17 @@ MonoBehaviour: m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: +--- !u!114 &2015948217 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 2015948213} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2021201532 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_pascal.unity b/Assets/Scenes/sr_pascal.unity index fa7acca..b81b26c 100755 --- a/Assets/Scenes/sr_pascal.unity +++ b/Assets/Scenes/sr_pascal.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 3 m_SubtractiveShadowColor: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: 98a7642c231e29341b4a653c55e77dd2, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: 98f1903469a6cc34cbd20bf32fcae96f, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -213,7 +213,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 0 + m_Type: 2 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 diff --git a/Assets/Scenes/sr_pascal/00000.png b/Assets/Scenes/sr_pascal/00000.png new file mode 100755 index 0000000..ba56885 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00000.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45099ded5001f1e152290e3467309ba05f4acd315a56514bfab89593aa33bade +size 2785393 diff --git a/Assets/Scenes/sr_pascal/00000.png.meta b/Assets/Scenes/sr_pascal/00000.png.meta new file mode 100755 index 0000000..25ff525 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00000.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 88937e901d4e026478f4d9ab47e0e31f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_pascal/00005-1222362291.png b/Assets/Scenes/sr_pascal/00005-1222362291.png new file mode 100755 index 0000000..098145e --- /dev/null +++ b/Assets/Scenes/sr_pascal/00005-1222362291.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6c8b8596e5a25a130da86ac094d64f88fdd7f50404bbb0c21d94ee6a5e673c8 +size 493287 diff --git a/Assets/Scenes/sr_pascal/00005-1222362291.png.meta b/Assets/Scenes/sr_pascal/00005-1222362291.png.meta new file mode 100755 index 0000000..7ddbe07 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00005-1222362291.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 6892b604b971c764d97ba1d41cf5e950 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_pascal/LightingData 1.asset b/Assets/Scenes/sr_pascal/LightingData 1.asset new file mode 100755 index 0000000000000000000000000000000000000000..87b34d5aff804e19cc237283ee00c5c3504c4cfb GIT binary patch literal 18200 zcmdU%dwg8Qb;oBd$ruN)d4qY$27@u!cqMF%0keK$85WF;W zKibYmJ9qAUXU@FNIrrYV*EXgS4yvTglF2T8)*0xj42nqeD-0q{_mNnANGHIf~U+fjPFYrH0SpN z7H+z%YnUeZ-=3Lah2tW3Fp9D{tRmj_fA7xL# zFCJ>=ZzAAm>$7iyr_2lJTQ~AKKI%fMjL3)D@$HZNR7NP<3deTr4sf9N#fG z9$3Rurrzwv`dx*5j*oT{ub(mvf&LwAc^R<_x22{8i(BV|7*x+|EH3d5&2Nt|6`G#dP*o|h5B_I zc@LmB?@VOZ&L8Lh4dl~*oMbs7ALw7-MS21{-Gk#S{KEc^F}qOz1Z1*4{M3lN z$@3wF=2f;QH*s z{9Ww%X$l|o{B(t1>G>H7-|qQ*h2QM?nF_zv^Nhmp^n8KB@AiD5!te8Zk-{JHe6hkG z^L&ZIcYD56;otH6EQNpH^JNPEq310Mf6?>h3V+q}vlHC;x7Wexe^!u}5&2N--&P_& z^gp40JBM5<+jN~7gPXF8po5!m&U=B7*P998lklVeS)JhF^%M6Rs9#3xLhbc)4YEUC zZ{C7`oecTBw`jGz5wQ!bzYBdk8Jzy54ZoCWbkL?9pX2#jh0pbToxAGxg-ic7C|vrtF~RH2jhMeS^bddL0?QHk!0Rh{yXPN5e(m~l{?_Xzvhy9BbF8%9Lxb$zc!li$_j}7&& z-dvAogIj(7a+V|Vf%CT$^LrmS=N)!dGyjf1?D-ajf5UTLgTwW6^}p?Tufm`6Jg@K{ zdETe+pLpJ{@Yg-RSmAGbUQqbEo);BfSLepfd;O8dzqjWD3P0HMOB6oY^Q{U$!Sg|d z&-Q#M!JYp;6P*70Qt~n)A8P&ghmoJk2<2Eq|9u&G6rO zDEvy#uT1cixe4rU{Mi38IU^r<|H9|HCp^Cj`5~_h?vJk~&-ltr!$0x33i`C_}}WyCI|%-G=m_*!I#*QW-1efkyTbAGS0 zyb-YrtiKC=lk3y<$PWF3Br$-KR#=D8LEHQm|J4Lj@s(&l3t4`}u~##eSYtxY*C1DO~Jlx5CAK{#@Z=KTj!K?B|;b7yJ2^!o_}`R=C*D zw-qk-^BskY{XC;^v7f(CxY*Bk6)yJky##mu^)9a;&n9@NAAhNE(U0#dT=e5Pg^Pat zK;fbvf2DBIkH1#9=*RO47ybAfg^PatP~oBnf zzgM{E$BPN>{OiNe5Bk@CATJ~Gq1L~?g#6L`>&xU)*{0p|Dg7(`6MSI}51&teqHxi_ zpDJAR?^T71{{5rEMgM-LaM8b?D_r#N7YY~sdrje@f4@|?=-=xK7ybJug^T{Zp>WZ^ ze^$8Y->(!d`uC>7MgQJPaHoH}z5e|Rc^Q!pwfgsKCc!3 zr#}q|?(};iIQ{Eb@-hbLL#=-AL7oxHv4;1r;}Y`gO(SGezxP75Jrg|a-*|;D^!@*U z!dH2|SAx6!rH$Ym-`?cqc>lxi2lgS)#Cf>C#P@vos|3uCiSI8>Oz?1jXfNRx9}T>`bQCwRSCfxb@x2QpL0Gf4Qr_scI}|8P1u_4jD z<2x}Szs@`q`@UjEf;;_~h9OZuW?EjZ43PQ}|32WP1b6+v*!O=Hd9`|CebVHaig-K! z@%iI-0QjqfTL03V;Gun-3yQ_4WLB>(6;5B$nJe`bmJF7nd@S!j@ZIh`O@vE%{<8o9~F`yUf;(C?8p2tY^<~v@P{!`-?_W zY%>OsT%0QiWXKyYFgb!AlSo^J*&;n9?$ zLLr;WFCNNgdvhIY*R{5pK{I47HCqKO>K@2%iSr)n6y~`Ftqhvr%onR=cd0kDlN;RAMHb>sJH=Rb_tByB`|K6z{p(!V|NLR-X$=8m%u!_1ZL7DFqbaD zMe(VMY%Yz@t4QYp`8>#1r?q8q(OAu2)qYXbQEKUgI_0`@QNfh5h0RgPW&0CnMP^Cf z&P9~B6<22a`(c=9Ld%zxD^_btR!hFCuh5$DTgebhpj);p>E^Ug^5`xXb!YSWsHfs+>C>#w6I&ZGqiv`^GQGLMsME?tKWv>` zk)=5^_P8eM>VZO|b-N6U2HGQ-ddv@xT8;x9NeuHVi|4Nk!TGwVz!BTa8lT~Cv$pxU zb^9&6;?oaYF=Oh}Z@xJE3SYh5S699Kor23AZ@FxpvW;!TOXB-|GR{Y-_xogg3d-=3 ziY6hkjMxRflIAVV2{`2~Ez5*FW%#Ngi){tAgF9RBYG8d{vPC|w+%@$>`FkYzANR?) z$lo(jKa@W{!T;O>)vdy!AwI8fny6-9oK!gqUqu)_H&fc3fU6%Tx+ zO8w$iHu<4(h_vumJ)fj-ZsoE5VG8F~68YgHaBgGpQF|8H5edGB{iK19s;qyc!ucpk zew4!bs7KzYa6XEWPgXb|mB?u)@sKjEe|(f7KROPP7A~J0AER(S3b6iEh4WUO{8)w0 z_xw18FZ7&`UhyFPTk84oafme6pO4JT!SQFNTVA#?BR(?mk$DXu?T>!Wlo`2zN4nsZ z?1{|IIL5fver8mWO_Bcs@@YTxk27sM7ZlPqbpF(cs@dQKfPrqRZX zgl9cZTheG_M)V&XA3v$)_?nnmX5<3KAB?Y=*%`+e%a(^cveVbc19=~0b9}VT*>Q+8 z$ImV2%Tb2DYfgf@EzfP>_~So~3IfNs6aD8W)#P&n$~?zE>G`P&|E%Zp6n?Mgrz!j^ zo}aGpCpl=M&Yk`zChuxd%jTNzwvyL!r$|JvBJlWas6MS z@QI!;O>nm*Gzpygf0n|J_Iz1_JN=#xPW|S!bTs{5PM%@pLalzEEg;6@_6uKv&}d^u z)bCwrQS5i6C5<*_BwXzG97`H)%t*M{?A%?TrZ_}exY%!2;bOn-3K#qBP`KD{ zXM#KX9SrR2iKp?M431bw+y?h$fkJx?t^Sze|nIUOYnMY zpW9G|{X@ARQ2%MaH+sG$pw2$XcX-Y=;z8=)?s;z+dz>K)B?Q?x@N^sZycHjQZ2_Ck8OM-{(^Eo~q=-=sor2UV@ zA=1=Oj(>-5|KkZBw!b66!}dQh0>|e9w*3^?tu@^4uDLzT|Jloysvy5(W)D^}cFo(c zb(`&uIt$sJ+@)?On46oUW||7eR$DILnd@+S?vljLxFoSPE=lZ-=Ob(?xAzt74t@0m z<*O&CQ9VJOmDy4uH`qLQa+kqQHIgQpH4DEqeogo_n<$O*G|tmFPvg7^=S?_o!g*7( z$raaOaNL?)Hqg_vCOcI0?m0 z_eam^%U70%YZ`S1L&N(56tbJEi~6FjF1$g(I|sal80kIN|MPcQc9d5AD|_K?v)j%{ zHP7ooCBs$`MX2Or+A8Vz_Brhq*EnMqK5#t^*>u}D_K#5CyMHY6C3Jeub6auV_vZD# z7Oh*fqxYp>uDWDK86F4W)hP`xZ#nRr%kSv?;%&<(Z=27VvadYs3ZzrGEd0#7~2^yBr7kG)a4d*09IZn9;% z-ul*K%-?%>I?A}snJMO^N1u7*{(0}*u+^5?KJj^5=BqQ#U>UnXbJO}KA7#BiHn9Jk z!=2AnuW!q7zBZ57K}+p3*SOg;2WJkN*#9cyg|pmv{0_nIX sounds = new(); From 9b2aaf031492bcadea6cca52ea413e9a53bef808 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 23:02:40 +1000 Subject: [PATCH 7/7] revert pascal skybox --- Assets/Audio/Noise/05.meta | 8 + Assets/Audio/Noise/05/1.wav | 3 + Assets/Audio/Noise/05/1.wav.meta | 23 +++ Assets/Audio/Noise/05/10.wav | 3 + Assets/Audio/Noise/05/10.wav.meta | 23 +++ Assets/Audio/Noise/05/11.wav | 3 + Assets/Audio/Noise/05/11.wav.meta | 23 +++ Assets/Audio/Noise/05/12.wav | 3 + Assets/Audio/Noise/05/12.wav.meta | 23 +++ Assets/Audio/Noise/05/13.wav | 3 + Assets/Audio/Noise/05/13.wav.meta | 23 +++ Assets/Audio/Noise/05/14.wav | 3 + Assets/Audio/Noise/05/14.wav.meta | 23 +++ Assets/Audio/Noise/05/15.wav | 3 + Assets/Audio/Noise/05/15.wav.meta | 23 +++ Assets/Audio/Noise/05/2.wav | 3 + Assets/Audio/Noise/05/2.wav.meta | 23 +++ Assets/Audio/Noise/05/3.wav | 3 + Assets/Audio/Noise/05/3.wav.meta | 23 +++ Assets/Audio/Noise/05/4.wav | 3 + Assets/Audio/Noise/05/4.wav.meta | 23 +++ Assets/Audio/Noise/05/5.wav | 3 + Assets/Audio/Noise/05/5.wav.meta | 23 +++ Assets/Audio/Noise/05/6.wav | 3 + Assets/Audio/Noise/05/6.wav.meta | 23 +++ Assets/Audio/Noise/05/7.wav | 3 + Assets/Audio/Noise/05/7.wav.meta | 23 +++ Assets/Audio/Noise/05/8.wav | 3 + Assets/Audio/Noise/05/8.wav.meta | 23 +++ Assets/Audio/Noise/05/9.wav | 3 + Assets/Audio/Noise/05/9.wav.meta | 23 +++ Assets/Images/SkyboxMaybs.meta | 8 + Assets/Scenes/msg_blackstar.unity | 15 ++ Assets/Scenes/sr_alpha_centaurus.unity | 68 --------- Assets/Scenes/sr_pascal/00002.png | 3 + Assets/Scenes/sr_pascal/00002.png.meta | 140 ++++++++++++++++++ .../sr_pascal/00005-1222362291.png.meta | 2 +- Assets/Scenes/sr_pascal/00027-3424972246.png | 3 + .../sr_pascal/00027-3424972246.png.meta | 140 ++++++++++++++++++ Assets/Scenes/sr_pascal/00029-2774447150.png | 3 + .../sr_pascal/00029-2774447150.png.meta | 140 ++++++++++++++++++ Assets/Scenes/sr_pascal/PascalSkybox.mat | 20 +-- Assets/Scenes/sr_pascal/starfield.png | 3 + Assets/Scenes/sr_pascal/starfield.png.meta | 140 ++++++++++++++++++ Assets/Scenes/sr_sfz.unity | 33 ++++- ProjectSettings/ProjectSettings.asset | 3 +- ProjectSettings/ShaderGraphSettings.asset | 0 README.md | 4 +- 48 files changed, 1038 insertions(+), 85 deletions(-) create mode 100755 Assets/Audio/Noise/05.meta create mode 100755 Assets/Audio/Noise/05/1.wav create mode 100755 Assets/Audio/Noise/05/1.wav.meta create mode 100755 Assets/Audio/Noise/05/10.wav create mode 100755 Assets/Audio/Noise/05/10.wav.meta create mode 100755 Assets/Audio/Noise/05/11.wav create mode 100755 Assets/Audio/Noise/05/11.wav.meta create mode 100755 Assets/Audio/Noise/05/12.wav create mode 100755 Assets/Audio/Noise/05/12.wav.meta create mode 100755 Assets/Audio/Noise/05/13.wav create mode 100755 Assets/Audio/Noise/05/13.wav.meta create mode 100755 Assets/Audio/Noise/05/14.wav create mode 100755 Assets/Audio/Noise/05/14.wav.meta create mode 100755 Assets/Audio/Noise/05/15.wav create mode 100755 Assets/Audio/Noise/05/15.wav.meta create mode 100755 Assets/Audio/Noise/05/2.wav create mode 100755 Assets/Audio/Noise/05/2.wav.meta create mode 100755 Assets/Audio/Noise/05/3.wav create mode 100755 Assets/Audio/Noise/05/3.wav.meta create mode 100755 Assets/Audio/Noise/05/4.wav create mode 100755 Assets/Audio/Noise/05/4.wav.meta create mode 100755 Assets/Audio/Noise/05/5.wav create mode 100755 Assets/Audio/Noise/05/5.wav.meta create mode 100755 Assets/Audio/Noise/05/6.wav create mode 100755 Assets/Audio/Noise/05/6.wav.meta create mode 100755 Assets/Audio/Noise/05/7.wav create mode 100755 Assets/Audio/Noise/05/7.wav.meta create mode 100755 Assets/Audio/Noise/05/8.wav create mode 100755 Assets/Audio/Noise/05/8.wav.meta create mode 100755 Assets/Audio/Noise/05/9.wav create mode 100755 Assets/Audio/Noise/05/9.wav.meta create mode 100755 Assets/Images/SkyboxMaybs.meta create mode 100755 Assets/Scenes/sr_pascal/00002.png create mode 100755 Assets/Scenes/sr_pascal/00002.png.meta create mode 100755 Assets/Scenes/sr_pascal/00027-3424972246.png create mode 100755 Assets/Scenes/sr_pascal/00027-3424972246.png.meta create mode 100755 Assets/Scenes/sr_pascal/00029-2774447150.png create mode 100755 Assets/Scenes/sr_pascal/00029-2774447150.png.meta create mode 100755 Assets/Scenes/sr_pascal/starfield.png create mode 100755 Assets/Scenes/sr_pascal/starfield.png.meta mode change 100644 => 100755 Assets/Scenes/sr_sfz.unity mode change 100644 => 100755 ProjectSettings/ShaderGraphSettings.asset diff --git a/Assets/Audio/Noise/05.meta b/Assets/Audio/Noise/05.meta new file mode 100755 index 0000000..55ef93d --- /dev/null +++ b/Assets/Audio/Noise/05.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41c23678e8c4a7843b3bbcdc4dbd3cb2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/1.wav b/Assets/Audio/Noise/05/1.wav new file mode 100755 index 0000000..014465a --- /dev/null +++ b/Assets/Audio/Noise/05/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:361fed95f9e805f19a3cb4d94dd7c2a876e33ad0dd8d085a759ef42dc44aca04 +size 705644 diff --git a/Assets/Audio/Noise/05/1.wav.meta b/Assets/Audio/Noise/05/1.wav.meta new file mode 100755 index 0000000..392cf10 --- /dev/null +++ b/Assets/Audio/Noise/05/1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c5c204fa435b8f24785aaf8381342450 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/10.wav b/Assets/Audio/Noise/05/10.wav new file mode 100755 index 0000000..cba5d97 --- /dev/null +++ b/Assets/Audio/Noise/05/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0521213b4376fc690acfbf53824d5cbc6a4843aee834eb976c2ba379c642cf94 +size 705644 diff --git a/Assets/Audio/Noise/05/10.wav.meta b/Assets/Audio/Noise/05/10.wav.meta new file mode 100755 index 0000000..c0faf62 --- /dev/null +++ b/Assets/Audio/Noise/05/10.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: effc18a40fbef8a4fa9ef8c7a1166168 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/11.wav b/Assets/Audio/Noise/05/11.wav new file mode 100755 index 0000000..33334df --- /dev/null +++ b/Assets/Audio/Noise/05/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b721a1c62697ea8e154c21c22d44600066409bdb9d6e1a64fc21a857a31154bc +size 705644 diff --git a/Assets/Audio/Noise/05/11.wav.meta b/Assets/Audio/Noise/05/11.wav.meta new file mode 100755 index 0000000..a6d838b --- /dev/null +++ b/Assets/Audio/Noise/05/11.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 67fbb552552e0454085fdeec4d4a2cd4 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/12.wav b/Assets/Audio/Noise/05/12.wav new file mode 100755 index 0000000..bd00830 --- /dev/null +++ b/Assets/Audio/Noise/05/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:033f21c535b956c8e424a45c62a15b013ac509c81dea36e929452bf2fbb207bb +size 705644 diff --git a/Assets/Audio/Noise/05/12.wav.meta b/Assets/Audio/Noise/05/12.wav.meta new file mode 100755 index 0000000..1e400ed --- /dev/null +++ b/Assets/Audio/Noise/05/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: de5cbeb5e85383b4a9f641a7e8be3c9b +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/13.wav b/Assets/Audio/Noise/05/13.wav new file mode 100755 index 0000000..cf73721 --- /dev/null +++ b/Assets/Audio/Noise/05/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6395e3754dbed23e7afa994da955954377f627b73ec6fe27821937abb99e66d5 +size 705644 diff --git a/Assets/Audio/Noise/05/13.wav.meta b/Assets/Audio/Noise/05/13.wav.meta new file mode 100755 index 0000000..c81ecef --- /dev/null +++ b/Assets/Audio/Noise/05/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 981e981ebc8069047a4b6e9354290471 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/14.wav b/Assets/Audio/Noise/05/14.wav new file mode 100755 index 0000000..4298c8c --- /dev/null +++ b/Assets/Audio/Noise/05/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78da445d44d5ff4aa469464264d5613bbcf83452ec8719299e1893587176411b +size 705644 diff --git a/Assets/Audio/Noise/05/14.wav.meta b/Assets/Audio/Noise/05/14.wav.meta new file mode 100755 index 0000000..76f968b --- /dev/null +++ b/Assets/Audio/Noise/05/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f3729065675e7db4a8b2c1d25f0c81ac +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/15.wav b/Assets/Audio/Noise/05/15.wav new file mode 100755 index 0000000..d52678e --- /dev/null +++ b/Assets/Audio/Noise/05/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5abdd7eab3f8fa309082c6dc621c8c63ac188c6649ac47283f35b86fdbb2bb3 +size 705644 diff --git a/Assets/Audio/Noise/05/15.wav.meta b/Assets/Audio/Noise/05/15.wav.meta new file mode 100755 index 0000000..d9717f0 --- /dev/null +++ b/Assets/Audio/Noise/05/15.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d47cee6f30b1d814096e14cf35280cdb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/2.wav b/Assets/Audio/Noise/05/2.wav new file mode 100755 index 0000000..e517a93 --- /dev/null +++ b/Assets/Audio/Noise/05/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45383e4b8e99701affb5bc296a6a29ae2552db808863be3fda08cf4f5e497aaa +size 705644 diff --git a/Assets/Audio/Noise/05/2.wav.meta b/Assets/Audio/Noise/05/2.wav.meta new file mode 100755 index 0000000..8549e74 --- /dev/null +++ b/Assets/Audio/Noise/05/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1c2de37ea52d9b8429283f2d1dfa40ea +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/3.wav b/Assets/Audio/Noise/05/3.wav new file mode 100755 index 0000000..50ecd07 --- /dev/null +++ b/Assets/Audio/Noise/05/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9642a448c025bd5f0a1a7d37326e55a1113269eb538e571660d42782687b2cb3 +size 705644 diff --git a/Assets/Audio/Noise/05/3.wav.meta b/Assets/Audio/Noise/05/3.wav.meta new file mode 100755 index 0000000..019e8a9 --- /dev/null +++ b/Assets/Audio/Noise/05/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8a0a7b5b0750b314cbf6c22076875094 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/4.wav b/Assets/Audio/Noise/05/4.wav new file mode 100755 index 0000000..0a76d6b --- /dev/null +++ b/Assets/Audio/Noise/05/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9849b2d8fc4b8922a28b31e8d6a9bc3a8028d1e86f6f88795781082a6fc8c2 +size 705644 diff --git a/Assets/Audio/Noise/05/4.wav.meta b/Assets/Audio/Noise/05/4.wav.meta new file mode 100755 index 0000000..06943b2 --- /dev/null +++ b/Assets/Audio/Noise/05/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 8c59dc7ddac13af4eacd5d8c454d12a5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/5.wav b/Assets/Audio/Noise/05/5.wav new file mode 100755 index 0000000..8f4c611 --- /dev/null +++ b/Assets/Audio/Noise/05/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b082497c51729eb080e75ba35d9d368ddfd6679b4c7930c3993bf82d63a90b +size 705644 diff --git a/Assets/Audio/Noise/05/5.wav.meta b/Assets/Audio/Noise/05/5.wav.meta new file mode 100755 index 0000000..1fb4402 --- /dev/null +++ b/Assets/Audio/Noise/05/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: da9db64262260fc48b8533d8ad3a206f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/6.wav b/Assets/Audio/Noise/05/6.wav new file mode 100755 index 0000000..397365a --- /dev/null +++ b/Assets/Audio/Noise/05/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c31cd5af3545a8b25b369b61885553af67b4471e3d0398553fc8e9aea7a809a8 +size 705644 diff --git a/Assets/Audio/Noise/05/6.wav.meta b/Assets/Audio/Noise/05/6.wav.meta new file mode 100755 index 0000000..4ec7181 --- /dev/null +++ b/Assets/Audio/Noise/05/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6779abee2ba83974886c5e117d212f39 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/7.wav b/Assets/Audio/Noise/05/7.wav new file mode 100755 index 0000000..14db246 --- /dev/null +++ b/Assets/Audio/Noise/05/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d80f98c764cb4d7875bdc40f505217c128b9bc4b9479816532cf6c064864e1f +size 705644 diff --git a/Assets/Audio/Noise/05/7.wav.meta b/Assets/Audio/Noise/05/7.wav.meta new file mode 100755 index 0000000..f269981 --- /dev/null +++ b/Assets/Audio/Noise/05/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e62cbd6fa8c94a449af483238a82fdfd +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/8.wav b/Assets/Audio/Noise/05/8.wav new file mode 100755 index 0000000..db4bcd0 --- /dev/null +++ b/Assets/Audio/Noise/05/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:023817a5be34fd457592753cdf2ddde548a09486c11c28b42befb8b2fa35e844 +size 705644 diff --git a/Assets/Audio/Noise/05/8.wav.meta b/Assets/Audio/Noise/05/8.wav.meta new file mode 100755 index 0000000..013dd36 --- /dev/null +++ b/Assets/Audio/Noise/05/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 68d1e29bc4a1ad1488025879c07d89ce +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/05/9.wav b/Assets/Audio/Noise/05/9.wav new file mode 100755 index 0000000..89cb36b --- /dev/null +++ b/Assets/Audio/Noise/05/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23ed244a0f68b554a457f462fc449908d9ada6ac394e03d91cede2daaecc96bf +size 705644 diff --git a/Assets/Audio/Noise/05/9.wav.meta b/Assets/Audio/Noise/05/9.wav.meta new file mode 100755 index 0000000..bd6200d --- /dev/null +++ b/Assets/Audio/Noise/05/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 30b936afced40104d90c5f9b36c83d74 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/SkyboxMaybs.meta b/Assets/Images/SkyboxMaybs.meta new file mode 100755 index 0000000..dfd810c --- /dev/null +++ b/Assets/Images/SkyboxMaybs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbdb03baee1182144934e9e442c67c52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/msg_blackstar.unity b/Assets/Scenes/msg_blackstar.unity index 2ba1220..9cf40a8 100755 --- a/Assets/Scenes/msg_blackstar.unity +++ b/Assets/Scenes/msg_blackstar.unity @@ -299,6 +299,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 602427663} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -640,6 +644,17 @@ MonoBehaviour: m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: +--- !u!114 &602427663 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 602427658} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_alpha_centaurus.unity b/Assets/Scenes/sr_alpha_centaurus.unity index ad5e152..b47a6b7 100755 --- a/Assets/Scenes/sr_alpha_centaurus.unity +++ b/Assets/Scenes/sr_alpha_centaurus.unity @@ -1383,74 +1383,6 @@ PrefabInstance: propertyPath: timing value: objectReference: {fileID: 1088368772} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.size - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[0] - value: - objectReference: {fileID: 8300000, guid: b03343745eb6b5d4a86663369bd72c28, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[1] - value: - objectReference: {fileID: 8300000, guid: 5dd8f95d772c7394580e7d7a09739737, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[2] - value: - objectReference: {fileID: 8300000, guid: 91728f1b5f0dae440ad5f4230d889a81, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[3] - value: - objectReference: {fileID: 8300000, guid: 3323931b12f255344b832f7eb71a111a, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[4] - value: - objectReference: {fileID: 8300000, guid: 2aa01028ecf4743429856bc2e07af835, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[5] - value: - objectReference: {fileID: 8300000, guid: 9fff106a08efbdd46a7640bd2ed53227, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[6] - value: - objectReference: {fileID: 8300000, guid: dab9499ab887d1346b03da58f1d820ff, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[7] - value: - objectReference: {fileID: 8300000, guid: 145a90462178f5149b19bebf66c110c0, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[8] - value: - objectReference: {fileID: 8300000, guid: 700fa2fbd5f5c474d815e2e638747699, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[9] - value: - objectReference: {fileID: 8300000, guid: fb5739451e9e4574499f1a60f5354d98, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[10] - value: - objectReference: {fileID: 8300000, guid: 27e54ed3aafb80946af0789c1b57ca57, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[11] - value: - objectReference: {fileID: 8300000, guid: 99db5b15b74a4ac439ce3123b2cb00c1, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[12] - value: - objectReference: {fileID: 8300000, guid: 4a44973e6e426834d8e1347edee67857, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[13] - value: - objectReference: {fileID: 8300000, guid: b17e2b600e58b804fb4344edfd7b4199, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[14] - value: - objectReference: {fileID: 8300000, guid: e401bbcc9c4aaf249a5205bd77d42702, type: 3} - - target: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - propertyPath: noiseClips.Array.data[15] - value: - objectReference: {fileID: 8300000, guid: 71d125ff384d86a4fb44b6942b74306d, type: 3} - target: {fileID: 3589635702276405719, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} propertyPath: m_RootOrder value: 4 diff --git a/Assets/Scenes/sr_pascal/00002.png b/Assets/Scenes/sr_pascal/00002.png new file mode 100755 index 0000000..8acd495 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00002.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7bfd27278698e2b88329bb1435f47f7716b0c12d29663a19a230d65fb6d00a4 +size 1539325 diff --git a/Assets/Scenes/sr_pascal/00002.png.meta b/Assets/Scenes/sr_pascal/00002.png.meta new file mode 100755 index 0000000..5bab884 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00002.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: f2eef6323e5cccc46b3f008c76aac74a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 2 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_pascal/00005-1222362291.png.meta b/Assets/Scenes/sr_pascal/00005-1222362291.png.meta index 7ddbe07..375ec6b 100755 --- a/Assets/Scenes/sr_pascal/00005-1222362291.png.meta +++ b/Assets/Scenes/sr_pascal/00005-1222362291.png.meta @@ -55,7 +55,7 @@ TextureImporter: alphaIsTransparency: 0 spriteTessellationDetail: -1 textureType: 0 - textureShape: 2 + textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 flipbookColumns: 1 diff --git a/Assets/Scenes/sr_pascal/00027-3424972246.png b/Assets/Scenes/sr_pascal/00027-3424972246.png new file mode 100755 index 0000000..3964a03 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00027-3424972246.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58b0b69cee8fc6782fc14d3483ad30154556b62c4486d5da4c74b29fc1d85b20 +size 865821 diff --git a/Assets/Scenes/sr_pascal/00027-3424972246.png.meta b/Assets/Scenes/sr_pascal/00027-3424972246.png.meta new file mode 100755 index 0000000..d9f0004 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00027-3424972246.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a7d59426c1c6d5a43b7ba5689c6a419e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 2 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_pascal/00029-2774447150.png b/Assets/Scenes/sr_pascal/00029-2774447150.png new file mode 100755 index 0000000..de577cc --- /dev/null +++ b/Assets/Scenes/sr_pascal/00029-2774447150.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfd943140debac6679b3e68e65c5ad4781e7cb9b92aa04791c0855a6d51a21dd +size 918990 diff --git a/Assets/Scenes/sr_pascal/00029-2774447150.png.meta b/Assets/Scenes/sr_pascal/00029-2774447150.png.meta new file mode 100755 index 0000000..84b9987 --- /dev/null +++ b/Assets/Scenes/sr_pascal/00029-2774447150.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 5eed947eab96f49479f5c9e581582ad2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_pascal/PascalSkybox.mat b/Assets/Scenes/sr_pascal/PascalSkybox.mat index a1adb87..e54b98f 100755 --- a/Assets/Scenes/sr_pascal/PascalSkybox.mat +++ b/Assets/Scenes/sr_pascal/PascalSkybox.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PascalSkybox - m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 104, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -27,7 +27,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BackTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: eb577305f10f4ba499fab47ea558b341, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DownTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: e8bdb97cc4dee8a4f997956b457cb748, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -59,11 +59,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _FrontTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: eb577305f10f4ba499fab47ea558b341, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _LeftTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: e8bdb97cc4dee8a4f997956b457cb748, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -83,7 +83,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _RightTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: eb577305f10f4ba499fab47ea558b341, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: @@ -95,7 +95,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _UpTex: - m_Texture: {fileID: 2800000, guid: 88937e901d4e026478f4d9ab47e0e31f, type: 3} + m_Texture: {fileID: 2800000, guid: e8bdb97cc4dee8a4f997956b457cb748, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -127,7 +127,7 @@ Material: - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _Exposure: 0.25 + - _Exposure: 0.58 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -140,7 +140,7 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Rotation: 0 + - _Rotation: 105 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -159,7 +159,7 @@ Material: - _GroundColor: {r: 0, g: 0, b: 0, a: 1} - _SkyTint: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - - _Tint: {r: 0.8396226, g: 0.61387503, b: 0.61387503, a: 0.5} + - _Tint: {r: 1, g: 1, b: 1, a: 0.5} m_BuildTextureStacks: [] --- !u!114 &4666861626727394084 MonoBehaviour: diff --git a/Assets/Scenes/sr_pascal/starfield.png b/Assets/Scenes/sr_pascal/starfield.png new file mode 100755 index 0000000..3f5aaee --- /dev/null +++ b/Assets/Scenes/sr_pascal/starfield.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4b7637137732bf4fa222e272dc3fce4cd3e8e127dd9695d3d787afcc90a3d93 +size 189106 diff --git a/Assets/Scenes/sr_pascal/starfield.png.meta b/Assets/Scenes/sr_pascal/starfield.png.meta new file mode 100755 index 0000000..eb0ab3a --- /dev/null +++ b/Assets/Scenes/sr_pascal/starfield.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: eb577305f10f4ba499fab47ea558b341 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/sr_sfz.unity b/Assets/Scenes/sr_sfz.unity old mode 100644 new mode 100755 index dd57564..d7b6fea --- a/Assets/Scenes/sr_sfz.unity +++ b/Assets/Scenes/sr_sfz.unity @@ -164,13 +164,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52048083} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 977.23474, y: -165.7302, z: -2086.4595} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &235775465 PrefabInstance: @@ -304,6 +304,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &235775467 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 235775465} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &339815783 PrefabInstance: m_ObjectHideFlags: 0 @@ -614,13 +625,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 m_LocalRotation: {x: -0.27417248, y: -0.3337574, z: 0.3633117, w: 0.8254938} m_LocalPosition: {x: -365.9992, y: -2002.0156, z: -426.01685} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1906469785} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: -167.869, y: 129.88, z: -126.800995} --- !u!114 &705507997 MonoBehaviour: @@ -855,6 +866,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 965851723} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.9914445, z: -0, w: 0.13052872} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} @@ -862,7 +874,6 @@ Transform: m_Children: - {fileID: 425847538} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -165, z: 0} --- !u!114 &1088368772 stripped MonoBehaviour: @@ -1027,6 +1038,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1906469784} + serializedVersion: 2 m_LocalRotation: {x: 0.71074754, y: 0.5701635, z: -0.3333826, w: 0.24209014} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1034,7 +1046,6 @@ Transform: m_Children: - {fileID: 705507995} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &656092325660581143 PrefabInstance: @@ -1048,6 +1059,10 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 235775467} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1239,3 +1254,13 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 87a51212e10250274a8feda6be865b7c, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 52048085} + - {fileID: 1906469785} + - {fileID: 965851724} + - {fileID: 656092325660581143} + - {fileID: 235775465} + - {fileID: 766862834} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ac57a9d..e233607 100755 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,7 +138,8 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset old mode 100644 new mode 100755 diff --git a/README.md b/README.md index c1739c5..050458a 100644 --- a/README.md +++ b/README.md @@ -7,12 +7,14 @@ in the far future, technology depends on the solving of efficient paths through ## About -SpaceRace is a futuristic 3d racing game where players compete to set the best time on visually striking tracks. +SpaceRace is a futuristic 3D Zero-G racing game where players compete to set the best time on visually striking tracks. Focus on finding the perfect line as you accelerate through tunnels on the edge of a nebula or drift smoothly through the curves of a storage facility. Inspired by precision movement games such as Surf, SpaceRace features a global leaderboard of lap times around both famous racetracks reimagined and novel circuits. +With a minimalist soundtrack of clicks, pops and the gentle rumble of your Power Unit, SpaceRace offers relaxing gameplay for both short bursts and focused practicing. + ## tags race, space, spacerace, ship, 3d, racing,