From 0f25538814ee16f8ae9eb3f697bfa72dada5b079 Mon Sep 17 00:00:00 2001 From: Ciakon Date: Tue, 12 Mar 2024 13:55:11 +0100 Subject: [PATCH] Fixed sprites --- Assets/Sprites/dårlig_toast.png.meta | 32 ++++----------------- Assets/Sprites/flour.png.meta | 32 ++++----------------- Assets/Sprites/meat_sauce_and_rice.png.meta | 32 ++++----------------- Assets/Sprites/onion.png.meta | 32 ++++----------------- Assets/Sprites/steak.png.meta | 32 ++++----------------- 5 files changed, 30 insertions(+), 130 deletions(-) diff --git a/Assets/Sprites/dårlig_toast.png.meta b/Assets/Sprites/dårlig_toast.png.meta index 33de534..a71e4a3 100644 --- a/Assets/Sprites/dårlig_toast.png.meta +++ b/Assets/Sprites/dårlig_toast.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: dfaf1935e2abff14da7316045bc12c66 -======= -guid: 55aa772debf415445ad407407fda730b ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/flour.png.meta b/Assets/Sprites/flour.png.meta index 5fb28ed..dd262e7 100644 --- a/Assets/Sprites/flour.png.meta +++ b/Assets/Sprites/flour.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 0b40c517a63588746a7668929bfc8ca7 -======= -guid: 9a214110406ce4c46b321f25182d929f ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/meat_sauce_and_rice.png.meta b/Assets/Sprites/meat_sauce_and_rice.png.meta index 45bd744..34db4de 100644 --- a/Assets/Sprites/meat_sauce_and_rice.png.meta +++ b/Assets/Sprites/meat_sauce_and_rice.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 6658aaa835fd0354c8369158b264a7d7 -======= -guid: 72abe25f265d220419f4031009164cb2 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/onion.png.meta b/Assets/Sprites/onion.png.meta index f36019e..25e9dbb 100644 --- a/Assets/Sprites/onion.png.meta +++ b/Assets/Sprites/onion.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: 168c51d9cab206d42a3c6aabeff98162 -======= -guid: c9ff353953cc92841af8c10f5fa8ef79 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/steak.png.meta b/Assets/Sprites/steak.png.meta index 04e8eee..4794d44 100644 --- a/Assets/Sprites/steak.png.meta +++ b/Assets/Sprites/steak.png.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: b4d7d234e66457440bf28b559697e18f -======= -guid: b7c1d78f668acb24fb5f1ade1fafe261 ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -43,7 +39,7 @@ TextureImporter: mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: 1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,16 +63,16 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 - applyGammaDecoding: 0 + applyGammaDecoding: 1 swizzle: 50462976 - cookieLightType: 0 + cookieLightType: 2 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -85,27 +81,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 -<<<<<<< HEAD - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 -======= ->>>>>>> c889a936f796b33877ab0923b1a52bc2c35e6883 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -118,7 +98,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0