diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index d2059259e..63f3b6165 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -46,6 +46,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 7d9c79f30dcdc8247aab76baf0c2c6ba, type: 3} - {fileID: 21300000, guid: 5ae3b4c8d1b2dc944968d2a268712728, type: 3} - {fileID: 21300000, guid: f8571a4249dafd640b7e19c06f959315, type: 3} + - {fileID: 21300000, guid: 23f3ef320d7dba64796bf0abd2ecdb31, type: 3} - {fileID: 21300000, guid: f1eb506cc169ae94da35933a571a9e24, type: 3} - {fileID: 21300000, guid: 3f007bc497b724f4c959944ef3ecf4ef, type: 3} - {fileID: 21300000, guid: 397fbe85e4725d444a9be3c60ff79387, type: 3} @@ -86,4 +87,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d060000cfee17005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index b6bc5b47e..a894bdd8b 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -68,6 +68,7 @@ SpriteAtlas: - {fileID: 21300000, guid: dab912016d15a474bba88f941dbe15ee, type: 3} - {fileID: 21300000, guid: c1d35f3153f12a14c9c8957a905b0b28, type: 3} - {fileID: 21300000, guid: 08b6d902b86c0b34e92ab673197fb767, type: 3} + - {fileID: 21300000, guid: 23f3ef320d7dba64796bf0abd2ecdb31, type: 3} - {fileID: 21300000, guid: f8571a4249dafd640b7e19c06f959315, type: 3} - {fileID: 21300000, guid: 056b0c62d8026c546bd043ae92411b15, type: 3} - {fileID: 21300000, guid: 643846a215ab336468ec5ce2377a6325, type: 3} @@ -142,6 +143,7 @@ SpriteAtlas: - 24 - hero_s - frame_dec_3 + - 30_1 - 30 - 8 - 14 diff --git a/Assets/arts/atlas/icon/hero_2.asset b/Assets/arts/atlas/icon/hero_2.asset index 73e06b693..8451529b2 100644 --- a/Assets/arts/atlas/icon/hero_2.asset +++ b/Assets/arts/atlas/icon/hero_2.asset @@ -46,6 +46,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 83972b43f120c634090ba4b8a5b5921e, type: 3} - {fileID: 21300000, guid: 83831e4876c42b246b8aa584a6a4ea02, type: 3} - {fileID: 21300000, guid: a13c781de5ebc714a9277a90e4e0f987, type: 3} + - {fileID: 21300000, guid: a24da717dbd3832428a87a849b1b47cc, type: 3} - {fileID: 21300000, guid: d743dca3726b5ca4ea81a16c41925b66, type: 3} - {fileID: 21300000, guid: 606933e1bb811af49a66a661c3253bd6, type: 3} - {fileID: 21300000, guid: 50d0ead82680c654f8bc7ead466f74ad, type: 3} @@ -60,4 +61,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3} - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3} - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d060000cfee17005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 diff --git a/Assets/arts/atlas/icon/hero_2.spriteatlas b/Assets/arts/atlas/icon/hero_2.spriteatlas index c7ba6f716..e06258852 100644 --- a/Assets/arts/atlas/icon/hero_2.spriteatlas +++ b/Assets/arts/atlas/icon/hero_2.spriteatlas @@ -88,6 +88,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3} - {fileID: 21300000, guid: b970f2264d5d3474e81fae12f614b364, type: 3} - {fileID: 21300000, guid: ce90e6b69f2fdcf408e7e2a8c29530b5, type: 3} + - {fileID: 21300000, guid: a24da717dbd3832428a87a849b1b47cc, type: 3} - {fileID: 21300000, guid: ceff0e178a3b50442854f23f561e7fed, type: 3} - {fileID: 21300000, guid: 0acfcf388dce9b444bc19e0f50c863b6, type: 3} - {fileID: 21300000, guid: 83831e4876c42b246b8aa584a6a4ea02, type: 3} @@ -136,6 +137,7 @@ SpriteAtlas: - 7_1 - 11 - 6 + - 30_1 - 28 - 25_1 - 3 diff --git a/Assets/arts/textures/icon/hero/30_1.png b/Assets/arts/textures/icon/hero/30_1.png new file mode 100644 index 000000000..624eae227 Binary files /dev/null and b/Assets/arts/textures/icon/hero/30_1.png differ diff --git a/Assets/arts/textures/icon/hero/30_1.png.meta b/Assets/arts/textures/icon/hero/30_1.png.meta new file mode 100644 index 000000000..708f1f57f --- /dev/null +++ b/Assets/arts/textures/icon/hero/30_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 23f3ef320d7dba64796bf0abd2ecdb31 +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/30_1.png b/Assets/arts/textures/icon/hero_2/30_1.png new file mode 100644 index 000000000..1bf3bb764 Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/30_1.png differ diff --git a/Assets/arts/textures/icon/hero_2/30_1.png.meta b/Assets/arts/textures/icon/hero_2/30_1.png.meta new file mode 100644 index 000000000..4b9882d33 --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/30_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: a24da717dbd3832428a87a849b1b47cc +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: