diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index cc3db509b..63173cbaa 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -24,6 +24,7 @@ MonoBehaviour: - {fileID: 21300000, guid: d787ecac73aac5b4a90deb7d7e500d22, type: 3} - {fileID: 21300000, guid: de280cbe7890e5a45802bd120a2b74f4, type: 3} - {fileID: 21300000, guid: 292c42b6b51485944a13a0d9e1a19a4e, type: 3} + - {fileID: 21300000, guid: 2de7d35c927763b43af92db9befe80ec, type: 3} - {fileID: 21300000, guid: 38b35bbd2db7b5b46aee1494716c01ec, type: 3} - {fileID: 21300000, guid: d86f0a17c7ac418449c13c7630c24a6e, type: 3} - {fileID: 21300000, guid: 5985facae59bd3a468c8c10f36e27130, type: 3} @@ -83,4 +84,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c170026060000270600001924170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c17002606000058201700270600001924170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index bd9d18356..c6ce0fc6c 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -115,6 +115,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 712663eb7cac1b64a9f8a319a719b9b3, type: 3} - {fileID: 21300000, guid: 61c324ebfd08c6042a97cdc44e786ab1, type: 3} - {fileID: 21300000, guid: 05b2835c2f1cab94d9a683b1b224bf9f, type: 3} + - {fileID: 21300000, guid: 2de7d35c927763b43af92db9befe80ec, type: 3} - {fileID: 21300000, guid: f1eb506cc169ae94da35933a571a9e24, type: 3} - {fileID: 21300000, guid: d787ecac73aac5b4a90deb7d7e500d22, type: 3} - {fileID: 21300000, guid: d012b6cc00c51734195445a3c6d15cf7, type: 3} @@ -186,6 +187,7 @@ SpriteAtlas: - 23_1 - avatar_2 - 20_1 + - 17_1 - 31 - 16 - 26 diff --git a/Assets/arts/atlas/icon/hero_2.asset b/Assets/arts/atlas/icon/hero_2.asset index 1b8b5b2e4..37beb902a 100644 --- a/Assets/arts/atlas/icon/hero_2.asset +++ b/Assets/arts/atlas/icon/hero_2.asset @@ -24,6 +24,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 1e8c87190f00b6d46b87056c7a808d0f, type: 3} - {fileID: 21300000, guid: 445054f27efbba34ab5723e99d64d5c3, type: 3} - {fileID: 21300000, guid: 43df2ce8e9328824497e47808b03488f, type: 3} + - {fileID: 21300000, guid: ea6b0e04f03136c4c969a612379a192d, type: 3} - {fileID: 21300000, guid: a3822fea44ebbf64697628713365c523, type: 3} - {fileID: 21300000, guid: b0fa3f60d34974540a238b8f2b49bd4c, type: 3} - {fileID: 21300000, guid: 5123256b8feda2145a9350bee87ad74f, type: 3} @@ -57,4 +58,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3} - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3} - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c170026060000270600001924170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c17002606000058201700270600001924170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 diff --git a/Assets/arts/atlas/icon/hero_2.spriteatlas b/Assets/arts/atlas/icon/hero_2.spriteatlas index d46f2b1ef..0ff46b047 100644 --- a/Assets/arts/atlas/icon/hero_2.spriteatlas +++ b/Assets/arts/atlas/icon/hero_2.spriteatlas @@ -74,6 +74,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 83972b43f120c634090ba4b8a5b5921e, type: 3} - {fileID: 21300000, guid: bb7ae063543bf0b4d90dd6d8d2c782de, type: 3} - {fileID: 21300000, guid: d743dca3726b5ca4ea81a16c41925b66, type: 3} + - {fileID: 21300000, guid: ea6b0e04f03136c4c969a612379a192d, type: 3} - {fileID: 21300000, guid: 1017ce1418f44884081066c1094a629d, type: 3} - {fileID: 21300000, guid: 46e5b8d421d35b544af8eb86918b50a3, type: 3} - {fileID: 21300000, guid: 8905f5e482ea373429968d1d855c0cd7, type: 3} @@ -119,6 +120,7 @@ SpriteAtlas: - 29 - 23 - 31 + - 17_1 - 22 - 15 - 12 diff --git a/Assets/arts/effects/texture/fire/seq_lcy_29.png.meta b/Assets/arts/effects/texture/fire/seq_lcy_29.png.meta index 57191a42a..a0bfcbf08 100644 --- a/Assets/arts/effects/texture/fire/seq_lcy_29.png.meta +++ b/Assets/arts/effects/texture/fire/seq_lcy_29.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -91,24 +91,24 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 50 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Assets/arts/effects/texture/other/04shanzi_b01.png.meta b/Assets/arts/effects/texture/other/04shanzi_b01.png.meta index 942174174..47442e11a 100644 --- a/Assets/arts/effects/texture/other/04shanzi_b01.png.meta +++ b/Assets/arts/effects/texture/other/04shanzi_b01.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -87,6 +87,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/arts/effects/texture/splash/eff_yz_108.png.meta b/Assets/arts/effects/texture/splash/eff_yz_108.png.meta index 7dbd8f6f2..47d07ade1 100644 --- a/Assets/arts/effects/texture/splash/eff_yz_108.png.meta +++ b/Assets/arts/effects/texture/splash/eff_yz_108.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 guid: da1635b16c532f949b96caa8388c0f42 TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 9 + serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,9 +32,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -54,11 +55,15 @@ TextureImporter: textureType: 0 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -69,7 +74,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,17 +86,31 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 47 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -98,10 +118,12 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/arts/textures/icon/hero/17_1.png b/Assets/arts/textures/icon/hero/17_1.png new file mode 100644 index 000000000..5c153cbd5 Binary files /dev/null and b/Assets/arts/textures/icon/hero/17_1.png differ diff --git a/Assets/arts/textures/icon/hero/17_1.png.meta b/Assets/arts/textures/icon/hero/17_1.png.meta new file mode 100644 index 000000000..466f79118 --- /dev/null +++ b/Assets/arts/textures/icon/hero/17_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 2de7d35c927763b43af92db9befe80ec +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: 0 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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/Assets/arts/textures/icon/hero_2/17_1.png b/Assets/arts/textures/icon/hero_2/17_1.png new file mode 100644 index 000000000..6b7813027 Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/17_1.png differ diff --git a/Assets/arts/textures/icon/hero_2/17_1.png.meta b/Assets/arts/textures/icon/hero_2/17_1.png.meta new file mode 100644 index 000000000..eb65fda4f --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/17_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ea6b0e04f03136c4c969a612379a192d +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: 0 + 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 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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: