diff --git a/Assets/Audio/Audio Visualiser.asset b/Assets/Audio/Audio Visualiser.asset index b688704..a29769d 100644 --- a/Assets/Audio/Audio Visualiser.asset +++ b/Assets/Audio/Audio Visualiser.asset @@ -16,7 +16,7 @@ MonoBehaviour: _distanceSinceLastBeat: {fileID: 11400000, guid: 8d22f3ed946820445adcc586d2cc6e5a, type: 2} _fractalAnimations: - name: _Fractality - multiplier: 100 + multiplier: 1000 channel: 0 sample: 525 _tunnelAnimations: @@ -32,6 +32,10 @@ MonoBehaviour: multiplier: -500 channel: 1 sample: 525 + - name: _SkyWeight + multiplier: -500 + channel: 1 + sample: 400 _shipAnimations: - name: _VertexScale multiplier: 3703.2 diff --git a/Assets/Materials/Bullet.mat b/Assets/Materials/Bullet.mat index a4d445b..8b07143 100644 --- a/Assets/Materials/Bullet.mat +++ b/Assets/Materials/Bullet.mat @@ -20,15 +20,14 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: __TempUnlitPlayerBullet - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Name: Bullet + m_Shader: {fileID: 4800000, guid: 3fbfd755d973879408e445fecb08c7ae, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -65,6 +64,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _NoiseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -90,9 +93,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _Alpha: 1 - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 + - _C: 0 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -104,9 +109,11 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 + - _M: 0.5 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _PulseIntensity: 1 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 @@ -115,11 +122,15 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _TrackWidth: 20 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FarColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/Enemy.mat b/Assets/Materials/Enemy.mat index 69d9ba7..b2ac44a 100644 --- a/Assets/Materials/Enemy.mat +++ b/Assets/Materials/Enemy.mat @@ -108,15 +108,17 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _TrackWidth: 20 - _VertexDistortion: 0.1 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _Color1: {r: 0.7735849, g: 0.23718406, b: 0.58527553, a: 1} - - _Color2: {r: 0.9622642, g: 0.031772893, b: 0.041073136, a: 1} + - _Color1: {r: 0, g: 0.7880776, b: 1, a: 1} + - _Color2: {r: 0, g: 0.9716981, b: 0.014814194, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FarColor: {r: 0.8784709, g: 0, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] --- !u!114 &1271807303275379478 diff --git a/Assets/Materials/Tunnel_Party.mat b/Assets/Materials/Tunnel_Party.mat index 838cfde..b709647 100644 --- a/Assets/Materials/Tunnel_Party.mat +++ b/Assets/Materials/Tunnel_Party.mat @@ -102,7 +102,7 @@ Material: m_Offset: {x: 0, y: 0} m_Floats: - _AlphaClip: 0 - - _BarsWeight: 1 + - _BarsWeight: 2.04 - _Blend: 0 - _BumpScale: 1 - _ClearCoatMask: 0 @@ -120,17 +120,17 @@ Material: - _FractalPower: 1 - _FractalRotateSpeed: 20 - _FractalScale: 6 - - _FractalWeight: 0.29 + - _FractalWeight: 0.88 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - _GroundMaskAngle: 2.61 - - _GroundWeight: 1 + - _GroundWeight: 0.79 - _Intensity: 1 - _Metallic: 0 - _Nebula1Power: 3.06 - _Nebula2Power: 3.46 - - _NebulaWeight: 0.25 + - _NebulaWeight: 1 - _OcclusionStrength: 1 - _OuterCircleRadius: 0.5 - _OuterCircleThickness: 0.1 @@ -139,25 +139,26 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _ShakeStrength: 0 + - _SkyWeight: 1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _StarsWeight: 0.1 + - _StarsWeight: 0.5 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BackgroundColor: {r: 0, g: 0, b: 0, a: 1} + - _BackgroundColor: {r: 0.14150941, g: 0, b: 0, a: 1} - _BarsColor: {r: 0.007843138, g: 0.45490196, b: 0.7490196, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _CircleColor: {r: 0, g: 0, b: 0, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _CoreColor: {r: 0.70987976, g: 1.0648196, b: 2.1185474, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FractalColor: {r: 4.18079, g: 0, b: 0.6094301, a: 1} - - _GroundColor: {r: 0.45868373, g: 3.3127158, b: 0, a: 1} - - _NebulaColor1: {r: 0, g: 0.67775345, b: 1, a: 1} - - _NebulaColor2: {r: 0.54217625, g: 0.25, b: 1, a: 1} + - _FractalColor: {r: 0.7490196, g: 0, b: 0.10980392, a: 1} + - _GroundColor: {r: 0.8553404, g: 1.5620759, b: 4.422736, a: 1} + - _NebulaColor1: {r: 0, g: 0.16862746, b: 0.2509804, a: 1} + - _NebulaColor2: {r: 0.13529412, g: 0.0627451, b: 0.2509804, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/Chief's Sandbox.unity b/Assets/Scenes/Chief's Sandbox.unity index 1c4f995..f48f960 100644 --- a/Assets/Scenes/Chief's Sandbox.unity +++ b/Assets/Scenes/Chief's Sandbox.unity @@ -506,7 +506,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3397488660842926093, guid: 1f82f952c53fc7449a0091cf29ba3def, type: 3} propertyPath: m_LocalScale.x - value: 1767.2549 + value: 1759.5208 objectReference: {fileID: 0} - target: {fileID: 3397488660842926093, guid: 1f82f952c53fc7449a0091cf29ba3def, type: 3} propertyPath: m_LocalScale.y @@ -576,6 +576,10 @@ PrefabInstance: propertyPath: _playerXPos value: objectReference: {fileID: 11400000, guid: 25280515e18c66c44827faf0cb01ca42, type: 2} + - target: {fileID: 5076175860835241000, guid: 1f82f952c53fc7449a0091cf29ba3def, type: 3} + propertyPath: _playerXMove + value: + objectReference: {fileID: 11400000, guid: 7371e84b7c82f4631a96ac1c00b55fa0, type: 2} - target: {fileID: 5076175860835241000, guid: 1f82f952c53fc7449a0091cf29ba3def, type: 3} propertyPath: _anim.m_Curve.Array.size value: 3