From c5f742e126af434645e9dfc3a3d3b2e8bff3eee7 Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 15 Apr 2021 14:10:27 -0500 Subject: [PATCH] Changed pixel art image types to be sprites --- .../Scenes/DemoLevels/Spike Scene.unity | 6 +-- .../Assets/Sprites/Artwork Sprites.meta | 8 ++++ .../Sprites/Artwork Sprites.meta~HEAD.meta | 7 ++++ .../Sprites/Artwork Sprites.meta~main.meta | 7 ++++ .../Bailin-Scarecrow Pixelart.png.meta | 36 ++++++++++++++---- .../Behrens-Strawberry Pixelart.png.meta | 36 ++++++++++++++---- .../Blackburn-Abstract#2 Pixelart.png.meta | 36 ++++++++++++++---- .../Sprites/Artwork Sprites/Materials.meta | 8 ++++ .../Materials/Bailin-Scarecrow Pixelart.mat | 37 +++++++++++++++++++ .../Bailin-Scarecrow Pixelart.mat.meta | 8 ++++ .../UserSettings/EditorUserSettings.asset | 20 +++++----- 11 files changed, 172 insertions(+), 37 deletions(-) create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Materials.meta create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat create mode 100644 MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat.meta diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity index 7207801..626b9cf 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spike Scene.unity @@ -2424,12 +2424,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a94f88a99bc4b47eab866de27ee69341, type: 3} + m_Sprite: {fileID: 21300000, guid: 71938390b65010447bd9357a6450359c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.8828125, y: 1} + m_Size: {x: 1.28, y: 1.28} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -2479,7 +2479,7 @@ BoxCollider2D: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} oldSize: {x: 1.28, y: 1.28} - newSize: {x: 0.8828125, y: 1} + newSize: {x: 1.28, y: 1.28} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta new file mode 100644 index 0000000..9562fe2 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db04a197a226a47ba9b42ebe509b9f96 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta new file mode 100644 index 0000000..cdab742 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~HEAD.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8476281d8652345929fba91c1974ac19 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta new file mode 100644 index 0000000..39423e2 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites.meta~main.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d22892c17a6a249e3a27ea6dd48b04ab +DefaultImporter: + externalObjects: {} + 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 index 8e322f8..861f55b 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Bailin-Scarecrow Pixelart.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 71938390b65010447bd9357a6450359c -======= -guid: a94f88a99bc4b47eab866de27ee69341 ->>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -36,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: -1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -65,14 +61,38 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta index 146df78..b3bae62 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Behrens-Strawberry Pixelart.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: ac0a24c4b892f4e4eb667c0c22ae7490 -======= -guid: 583f73bcdc6714bb494fde0e2ac57cc8 ->>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -36,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: -1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -65,14 +61,38 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 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 index cb5b2e0..a9c9263 100644 --- a/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Blackburn-Abstract#2 Pixelart.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 7947595c5ebf72648aab3049c3c7f7bd -======= -guid: 633f9d29b2bab49d481be27cf84b4ce6 ->>>>>>> main TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -36,12 +32,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: -1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -65,14 +61,38 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Materials.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials.meta new file mode 100644 index 0000000..5a8fe14 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7e26695a8dbd4ba798a833d5ef1383f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat new file mode 100644 index 0000000..e8e9440 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bailin-Scarecrow Pixelart + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 71938390b65010447bd9357a6450359c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat.meta b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat.meta new file mode 100644 index 0000000..a368021 --- /dev/null +++ b/MuseumGame/Assets/Sprites/Artwork Sprites/Materials/Bailin-Scarecrow Pixelart.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55eafcfd69b4849fbb8d9b7069ae4583 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index e231fbb..6433c07 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 vcSharedLogLevel: value: 0d5e400f0650