diff --git a/Assets/arts/atlas/icon/avatar.asset b/Assets/arts/atlas/icon/avatar.asset index a04ea2708..7f1df3e3e 100644 --- a/Assets/arts/atlas/icon/avatar.asset +++ b/Assets/arts/atlas/icon/avatar.asset @@ -20,5 +20,6 @@ MonoBehaviour: - {fileID: 21300000, guid: 314704dd76dbe8b45af5fc465a36b48c, type: 3} - {fileID: 21300000, guid: b2d478a8fff9e1145991c81b4df46018, type: 3} - {fileID: 21300000, guid: bcae6ed3378a43947b0b55bb5c70625b, type: 3} + - {fileID: 21300000, guid: 8fd4f500051b4a844a7d53c94975afec, type: 3} - {fileID: 21300000, guid: 80d8b79692d1b7b4393ba7be095fed7b, type: 3} - spriteNameList: f90c0ae6fa0c0ae6fb0c0ae6fc0c0ae6fd0c0ae6fe0c0ae6ff0c0ae6445b58ce + spriteNameList: f90c0ae6fa0c0ae6fb0c0ae6fc0c0ae6fd0c0ae6fe0c0ae6ff0c0ae6000d0ae6445b58ce diff --git a/Assets/arts/atlas/icon/avatar.spriteatlas b/Assets/arts/atlas/icon/avatar.spriteatlas index 9c433f348..3b334c082 100644 --- a/Assets/arts/atlas/icon/avatar.spriteatlas +++ b/Assets/arts/atlas/icon/avatar.spriteatlas @@ -61,6 +61,7 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 8fd4f500051b4a844a7d53c94975afec, type: 3} - {fileID: 21300000, guid: bcae6ed3378a43947b0b55bb5c70625b, type: 3} - {fileID: 21300000, guid: e1559cf5b8a501f4fbf7fe9081997063, type: 3} - {fileID: 21300000, guid: 3297fc665edcde34cb54957166a8e63c, type: 3} @@ -70,6 +71,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 314704dd76dbe8b45af5fc465a36b48c, type: 3} - {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} m_PackedSpriteNamesToIndex: + - avatar_frame_8 - avatar_frame_7 - avatar_frame_3 - avatar_frame_2 diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index b3ae0d11c..026a77269 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -94,6 +94,7 @@ MonoBehaviour: - {fileID: 21300000, guid: ad5313adf39f71241b1d922afb85c2be, type: 3} - {fileID: 21300000, guid: ef0312eecfe794c4c9c956783cf160ca, type: 3} - {fileID: 21300000, guid: b577d3ed51499a34c97d1c7214a90558, type: 3} + - {fileID: 21300000, guid: 93d552b699c5d73489316a0e585a0a4f, type: 3} - {fileID: 21300000, guid: d3c97c92da583664a87485c06eb51849, type: 3} - {fileID: 21300000, guid: 8b3ecfd5255c1854f8c5c2895e82fe5c, type: 3} - {fileID: 21300000, guid: aeb11f14603e1574e94acc9a24d3bf43, type: 3} @@ -105,4 +106,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3} - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3} - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} - spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f0600008006000081060000820600008306000085060000350000009b0600009c0600009d0600009e0600009f060000a0060000a106000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 + spriteNameList: 310000001f0600006000170061001700620017006300170064001700650017006600170067001700680017007e0017007f00170080001700810017008200170083001700840017008500170086001700870017009d0017009e0017009f001700a0001700a1001700a2001700a3001700a4001700a5001700a6001700bc001700200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000041060000420600004306000044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000640600006506000066060000340000007c0600007d0600007e0600007f0600008006000081060000820600008306000085060000350000009b0600009c0600009d0600009e0600009f060000a0060000a1060000a206000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 diff --git a/Assets/arts/atlas/icon/item.spriteatlas b/Assets/arts/atlas/icon/item.spriteatlas index 7b1549481..e671aaf7d 100644 --- a/Assets/arts/atlas/icon/item.spriteatlas +++ b/Assets/arts/atlas/icon/item.spriteatlas @@ -102,6 +102,7 @@ SpriteAtlas: - {fileID: 21300000, guid: d49d865652cda36419d38662cba8f726, type: 3} - {fileID: 21300000, guid: 402ff376f08524145a31ac61b190cc1f, type: 3} - {fileID: 21300000, guid: aa7c9f96716003c4485ce5ca09f9d43c, type: 3} + - {fileID: 21300000, guid: 93d552b699c5d73489316a0e585a0a4f, type: 3} - {fileID: 21300000, guid: 301967b6e52e1234cb623a81d9ff2e09, type: 3} - {fileID: 21300000, guid: 3f8237e6473e81741a5f29a5f8e5ee80, type: 3} - {fileID: 21300000, guid: 99a99df616d8158459486d61332c2167, type: 3} @@ -195,6 +196,7 @@ SpriteAtlas: - 10 - 1007 - 20 + - 57 - 47 - 42 - 39 diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index c712c55cb..9fda8954a 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -29,7 +29,6 @@ MonoBehaviour: - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - {fileID: 21300000, guid: 4d5eca674cfc87745bd0c368f2270a6c, type: 3} - {fileID: 21300000, guid: 7232d781b35ea8742abca796fec7106d, type: 3} - - {fileID: 21300000, guid: 73b3a40073482f64d9a6d54b53125dde, type: 3} - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3} - {fileID: 21300000, guid: fdc5ec978c307224dbb7465f4698a226, type: 3} - {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3} @@ -211,4 +210,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d056d861a066d861a076d861a8c243e8d8d243e8d8e243e8d8f243e8da144473690243e8d91243e8d92243e8d93243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402efbed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1aa49b7ac57d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47252af848262af848272af8484c159f46a07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d056d861a066d861a076d861a8c243e8d8d243e8d8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402efbed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1aa49b7ac57d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47252af848262af848272af8484c159f46a07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index f71a5e372..b39061a90 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -61,7 +61,6 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: - - {fileID: 21300000, guid: 73b3a40073482f64d9a6d54b53125dde, type: 3} - {fileID: 21300000, guid: c19b6240a169be841a2f5d9bfa607302, type: 3} - {fileID: 21300000, guid: bdcabd5093d701f498daa8906bfd6eb3, type: 3} - {fileID: 21300000, guid: bd8ab060d4c962f45b3af7dea9c8ee79, type: 3} @@ -260,7 +259,6 @@ SpriteAtlas: - {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3} - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} m_PackedSpriteNamesToIndex: - - common_bg_6 1 - common_new - common_board_24 - common_circle_1 diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_8.png b/Assets/arts/textures/icon/avatar/avatar_frame_8.png new file mode 100644 index 000000000..b254b9608 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avatar_frame_8.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_8.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_8.png.meta new file mode 100644 index 000000000..a84ef0ec2 --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avatar_frame_8.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 8fd4f500051b4a844a7d53c94975afec +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/item/57.png b/Assets/arts/textures/icon/item/57.png new file mode 100644 index 000000000..2183458be Binary files /dev/null and b/Assets/arts/textures/icon/item/57.png differ diff --git a/Assets/arts/textures/icon/item/57.png.meta b/Assets/arts/textures/icon/item/57.png.meta new file mode 100644 index 000000000..799aa068c --- /dev/null +++ b/Assets/arts/textures/icon/item/57.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 93d552b699c5d73489316a0e585a0a4f +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: