From 22cc21db6c81c381a54cf4fdfa19e835978f02e6 Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 15 Apr 2021 09:15:21 -0500 Subject: [PATCH] Added texture to powerup --- .../Scenes/DemoLevels/Spike Scene.unity | 40 ++------ .../Artwork Sprites.meta} | 6 +- .../Bailin-Scarecrow Pixelart.png.meta | 96 +++++++++++++++++++ .../Behrens-Strawberry Pixelart.png.meta | 96 +++++++++++++++++++ .../Blackburn-Abstract#2 Pixelart.png.meta | 96 +++++++++++++++++++ .../UserSettings/EditorUserSettings.asset | 16 ++-- 6 files changed, 306 insertions(+), 44 deletions(-) rename MuseumGame/Assets/{Animations/Canvas.controller.meta => Sprites/Artwork Sprites.meta} (52%) create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity index b08a948..f0713f6 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -2424,7 +2424,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: -2135585597343286014, guid: 4b2a04fdbe0ef4d8da8f90eaca817cd1, type: 3} + m_Sprite: {fileID: 21300000, guid: a94f88a99bc4b47eab866de27ee69341, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2461,8 +2461,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3405314fa73da438982268d433fbbc2f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!60 &219367238 -PolygonCollider2D: +--- !u!61 &219367238 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2478,41 +2478,15 @@ PolygonCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 0.8828125, y: 1} + oldSize: {x: 1.28, y: 1.28} newSize: {x: 0.8828125, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0.4375, y: -0.265625} - - {x: 0.44140625, y: -0.2578125} - - {x: 0.44140625, y: 0.2578125} - - {x: 0.4375, y: 0.265625} - - {x: 0.390625, y: 0.29296875} - - {x: 0.36328125, y: 0.30859375} - - {x: 0.26171875, y: 0.3671875} - - {x: 0.21484375, y: 0.39453125} - - {x: 0.16015625, y: 0.42578125} - - {x: 0.05859375, y: 0.484375} - - {x: 0.02734375, y: 0.5} - - {x: -0.03125, y: 0.5} - - {x: -0.05859375, y: 0.484375} - - {x: -0.1875, y: 0.41015625} - - {x: -0.36328125, y: 0.30859375} - - {x: -0.4375, y: 0.265625} - - {x: -0.44140625, y: 0.2578125} - - {x: -0.44140625, y: -0.2578125} - - {x: -0.4375, y: -0.265625} - - {x: -0.31640625, y: -0.3359375} - - {x: -0.26171875, y: -0.3671875} - - {x: -0.21484375, y: -0.39453125} - - {x: -0.11328125, y: -0.453125} - - {x: -0.03125, y: -0.5} - - {x: 0.03125, y: -0.5} - - {x: 0.0859375, y: -0.46875} - - {x: 0.2421875, y: -0.37890625} + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 --- !u!1 &563510750 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Animations/Canvas.controller.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta similarity index 52% rename from MuseumGame/Assets/Animations/Canvas.controller.meta rename to MuseumGame/Assets/Sprites/Artwork Sprites.meta index 27abbf0..9562fe2 100644 --- a/MuseumGame/Assets/Animations/Canvas.controller.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9c49cc23ab6ad5140bd44a28378877ee -NativeFormatImporter: +guid: db04a197a226a47ba9b42ebe509b9f96 +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta new file mode 100644 index 0000000..687c136 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a94f88a99bc4b47eab866de27ee69341 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + 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 + 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/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta new file mode 100644 index 0000000..6596576 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 583f73bcdc6714bb494fde0e2ac57cc8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + 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 + 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/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta new file mode 100644 index 0000000..299f0d7 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 633f9d29b2bab49d481be27cf84b4ce6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + 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 + 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/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 73eedf9..f6ab9d1 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 vcSharedLogLevel: value: 0d5e400f0650