diff --git a/Assets/Resources/Prefabs/Common/Overlays/TimingAccuracy.prefab b/Assets/Resources/Prefabs/Common/Overlays/TimingAccuracy.prefab index a94a2703c..0f5b63ef8 100644 --- a/Assets/Resources/Prefabs/Common/Overlays/TimingAccuracy.prefab +++ b/Assets/Resources/Prefabs/Common/Overlays/TimingAccuracy.prefab @@ -5459,21 +5459,21 @@ ParticleSystem: serializedVersion: 2 minMaxState: 4 minColor: {r: 1, g: 0, b: 1, a: 1} - maxColor: {r: 0, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: serializedVersion: 2 - key0: {r: 0.13950695, g: 0.8962264, b: 0.8962264, a: 1} - key1: {r: 1, g: 0.60455173, b: 0.2028302, a: 1} + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 0, g: 0, b: 0, a: 1} key2: {r: 0.8773585, g: 0.15312389, b: 0.8176278, a: 0} - key3: {r: 1, g: 1, b: 0.1273585, a: 0} + key3: {r: 0.14117648, g: 0.8980393, b: 0.8980393, a: 0} key4: {r: 0.5445165, g: 1, b: 0.514151, a: 0} key5: {r: 0.5793154, g: 0.9622642, b: 0.32226774, a: 0} key6: {r: 0.5793154, g: 0.9622642, b: 0.32226774, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 14173 - ctime1: 21975 - ctime2: 39529 - ctime3: 55653 + ctime0: 0 + ctime1: 65535 + ctime2: 65535 + ctime3: 65535 ctime4: 62414 ctime5: 65535 ctime6: 65535 @@ -5486,8 +5486,8 @@ ParticleSystem: atime5: 0 atime6: 0 atime7: 0 - m_Mode: 1 - m_NumColorKeys: 5 + m_Mode: 0 + m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: serializedVersion: 2 @@ -6603,22 +6603,22 @@ ParticleSystem: enabled: 1 gradient: serializedVersion: 2 - minMaxState: 3 + minMaxState: 1 minColor: {r: 1, g: 1, b: 1, a: 1} maxColor: {r: 1, g: 1, b: 1, a: 1} maxGradient: serializedVersion: 2 key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 0, a: 1} - key2: {r: 0.8235295, g: 0.0627451, b: 0.7607844, a: 0} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 1, g: 1, b: 1, a: 0} key3: {r: 1, g: 1, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 - ctime1: 51492 - ctime2: 59294 + ctime1: 65535 + ctime2: 65535 ctime3: 55003 ctime4: 0 ctime5: 0 @@ -6637,8 +6637,8 @@ ParticleSystem: m_NumAlphaKeys: 3 minGradient: serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 0, g: 1, b: 1, a: 1} + key0: {r: 0, g: 0, b: 0, a: 1} + key1: {r: 0, g: 0, b: 0, a: 1} key2: {r: 0.8235295, g: 0.0627451, b: 0.7607844, a: 0} key3: {r: 0.5803922, g: 0.9607844, b: 0.32156864, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -9488,27 +9488,27 @@ ParticleSystem: m_NumAlphaKeys: 2 CustomDataModule: enabled: 0 - mode0: 0 + mode0: 2 vectorComponentCount0: 4 color0: serializedVersion: 2 - minMaxState: 0 + minMaxState: 1 minColor: {r: 1, g: 1, b: 1, a: 1} - maxColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 0, b: 0, a: 1} maxGradient: serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 1, g: 0.99215686, b: 0, a: 1} + key1: {r: 1, g: 0, b: 0, a: 1} + key2: {r: 1, g: 0, b: 0, a: 0} + key3: {r: 1, g: 0.43137255, b: 0.0627451, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 + ctime1: 16384 + ctime2: 32768 + ctime3: 49151 ctime4: 0 ctime5: 0 ctime6: 0 @@ -9522,7 +9522,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 - m_NumColorKeys: 2 + m_NumColorKeys: 4 m_NumAlphaKeys: 2 minGradient: serializedVersion: 2 @@ -9770,7 +9770,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel0_3: W - mode1: 0 + mode1: 1 vectorComponentCount1: 4 color1: serializedVersion: 2 @@ -10073,7 +10073,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 935bc5878e4377e4d92e11173bb5102f, type: 2} + - {fileID: 2100000, guid: 5558d895164867f439186d62dec658fa, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -19916,7 +19916,7 @@ ParticleSystemRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 935bc5878e4377e4d92e11173bb5102f, type: 2} + - {fileID: 2100000, guid: 5558d895164867f439186d62dec658fa, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader new file mode 100644 index 000000000..72fd6e666 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader @@ -0,0 +1,99 @@ +Shader "Sprites/AceStarCycle" +{ + Properties + { + [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} + _GradientMap ("Color Map", 2D) = "white" {} + _Color ("Tint", Color) = (1,1,1,1) + _Speed ("Color Rotate Speed", Float) = 1 + [MaterialToggle] PixelSnap ("Pixel snap", Float) = 0 + } + + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas"="True" + } + + Cull Off + Lighting Off + ZWrite Off + Blend One OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile _ PIXELSNAP_ON + #include "UnityCG.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + fixed4 _Color; + + v2f vert(appdata_t IN) + { + v2f OUT; + OUT.vertex = UnityObjectToClipPos(IN.vertex); + OUT.texcoord = IN.texcoord; + OUT.color = IN.color * _Color; + #ifdef PIXELSNAP_ON + OUT.vertex = UnityPixelSnap (OUT.vertex); + #endif + + return OUT; + } + + sampler2D _MainTex; + sampler2D _AlphaTex; + sampler2D _GradientMap; + float _Speed; + float _AlphaSplitEnabled; + + fixed4 SampleSpriteTexture (float2 uv) + { + fixed4 color = tex2D (_MainTex, uv); + + #if UNITY_TEXTURE_ALPHASPLIT_ALLOWED + if (_AlphaSplitEnabled) + color.a = tex2D (_AlphaTex, uv).r; + #endif //UNITY_TEXTURE_ALPHASPLIT_ALLOWED + + return color; + } + + fixed4 frag(v2f IN) : SV_Target + { + fixed4 c = SampleSpriteTexture (IN.texcoord); + + float grayscale = (IN.color.r + IN.color.g + IN.color.b) / 3; + float grayscaleScrolled = (grayscale + ((_Speed / 4) * _Time.y)) % 1; + fixed4 g = tex2D (_GradientMap, grayscaleScrolled); + + c = fixed4(g.r, g.g, g.b, c.a); + c.rgb *= c.a * IN.color.a; + c.a *= IN.color.a; + return c; + } + ENDCG + } + } +} diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader.meta new file mode 100644 index 000000000..92ad5bcda --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceColorCycle.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49c9ed0b23138ae43854107346543307 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat new file mode 100644 index 000000000..9157ec8eb --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AceStarParticle + m_Shader: {fileID: 4800000, guid: 49c9ed0b23138ae43854107346543307, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BackTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DownTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _FrontTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GradientMap: + m_Texture: {fileID: 2800000, guid: 4aa512ca12c0f0645830e3a8aa1745fc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LeftTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + 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} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _RightTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UpTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 10 + - _Speed1: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat.meta new file mode 100644 index 000000000..41d88078a --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/AceStarParticle.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5558d895164867f439186d62dec658fa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/StarParticle.mat b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/StarParticle.mat index 059aebbca..6fdd0cc28 100644 --- a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/StarParticle.mat +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/StarParticle.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: StarParticle m_Shader: {fileID: 4800000, guid: af9746bafb4f8e942b6957f0b2a2ac59, type: 3} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -39,6 +40,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _GradientMap: + m_Texture: {fileID: 2800000, guid: b31d4f673c4dc0b498c0325fbece6d29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,6 +60,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - PixelSnap: 0 - _BumpScale: 1 diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png new file mode 100644 index 000000000..20c842336 Binary files /dev/null and b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png differ diff --git a/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png.meta b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png.meta new file mode 100644 index 000000000..6c3ecbd26 --- /dev/null +++ b/Assets/Resources/Sprites/UI/Common/GameOverlays/StarAndAccuracy/acecolors.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 4aa512ca12c0f0645830e3a8aa1745fc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs b/Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs index 98f27f7fb..0487d077c 100644 --- a/Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs +++ b/Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs @@ -165,6 +165,13 @@ namespace HeavenStudio.Common } } + // makes the explosion smaller with less accurate inputs + if (it == OK) + { + float okScalar = 1 - (frac / 2); + it.transform.localScale = new Vector3(okScalar, okScalar, it.transform.localScale.z); + } + it.transform.position = barTransform.position + new Vector3(0, barTransform.localScale.y * y, 0); it.GetComponent().Play(); }