diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png index 8a39ab29c..5e77563c0 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png and b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png.meta index 06d78b252..47046e1f7 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: bc81d774e77f4a741928dfa7623a8837 +guid: b8b0e7d217ee0344b9a3a4b92444d6f9 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -33,8 +33,8 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 - aniso: 1 + filterMode: 2 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png new file mode 100644 index 000000000..568beddba Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png.meta new file mode 100644 index 000000000..d9136ae33 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/clapTrap_mask.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 1389e6442a17d3a4e995df8b3766e2e4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + 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 + 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: 2 + aniso: 8 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/Games/ClapTrap/ClapTrap.cs b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs index 8c7a447b5..3b62c642b 100644 --- a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs +++ b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs @@ -84,7 +84,7 @@ namespace HeavenStudio.Games public enum ClapType { Hand, - Paw, + //Paw, //GreenOnion, //Branch, //Random @@ -219,7 +219,7 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List() { new BeatAction.Action(Conductor.instance.songPositionInBeats, delegate { canClap = false; }), - new BeatAction.Action(Conductor.instance.songPositionInBeats + 0.6, delegate { canClap = true; }) + new BeatAction.Action(Conductor.instance.songPositionInBeats + 0.4, delegate { canClap = true; }) }); }