Commit b46709cd authored by Alexander Brendel's avatar Alexander Brendel
Browse files

Fixed endscreen images + meta files again - stop breaking that shit!

parent a748da0d
fileFormatVersion: 2
<<<<<<< HEAD
guid: c0ca27f254ac4be4abf289baf8c90a92
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 5
mipmaps:
mipMapMode: 0
enableMipMap: 1
=======
guid: 04293b925def24e45a81e8b4535b8bdd
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
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
<<<<<<< HEAD
=======
streamingMipmaps: 0
streamingMipmapsPriority: 0
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
<<<<<<< HEAD
mipBias: -1
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
=======
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: -1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
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
<<<<<<< HEAD
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
=======
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
<<<<<<< HEAD
=======
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
<<<<<<< HEAD
=======
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
>>>>>>> 2a0463352f22b298d70164edc359d623b7f8ffe7
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e17464bc3cf54e7499033fd8ba36439d
guid: c0ca27f254ac4be4abf289baf8c90a92
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
......
......@@ -652,7 +652,7 @@ MonoBehaviour:
flashCanvas: {fileID: 225465615972781408}
backgroundImage: {fileID: 114144737837644306}
victorySprite: {fileID: 21300000, guid: bcfa6c2dffc23b645a66d84e864376af, type: 3}
failureSprite: {fileID: 21300000, guid: 04293b925def24e45a81e8b4535b8bdd, type: 3}
failureSprite: {fileID: 21300000, guid: c0ca27f254ac4be4abf289baf8c90a92, type: 3}
victoryFlashInTime: 0.1
victoryFlashHoldTime: 0.2
victoryFlashOutTime: 2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment