diff --git a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png deleted file mode 100644 index d30319315d..0000000000 Binary files a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png and /dev/null differ diff --git a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta deleted file mode 100644 index b161700063..0000000000 --- a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: cef97d40af40d01488b14ed27f2765ac -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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 - 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 - 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 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: fbb4e34b24bda43469de0a70ea0bcc30 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png new file mode 100644 index 0000000000..0740d0fe2a Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png differ diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png.meta similarity index 75% rename from Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta rename to Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png.meta index 4edb6bf802..775532949d 100644 --- a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/m_chsm_0035_png.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 90460778e185bda4ca37b1b26a085530 +guid: cef97d40af40d01488b14ed27f2765ac TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: m_chsm_0035_png externalObjects: {} serializedVersion: 9 mipmaps: @@ -40,7 +41,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,7 +50,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 @@ -63,7 +64,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -74,7 +75,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -84,8 +85,8 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 55 - textureCompression: 0 + textureFormat: 65 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -93,11 +94,31 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: m_chsm_0035_png + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1024 + height: 1145 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f210f554c64aac447a2e9f0c3f63dbcb + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: fbb4e34b24bda43469de0a70ea0bcc30 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_Material.mat b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_Material.mat index 357c01a42f..44d958cdfc 100644 --- a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_Material.mat +++ b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_Material.mat @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 90460778e185bda4ca37b1b26a085530, type: 3} + m_Texture: {fileID: 2800000, guid: 58eb956e62475be41b19de1e6e714b13, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png b/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png deleted file mode 100644 index cf5e7db25e..0000000000 Binary files a/Assets/ManagedResources/Spine/m_chsm_0035/m_chsm_0035_png.png and /dev/null differ