diff --git a/Assets/Resources/Filters.meta b/Assets/Resources/Filters.meta index 9a787c1f..c28ca6c5 100644 --- a/Assets/Resources/Filters.meta +++ b/Assets/Resources/Filters.meta @@ -1,7 +1,12 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Resources/Filters.meta guid: bde6dc88e46cbba40aaddc58ec33b38f folderAsset: yes DefaultImporter: +======== +guid: 547e95233859f9748964251265244a43 +NativeFormatImporter: +>>>>>>>> upstream/master:Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/Filters/blackwhite.png b/Assets/Resources/Filters/blackwhite.png new file mode 100644 index 00000000..e7819833 Binary files /dev/null and b/Assets/Resources/Filters/blackwhite.png differ diff --git a/Assets/Resources/Filters/blackwhite.png.meta b/Assets/Resources/Filters/blackwhite.png.meta new file mode 100644 index 00000000..b0ae9151 --- /dev/null +++ b/Assets/Resources/Filters/blackwhite.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b3b072bbde7f35c49824a49c7482fef1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Filters/blackwhite_2.png b/Assets/Resources/Filters/blackwhite_2.png new file mode 100644 index 00000000..71a99535 Binary files /dev/null and b/Assets/Resources/Filters/blackwhite_2.png differ diff --git a/Assets/Resources/Filters/blackwhite_2.png.meta b/Assets/Resources/Filters/blackwhite_2.png.meta new file mode 100644 index 00000000..d5fb9487 --- /dev/null +++ b/Assets/Resources/Filters/blackwhite_2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 821c6c21c998dab4d8be5b2d0614bcca +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta index 40695829..c28ca6c5 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta @@ -1,8 +1,13 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Resources/Filters.meta +guid: bde6dc88e46cbba40aaddc58ec33b38f +folderAsset: yes +DefaultImporter: +======== guid: 547e95233859f9748964251265244a43 NativeFormatImporter: +>>>>>>>> upstream/master:Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Games/Global/Filter.cs b/Assets/Scripts/Games/Global/Filter.cs index 374663fc..87e43e5a 100644 --- a/Assets/Scripts/Games/Global/Filter.cs +++ b/Assets/Scripts/Games/Global/Filter.cs @@ -71,6 +71,8 @@ namespace HeavenStudio.Games.Global tritanopia = 50, vibrance = 51, winter = 52, + blackwhite = 53, + blackwhite_2 = 54, } #region MonoBehaviour