diff --git a/Assets/Brushes/Brushes.psb b/Assets/Brushes/Brushes.psb index f721b51..d5819b6 100644 Binary files a/Assets/Brushes/Brushes.psb and b/Assets/Brushes/Brushes.psb differ diff --git a/Assets/Brushes/BrushesHard.png b/Assets/Brushes/BrushesHard.png index 60982d0..8954d69 100644 Binary files a/Assets/Brushes/BrushesHard.png and b/Assets/Brushes/BrushesHard.png differ diff --git a/Assets/Brushes/BrushesSoft.png b/Assets/Brushes/BrushesSoft.png index d6dcdab..4c0b868 100644 Binary files a/Assets/Brushes/BrushesSoft.png and b/Assets/Brushes/BrushesSoft.png differ diff --git a/Assets/Brushes/BrushesSquare.png b/Assets/Brushes/BrushesSquare.png index 28535f4..e10fa73 100644 Binary files a/Assets/Brushes/BrushesSquare.png and b/Assets/Brushes/BrushesSquare.png differ diff --git a/Assets/Materials/DiscordChaos.mat b/Assets/Materials/DiscordChaos.mat new file mode 100644 index 0000000..acbe9e6 --- /dev/null +++ b/Assets/Materials/DiscordChaos.mat @@ -0,0 +1,123 @@ +%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: DiscordChaos + m_Shader: {fileID: 4800000, guid: 023c98a32f6cc00478e50479839530c5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: f4cb99566bf85684c99c8a07d0b4a7f1, type: 3} + 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} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f4cb99566bf85684c99c8a07d0b4a7f1, type: 3} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/DiscordChaos.mat.meta b/Assets/Materials/DiscordChaos.mat.meta new file mode 100644 index 0000000..fa539cc --- /dev/null +++ b/Assets/Materials/DiscordChaos.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 879c2b231ff45a547a8bc5e4aa92a1db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/PaintHudPanel.prefab b/Assets/Prefabs/PaintHudPanel.prefab index 6ae8e7a..04e8edf 100644 --- a/Assets/Prefabs/PaintHudPanel.prefab +++ b/Assets/Prefabs/PaintHudPanel.prefab @@ -485,10 +485,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a35dda49401e4045ba2165e15116a5f, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::HsvColorPicker - _hueBase: {fileID: 0} - _svHandle: {fileID: 0} - _hueHandle: {fileID: 0} - _swatch: {fileID: 0} --- !u!1 &430233742843657048 GameObject: m_ObjectHideFlags: 0 @@ -6274,10 +6270,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a35dda49401e4045ba2165e15116a5f, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::HsvColorPicker - _hueBase: {fileID: 0} - _svHandle: {fileID: 0} - _hueHandle: {fileID: 0} - _swatch: {fileID: 0} --- !u!1 &5270588216341345495 GameObject: m_ObjectHideFlags: 0 @@ -11882,7 +11874,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4562821246304388210, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} propertyPath: m_text - value: 50 + value: 500 objectReference: {fileID: 0} - target: {fileID: 5297334453724826373, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} propertyPath: m_Pivot.x @@ -11978,7 +11970,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} propertyPath: m_MaxValue - value: 200 + value: 250 objectReference: {fileID: 0} - target: {fileID: 6369511037010461285, guid: ddd3fe86b03da644faf6d52ae79646b6, type: 3} propertyPath: m_MinValue diff --git a/Assets/Textures/DiscordChaos.png b/Assets/Textures/DiscordChaos.png new file mode 100644 index 0000000..b9cab22 Binary files /dev/null and b/Assets/Textures/DiscordChaos.png differ diff --git a/Assets/Textures/DiscordChaos.png.meta b/Assets/Textures/DiscordChaos.png.meta new file mode 100644 index 0000000..e29d613 --- /dev/null +++ b/Assets/Textures/DiscordChaos.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: f4cb99566bf85684c99c8a07d0b4a7f1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: