diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 862786ee3..5f6bd11dd 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -63,35 +63,81 @@ SpriteAtlas: m_PackedSprites: - {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3} - {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} + - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} + - {fileID: 21300000, guid: 330be4d1490173b4a8a049003427d8fb, type: 3} + - {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} + - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} + - {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} + - {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} + - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} + - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} + - {fileID: 21300000, guid: 8e279276358266d4abd13f0e7fde1e50, type: 3} - {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} + - {fileID: 21300000, guid: 31c5ffb6550fe564ab9f5159f4e9a1a6, type: 3} - {fileID: 21300000, guid: af2468e67b69b3647afb863604c01d03, type: 3} - {fileID: 21300000, guid: 3b14bc3747e2c3248b47a3ac14d44d6d, type: 3} + - {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} - {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} + - {fileID: 21300000, guid: 7cc4f1e808d2d6c45a721ee91ea63866, type: 3} + - {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} - {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + - {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3} + - {fileID: 21300000, guid: 13b1668a707250d4cac750f73ca8f3c3, type: 3} - {fileID: 21300000, guid: 5065219a9ba54e745b022463cac9dfbf, type: 3} + - {fileID: 21300000, guid: d31ab4bae352c3d4481cb54328c5f3c2, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + - {fileID: 21300000, guid: 66f7e9bcf829fc04d816daa40ffaad77, type: 3} + - {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} - {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} - {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} - {fileID: 21300000, guid: 89783d5ddc9ab034687ff93732ebdfe0, type: 3} - {fileID: 21300000, guid: bbc8dc8d2ae3e364990b159c9a7ef3df, type: 3} + - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} + - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} + - {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, type: 3} + - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3} + - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3} m_PackedSpriteNamesToIndex: - common_title_2 - common_title_1 + - common_btn_yellow_3 + - common_dec_6 + - common_btn_yellow_1 + - common_btn_yellow_2 + - common_board_2 + - common_dec_3 + - common_btn_green_2 + - common_btn_red_1 + - common_btn_red_3 - common_board_1 + - common_progress_2 - common_arrow_1 - common_progress_1 + - common_title_4 - common_dec_2 + - common_board_5 + - common_board_4 - common_bg_2 - common_check + - common_board_3 + - common_chest_4 - common_plus_1 + - common_board_7 - common_btn_green_1 - common_bg_1 + - common_title_3 + - common_btn_red_2 - common_alpha - common_point - common_progress_1_bg - common_dec_1 + - common_btn_green_3 + - common_dec_4 + - common_board_6 + - common_chest_1 + - common_dec_5 m_RenderDataMap: {} m_Tag: common m_IsVariant: 0 diff --git a/Assets/arts/textures/ui/common/common_bg_2.png b/Assets/arts/textures/ui/common/common_bg_2.png index 862471e7e..bb5adbff0 100644 Binary files a/Assets/arts/textures/ui/common/common_bg_2.png and b/Assets/arts/textures/ui/common/common_bg_2.png differ diff --git a/Assets/arts/textures/ui/common/common_board_2.png b/Assets/arts/textures/ui/common/common_board_2.png new file mode 100644 index 000000000..21e6eda1e Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_2.png differ diff --git a/Assets/arts/textures/ui/common/common_board_2.png.meta b/Assets/arts/textures/ui/common/common_board_2.png.meta new file mode 100644 index 000000000..42cb44376 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 1a3eea633d6dc9249b5caf2aee32cdfa +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/ui/common/common_board_3.png b/Assets/arts/textures/ui/common/common_board_3.png new file mode 100644 index 000000000..74f5e63f0 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_3.png differ diff --git a/Assets/arts/textures/ui/common/common_board_3.png.meta b/Assets/arts/textures/ui/common/common_board_3.png.meta new file mode 100644 index 000000000..237035ea2 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: dc05a38a7a24b1e46be66fd07ad92ef8 +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/ui/common/common_board_4.png b/Assets/arts/textures/ui/common/common_board_4.png new file mode 100644 index 000000000..f9ac3e4a9 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_4.png differ diff --git a/Assets/arts/textures/ui/common/common_board_4.png.meta b/Assets/arts/textures/ui/common/common_board_4.png.meta new file mode 100644 index 000000000..1c9cdc0a0 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: dd9f53f83308a3a4799e84f5ccc9fd79 +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/ui/common/common_board_5.png b/Assets/arts/textures/ui/common/common_board_5.png new file mode 100644 index 000000000..2c272b104 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_5.png differ diff --git a/Assets/arts/textures/ui/common/common_board_5.png.meta b/Assets/arts/textures/ui/common/common_board_5.png.meta new file mode 100644 index 000000000..a2c7e1e75 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 7cc4f1e808d2d6c45a721ee91ea63866 +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/ui/common/common_board_6.png b/Assets/arts/textures/ui/common/common_board_6.png new file mode 100644 index 000000000..6cc047cf9 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_6.png differ diff --git a/Assets/arts/textures/ui/common/common_board_6.png.meta b/Assets/arts/textures/ui/common/common_board_6.png.meta new file mode 100644 index 000000000..73857040e --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_6.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 09f9c16e1cfc25c49a29ff0c74978b2e +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/ui/common/common_board_7.png b/Assets/arts/textures/ui/common/common_board_7.png new file mode 100644 index 000000000..98d8a9874 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_7.png differ diff --git a/Assets/arts/textures/ui/common/common_board_7.png.meta b/Assets/arts/textures/ui/common/common_board_7.png.meta new file mode 100644 index 000000000..213de90af --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_7.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: d31ab4bae352c3d4481cb54328c5f3c2 +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/ui/common/common_btn_green_1.png.meta b/Assets/arts/textures/ui/common/common_btn_green_1.png.meta index ecdbc1a3a..a7381bfc3 100644 --- a/Assets/arts/textures/ui/common/common_btn_green_1.png.meta +++ b/Assets/arts/textures/ui/common/common_btn_green_1.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 34, y: 46, z: 34, w: 36} + spriteBorder: {x: 34, y: 48, z: 34, w: 34} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_btn_green_2.png b/Assets/arts/textures/ui/common/common_btn_green_2.png new file mode 100644 index 000000000..93c88314e Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_green_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_green_2.png.meta b/Assets/arts/textures/ui/common/common_btn_green_2.png.meta new file mode 100644 index 000000000..37609d7ac --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_green_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 5758461464520334caa2a2487dca2fc6 +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: 26, y: 32, z: 26, w: 24} + 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/ui/common/common_btn_green_3.png b/Assets/arts/textures/ui/common/common_btn_green_3.png new file mode 100644 index 000000000..991bdd872 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_green_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_green_3.png.meta b/Assets/arts/textures/ui/common/common_btn_green_3.png.meta new file mode 100644 index 000000000..79ff05a77 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_green_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 883d58dd339d5e346b504cdff1be6351 +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: 18, y: 22, z: 18, w: 14} + 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/ui/common/common_btn_red_1.png b/Assets/arts/textures/ui/common/common_btn_red_1.png new file mode 100644 index 000000000..d584e732b Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_red_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_red_1.png.meta b/Assets/arts/textures/ui/common/common_btn_red_1.png.meta new file mode 100644 index 000000000..56aa70538 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_red_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: c0d66e84bb441904390a26e5f00c0b59 +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: 34, y: 48, z: 34, w: 34} + 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/ui/common/common_btn_red_2.png b/Assets/arts/textures/ui/common/common_btn_red_2.png new file mode 100644 index 000000000..c1cdd4bfa Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_red_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_red_2.png.meta b/Assets/arts/textures/ui/common/common_btn_red_2.png.meta new file mode 100644 index 000000000..40e334dde --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_red_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: c005d0dc9d400304ca941b48135dcb04 +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: 26, y: 32, z: 26, w: 24} + 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/ui/common/common_btn_red_3.png b/Assets/arts/textures/ui/common/common_btn_red_3.png new file mode 100644 index 000000000..bd11d560c Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_red_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_red_3.png.meta b/Assets/arts/textures/ui/common/common_btn_red_3.png.meta new file mode 100644 index 000000000..83ffed8d2 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_red_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 8e279276358266d4abd13f0e7fde1e50 +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: 18, y: 22, z: 18, w: 14} + 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/ui/common/common_btn_yellow_1.png b/Assets/arts/textures/ui/common/common_btn_yellow_1.png new file mode 100644 index 000000000..8e90b9f89 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_yellow_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_1.png.meta b/Assets/arts/textures/ui/common/common_btn_yellow_1.png.meta new file mode 100644 index 000000000..84aedf762 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_yellow_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 1a4363e1856808e4ea0a078472b03c75 +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: 34, y: 48, z: 34, w: 34} + 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/ui/common/common_btn_yellow_2.png b/Assets/arts/textures/ui/common/common_btn_yellow_2.png new file mode 100644 index 000000000..de6d4cb9d Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_yellow_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_2.png.meta b/Assets/arts/textures/ui/common/common_btn_yellow_2.png.meta new file mode 100644 index 000000000..144889d4a --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_yellow_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: b3ebf3220061a824c8f4a3919ee39a33 +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: 26, y: 32, z: 26, w: 24} + 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/ui/common/common_btn_yellow_3.png b/Assets/arts/textures/ui/common/common_btn_yellow_3.png new file mode 100644 index 000000000..7a4407223 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_yellow_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_3.png.meta b/Assets/arts/textures/ui/common/common_btn_yellow_3.png.meta new file mode 100644 index 000000000..a0687b98b --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_yellow_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 9bc39501344a8494daeaf1035cb736db +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: 18, y: 22, z: 18, w: 14} + 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/ui/common/common_chest_1.png b/Assets/arts/textures/ui/common/common_chest_1.png new file mode 100644 index 000000000..911f6a23b Binary files /dev/null and b/Assets/arts/textures/ui/common/common_chest_1.png differ diff --git a/Assets/arts/textures/ui/common/common_chest_1.png.meta b/Assets/arts/textures/ui/common/common_chest_1.png.meta new file mode 100644 index 000000000..7b8c22dc6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_chest_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: a3e18e0ffb96a7249ac39a5edf69b469 +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/ui/common/common_chest_4.png b/Assets/arts/textures/ui/common/common_chest_4.png new file mode 100644 index 000000000..0b439f208 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_chest_4.png differ diff --git a/Assets/arts/textures/ui/common/common_chest_4.png.meta b/Assets/arts/textures/ui/common/common_chest_4.png.meta new file mode 100644 index 000000000..536a75802 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_chest_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 13b1668a707250d4cac750f73ca8f3c3 +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/ui/common/common_dec_3.png b/Assets/arts/textures/ui/common/common_dec_3.png new file mode 100644 index 000000000..a01d4f5a9 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_3.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_3.png.meta b/Assets/arts/textures/ui/common/common_dec_3.png.meta new file mode 100644 index 000000000..ea7eb988e --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 7fd4f0c3c01d5b74da31ef5c8844b95d +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/ui/common/common_dec_4.png b/Assets/arts/textures/ui/common/common_dec_4.png new file mode 100644 index 000000000..a39b60d52 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_4.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_4.png.meta b/Assets/arts/textures/ui/common/common_dec_4.png.meta new file mode 100644 index 000000000..1a6ad4ab6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 1dedff3e909ee054b874a2fbaff044c0 +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/ui/common/common_dec_5.png b/Assets/arts/textures/ui/common/common_dec_5.png new file mode 100644 index 000000000..e8c7ac39a Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_5.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_5.png.meta b/Assets/arts/textures/ui/common/common_dec_5.png.meta new file mode 100644 index 000000000..a3ea55eca --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 70658f5f22e6038469c551a1665ae009 +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/ui/common/common_dec_6.png b/Assets/arts/textures/ui/common/common_dec_6.png new file mode 100644 index 000000000..6fba66d18 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_6.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_6.png.meta b/Assets/arts/textures/ui/common/common_dec_6.png.meta new file mode 100644 index 000000000..d4f900fec --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_6.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 330be4d1490173b4a8a049003427d8fb +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/ui/common/common_plus_1.png b/Assets/arts/textures/ui/common/common_plus_1.png index 991afd898..1613e953b 100644 Binary files a/Assets/arts/textures/ui/common/common_plus_1.png and b/Assets/arts/textures/ui/common/common_plus_1.png differ diff --git a/Assets/arts/textures/ui/common/common_progress_2.png b/Assets/arts/textures/ui/common/common_progress_2.png new file mode 100644 index 000000000..3dc499688 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_progress_2.png differ diff --git a/Assets/arts/textures/ui/common/common_progress_2.png.meta b/Assets/arts/textures/ui/common/common_progress_2.png.meta new file mode 100644 index 000000000..e70d49fb3 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_progress_2.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 31c5ffb6550fe564ab9f5159f4e9a1a6 +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/ui/common/common_title_1.png b/Assets/arts/textures/ui/common/common_title_1.png index e674484a6..ba8e3e4f6 100644 Binary files a/Assets/arts/textures/ui/common/common_title_1.png and b/Assets/arts/textures/ui/common/common_title_1.png differ diff --git a/Assets/arts/textures/ui/common/common_title_1.png.meta b/Assets/arts/textures/ui/common/common_title_1.png.meta index 81f76b026..c93679139 100644 --- a/Assets/arts/textures/ui/common/common_title_1.png.meta +++ b/Assets/arts/textures/ui/common/common_title_1.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 72, y: 0, z: 72, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_title_2.png b/Assets/arts/textures/ui/common/common_title_2.png index a86de12c3..843271000 100644 Binary files a/Assets/arts/textures/ui/common/common_title_2.png and b/Assets/arts/textures/ui/common/common_title_2.png differ diff --git a/Assets/arts/textures/ui/common/common_title_2.png.meta b/Assets/arts/textures/ui/common/common_title_2.png.meta index 22d2eec7f..fd7f54ae6 100644 --- a/Assets/arts/textures/ui/common/common_title_2.png.meta +++ b/Assets/arts/textures/ui/common/common_title_2.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 22, y: 0, z: 22, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_title_3.png b/Assets/arts/textures/ui/common/common_title_3.png new file mode 100644 index 000000000..334f5096e Binary files /dev/null and b/Assets/arts/textures/ui/common/common_title_3.png differ diff --git a/Assets/arts/textures/ui/common/common_title_3.png.meta b/Assets/arts/textures/ui/common/common_title_3.png.meta new file mode 100644 index 000000000..c0b13876e --- /dev/null +++ b/Assets/arts/textures/ui/common/common_title_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 66f7e9bcf829fc04d816daa40ffaad77 +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: 13, y: 0, z: 84, 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/ui/common/common_title_4.png b/Assets/arts/textures/ui/common/common_title_4.png new file mode 100644 index 000000000..4684d2f22 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_title_4.png differ diff --git a/Assets/arts/textures/ui/common/common_title_4.png.meta b/Assets/arts/textures/ui/common/common_title_4.png.meta new file mode 100644 index 000000000..c9d1cf48b --- /dev/null +++ b/Assets/arts/textures/ui/common/common_title_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 1f0e6d68246796849961cb0680d4f226 +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: 32, y: 0, z: 32, 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/lua/app/common/local_data.lua.bytes b/Assets/lua/app/common/local_data.lua.bytes index 0f3b40a84..19e323aa6 100644 Binary files a/Assets/lua/app/common/local_data.lua.bytes and b/Assets/lua/app/common/local_data.lua.bytes differ diff --git a/Assets/lua/app/common/scheduler_manager.lua.bytes b/Assets/lua/app/common/scheduler_manager.lua.bytes index 245171383..f92f126e2 100644 Binary files a/Assets/lua/app/common/scheduler_manager.lua.bytes and b/Assets/lua/app/common/scheduler_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_manager.lua.bytes b/Assets/lua/app/common/sdk_manager.lua.bytes index e35e00a9f..398bf376f 100644 Binary files a/Assets/lua/app/common/sdk_manager.lua.bytes and b/Assets/lua/app/common/sdk_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes b/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes index 32705cfd5..12bf648f5 100644 Binary files a/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes and b/Assets/lua/app/common/sdk_pay_google_manager.lua.bytes differ diff --git a/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes b/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes index d01f02162..72a34f741 100644 Binary files a/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes and b/Assets/lua/app/common/sdk_pay_ios_manager.lua.bytes differ diff --git a/Assets/lua/app/common/server_push_manager.lua.bytes b/Assets/lua/app/common/server_push_manager.lua.bytes deleted file mode 100644 index 945fbc55a..000000000 Binary files a/Assets/lua/app/common/server_push_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/common/server_push_manager.lua.bytes.meta b/Assets/lua/app/common/server_push_manager.lua.bytes.meta deleted file mode 100644 index f2d41952a..000000000 --- a/Assets/lua/app/common/server_push_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b897677a2c4c21540a8bec9bcc1f8580 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/common/server_push_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/game.lua.bytes b/Assets/lua/app/game.lua.bytes index 2cd1c3424..5d5f2678a 100644 Binary files a/Assets/lua/app/game.lua.bytes and b/Assets/lua/app/game.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index f9558edd0..25abb313c 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/module/base_module.lua.bytes b/Assets/lua/app/module/base_module.lua.bytes index 0ecb3df7c..49c1710b9 100644 Binary files a/Assets/lua/app/module/base_module.lua.bytes and b/Assets/lua/app/module/base_module.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index a3040c439..3d6170dde 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_hero_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_hero_comp.lua.bytes index fe2a58830..0dc863d0d 100644 Binary files a/Assets/lua/app/module/battle/component/battle_hero_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_hero_comp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes index 20d0b4fe0..d02634fae 100644 Binary files a/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes and b/Assets/lua/app/module/battle/component/battle_unit_comp.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes index 43435e3a3..4c6eca56a 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes differ diff --git a/Assets/lua/app/module/gm/gm_const.lua.bytes b/Assets/lua/app/module/gm/gm_const.lua.bytes index d8fa926ed..4f2ea4c08 100644 Binary files a/Assets/lua/app/module/gm/gm_const.lua.bytes and b/Assets/lua/app/module/gm/gm_const.lua.bytes differ diff --git a/Assets/lua/app/module/item/item_const.lua.bytes b/Assets/lua/app/module/item/item_const.lua.bytes index 354b59bce..1e0ff25ae 100644 Binary files a/Assets/lua/app/module/item/item_const.lua.bytes and b/Assets/lua/app/module/item/item_const.lua.bytes differ diff --git a/Assets/lua/app/module/login/login_manager.lua.bytes b/Assets/lua/app/module/login/login_manager.lua.bytes index df9db5453..0715c6c17 100644 Binary files a/Assets/lua/app/module/login/login_manager.lua.bytes and b/Assets/lua/app/module/login/login_manager.lua.bytes differ diff --git a/Assets/lua/app/module/login/login_ui.lua.bytes b/Assets/lua/app/module/login/login_ui.lua.bytes index d40d4302d..45fa64f18 100644 Binary files a/Assets/lua/app/module/login/login_ui.lua.bytes and b/Assets/lua/app/module/login/login_ui.lua.bytes differ diff --git a/Assets/lua/app/module/login/test_login_ui.lua.bytes b/Assets/lua/app/module/login/test_login_ui.lua.bytes index 7014558f3..5c54bd903 100644 Binary files a/Assets/lua/app/module/login/test_login_ui.lua.bytes and b/Assets/lua/app/module/login/test_login_ui.lua.bytes differ diff --git a/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes b/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes index 2642b8356..1777ac3dd 100644 Binary files a/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes and b/Assets/lua/app/module/tutorial/tutorial_manager.lua.bytes differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes b/Assets/lua/app/net/net_manager.lua.bytes deleted file mode 100644 index b5757e174..000000000 Binary files a/Assets/lua/app/net/net_manager.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/net/net_manager.lua.bytes.meta b/Assets/lua/app/net/net_manager.lua.bytes.meta deleted file mode 100644 index 3a089fd64..000000000 --- a/Assets/lua/app/net/net_manager.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4fe965d72695bfa4daf74da6234cb825 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: lua/app/net/net_manager.lua.bytes.ab - assetBundleVariant: diff --git a/Assets/lua/app/server/data/server_player_data.lua.bytes b/Assets/lua/app/server/data/server_player_data.lua.bytes index 7b9ab9feb..b0eb2bcba 100644 Binary files a/Assets/lua/app/server/data/server_player_data.lua.bytes and b/Assets/lua/app/server/data/server_player_data.lua.bytes differ diff --git a/Assets/lua/app/server/server_data_manager.lua.bytes b/Assets/lua/app/server/server_data_manager.lua.bytes index 40d321db1..8fbd1e7c4 100644 Binary files a/Assets/lua/app/server/server_data_manager.lua.bytes and b/Assets/lua/app/server/server_data_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/base_ui.lua.bytes b/Assets/lua/app/ui/base_ui.lua.bytes index a5aa5b5a4..2b334469f 100644 Binary files a/Assets/lua/app/ui/base_ui.lua.bytes and b/Assets/lua/app/ui/base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes b/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes index 47c16693a..97140d091 100644 Binary files a/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes and b/Assets/lua/app/ui/currency_bar/cell/currency_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes b/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes index 37b2737c4..54ab1f75c 100644 Binary files a/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes and b/Assets/lua/app/ui/currency_bar/currency_bar.lua.bytes differ diff --git a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes index 7d325798a..21029f2af 100644 Binary files a/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes and b/Assets/lua/app/ui/gm/gm_tool_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index a4fdf7aab..358753d6e 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/ui_manager.lua.bytes b/Assets/lua/app/ui/ui_manager.lua.bytes index e21a7df6a..a489075e4 100644 Binary files a/Assets/lua/app/ui/ui_manager.lua.bytes and b/Assets/lua/app/ui/ui_manager.lua.bytes differ diff --git a/Assets/lua/app/userdata/bag/item_entity.lua.bytes b/Assets/lua/app/userdata/bag/item_entity.lua.bytes index b300fabb7..433024260 100644 Binary files a/Assets/lua/app/userdata/bag/item_entity.lua.bytes and b/Assets/lua/app/userdata/bag/item_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes index 9750831a8..d6d9c9236 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_team_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes index d05fd65d5..20c20626e 100644 Binary files a/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes and b/Assets/lua/app/userdata/battle/team/battle_unit_entity.lua.bytes differ diff --git a/Assets/lua/app/userdata/player/player_data.lua.bytes b/Assets/lua/app/userdata/player/player_data.lua.bytes index cb0c187b8..cc827891c 100644 Binary files a/Assets/lua/app/userdata/player/player_data.lua.bytes and b/Assets/lua/app/userdata/player/player_data.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 49776e97c..c12e581e6 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -531,7 +531,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 780} + m_AnchoredPosition: {x: 0, y: 900} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3525614029680116551 diff --git a/Assets/prefabs/ui/common/currency_bar.prefab b/Assets/prefabs/ui/common/currency_bar.prefab index 411c2a19f..ebb6b5b04 100644 --- a/Assets/prefabs/ui/common/currency_bar.prefab +++ b/Assets/prefabs/ui/common/currency_bar.prefab @@ -167,7 +167,7 @@ MonoBehaviour: - name: currency_bar.currency_bg.cell_4 hashName: 1141549403 objectType: 1 - gameObject: {fileID: 4039970832972398261} + gameObject: {fileID: 8246831643466723097} - name: currency_bar.currency_bg hashName: 857271722 objectType: 0 @@ -284,7 +284,7 @@ RectTransform: - {fileID: 4247292429286224900} - {fileID: 1280046037160058162} - {fileID: 4981831619176964620} - - {fileID: 5083488745896188779} + - {fileID: 931774164465633991} m_Father: {fileID: 2561740748560008671} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -356,7 +356,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y @@ -368,7 +368,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.y @@ -376,7 +376,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.y @@ -420,7 +420,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.x - value: 317 + value: -165 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.y @@ -462,7 +462,7 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} m_PrefabInstance: {fileID: 1836422279116861915} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3624978467763935469 +--- !u!1001 &3414698326250770200 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -487,7 +487,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y @@ -495,11 +495,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.y @@ -507,7 +507,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.y @@ -551,7 +551,138 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.x - value: 317 + value: -165 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchoredPosition.y + value: 44 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5027233792038082621, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 6706374032331415553, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Name + value: cell_4 + objectReference: {fileID: 0} + - target: {fileID: 9171631231653370479, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ba36e22b1403347479bd2480cc482bac, type: 3} +--- !u!1 &8246831643466723097 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6706374032331415553, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + m_PrefabInstance: {fileID: 3414698326250770200} + m_PrefabAsset: {fileID: 0} +--- !u!224 &931774164465633991 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + m_PrefabInstance: {fileID: 3414698326250770200} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3624978467763935469 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7761110647032532747} + m_Modifications: + - target: {fileID: 361035047743534466, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 509172444929101784, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 573285495742395431, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Layer + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2277269801478349994, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_fontStyle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_SizeDelta.x + value: 119 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} + propertyPath: m_AnchoredPosition.x + value: -165 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.y @@ -593,141 +724,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} m_PrefabInstance: {fileID: 3624978467763935469} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7278115755391360692 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7761110647032532747} - m_Modifications: - - target: {fileID: 361035047743534466, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 509172444929101784, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} - - target: {fileID: 509172444929101784, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - - target: {fileID: 573285495742395431, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 2277269801478349994, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_fontStyle - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_SizeDelta.x - value: 119 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchoredPosition.x - value: 317 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_AnchoredPosition.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5027233792038082621, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - - target: {fileID: 6706374032331415553, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Name - value: cell_4 - objectReference: {fileID: 0} - - target: {fileID: 9171631231653370479, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ba36e22b1403347479bd2480cc482bac, type: 3} ---- !u!1 &4039970832972398261 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6706374032331415553, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - m_PrefabInstance: {fileID: 7278115755391360692} - m_PrefabAsset: {fileID: 0} ---- !u!224 &5083488745896188779 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} - m_PrefabInstance: {fileID: 7278115755391360692} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7398891735789217747 PrefabInstance: m_ObjectHideFlags: 0 @@ -753,7 +749,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_Pivot.y @@ -765,7 +761,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMax.y @@ -773,7 +769,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchorMin.y @@ -817,7 +813,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.x - value: 317 + value: -165 objectReference: {fileID: 0} - target: {fileID: 2561740748560008671, guid: ba36e22b1403347479bd2480cc482bac, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/prefabs/ui/common/currency_cell.prefab b/Assets/prefabs/ui/common/currency_cell.prefab index 07cc25340..892a6ef64 100644 --- a/Assets/prefabs/ui/common/currency_cell.prefab +++ b/Assets/prefabs/ui/common/currency_cell.prefab @@ -543,14 +543,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.9019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 4c8f9db6b4c3d474ebacc7496c8a9693, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -654,7 +654,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -105, y: -4} - m_SizeDelta: {x: 20, y: 21} + m_SizeDelta: {x: 21, y: 21} m_Pivot: {x: 1, y: 0} --- !u!222 &702217771074947370 CanvasRenderer: @@ -684,7 +684,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7e9c0788fba4a824f9213b892c30a542, type: 3} + m_Sprite: {fileID: 21300000, guid: 5065219a9ba54e745b022463cac9dfbf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/gm/gm_tool_ui.prefab b/Assets/prefabs/ui/gm/gm_tool_ui.prefab index 7345f1c50..ad008ae7c 100644 --- a/Assets/prefabs/ui/gm/gm_tool_ui.prefab +++ b/Assets/prefabs/ui/gm/gm_tool_ui.prefab @@ -32,7 +32,7 @@ RectTransform: m_Children: - {fileID: 52919486317584142} m_Father: {fileID: 4309760135240299837} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -67,7 +67,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c10dcfbc15220d48a8f7786aac76c9c, type: 3} + m_Sprite: {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -159,7 +159,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6383736708908456206} - - {fileID: 3140326576318433551} - {fileID: 100827595607548707} - {fileID: 8101303141327760361} - {fileID: 8903186211374003980} @@ -167,8 +166,6 @@ RectTransform: - {fileID: 369260720327177649} - {fileID: 5551135733283908659} - {fileID: 8065582380960818286} - - {fileID: 4555803427096376005} - - {fileID: 6985429145293598935} - {fileID: 3026439774819964873} m_Father: {fileID: 0} m_RootOrder: 0 @@ -271,10 +268,6 @@ MonoBehaviour: hashName: 4098943190 objectType: 0 gameObject: {fileID: 5207626213951444282} - - name: gm_tool_ui.help_btn - hashName: 2855280778 - objectType: 0 - gameObject: {fileID: 1918915833330843149} - name: gm_tool_ui.InputField hashName: 1249334428 objectType: 0 @@ -311,26 +304,10 @@ MonoBehaviour: hashName: 3990135188 objectType: 0 gameObject: {fileID: 2371730363422103184} - - name: gm_tool_ui.hero_list_node - hashName: 1389911594 - objectType: 0 - gameObject: {fileID: 5362728259622261667} - - name: gm_tool_ui.hero_list_node.ScrollView (1) - hashName: 3015172758 - objectType: 0 - gameObject: {fileID: 2815132526995221253} - name: gm_tool_ui.fps_btn hashName: 2932948058 objectType: 0 gameObject: {fileID: 7901796640104032233} - - name: gm_tool_ui.attr_btn - hashName: 4199043898 - objectType: 0 - gameObject: {fileID: 7105197009549459647} - - name: gm_tool_ui.attr_btn.text - hashName: 984293217 - objectType: 0 - gameObject: {fileID: 3129487451442079827} - name: gm_tool_ui.time hashName: 3379131641 objectType: 0 @@ -444,7 +421,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4309760135240299837} - m_RootOrder: 11 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -548,95 +525,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &1918915833330843149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3140326576318433551} - - component: {fileID: 2072408278916011802} - - component: {fileID: 8086003182510050229} - - component: {fileID: 1952695055293710192} - m_Layer: 5 - m_Name: help_btn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3140326576318433551 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918915833330843149} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4309760135240299837} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -75, y: -75} - m_SizeDelta: {x: 22, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2072408278916011802 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918915833330843149} - m_CullTransparentMesh: 1 ---- !u!114 &8086003182510050229 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918915833330843149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b46a149c3890cee418ce5e3933ee8699, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1952695055293710192 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918915833330843149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &2316632798356500799 GameObject: m_ObjectHideFlags: 0 @@ -670,7 +558,7 @@ RectTransform: - {fileID: 6390556443294597411} - {fileID: 8721718971781272282} m_Father: {fileID: 4309760135240299837} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -859,229 +747,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &2815132526995221253 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 593954243365187615} - - component: {fileID: 7332551506111402368} - - component: {fileID: 3670505276430586259} - - component: {fileID: 9063058652397791098} - - component: {fileID: 3673563625892039266} - - component: {fileID: 4684053463801961574} - m_Layer: 5 - m_Name: ScrollView (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &593954243365187615 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4068155115508327600} - m_Father: {fileID: 4555803427096376005} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 609.77844} - m_SizeDelta: {x: 600, y: 979.5569} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7332551506111402368 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_CullTransparentMesh: 1 ---- !u!114 &3670505276430586259 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99031a0a4a18b8e4eb3325c3af030330, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &9063058652397791098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 7281947559705500862} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 4068155115508327600} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &3673563625892039266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e290255ba1add4ababd574322a0843c7, type: 3} - m_Name: - m_EditorClassIdentifier: - isDrag: 0 - contentTrans: {fileID: 0} - bfCell: {fileID: 0} - topRecoveryOffset: 0 - downRecoveryOffset: 0 - direction: 0 - reverse: 0 - cellWidth: 120 - cellHeight: 120 - perLineNum: 5 ---- !u!114 &4684053463801961574 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2815132526995221253} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 0 ---- !u!1 &3129487451442079827 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3792927607697497462} - - component: {fileID: 7044459266574676986} - - component: {fileID: 1663522169867736160} - m_Layer: 5 - m_Name: text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3792927607697497462 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129487451442079827} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 6985429145293598935} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7044459266574676986 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129487451442079827} - m_CullTransparentMesh: 1 ---- !u!114 &1663522169867736160 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3129487451442079827} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: --- !u!1 &3354333649293931443 GameObject: m_ObjectHideFlags: 0 @@ -1240,41 +905,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Enter text... ---- !u!1 &4217373387013256411 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7281947559705500862} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7281947559705500862 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4217373387013256411} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4068155115508327600} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 300} - m_Pivot: {x: 0, y: 1} --- !u!1 &4224913742958271039 GameObject: m_ObjectHideFlags: 0 @@ -1433,186 +1063,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &5362728259622261667 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4555803427096376005} - - component: {fileID: 223865327236393945} - - component: {fileID: 6978654061142177448} - - component: {fileID: 5638863487856429338} - m_Layer: 5 - m_Name: hero_list_node - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &4555803427096376005 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5362728259622261667} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 593954243365187615} - m_Father: {fileID: 4309760135240299837} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &223865327236393945 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5362728259622261667} - m_CullTransparentMesh: 1 ---- !u!114 &6978654061142177448 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5362728259622261667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.74509805} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5638863487856429338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5362728259622261667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 0 ---- !u!1 &5404858282715172693 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4068155115508327600} - - component: {fileID: 4865439560759973570} - - component: {fileID: 593438785680580285} - - component: {fileID: 2240552582036230804} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4068155115508327600 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404858282715172693} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7281947559705500862} - m_Father: {fileID: 593954243365187615} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 600, y: 500} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &4865439560759973570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404858282715172693} - m_CullTransparentMesh: 1 ---- !u!114 &593438785680580285 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404858282715172693} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2240552582036230804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5404858282715172693} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!1 &5719888513225282973 GameObject: m_ObjectHideFlags: 0 @@ -1645,7 +1095,7 @@ RectTransform: m_Children: - {fileID: 5146304003324787983} m_Father: {fileID: 4309760135240299837} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1680,7 +1130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c10dcfbc15220d48a8f7786aac76c9c, type: 3} + m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1826,7 +1276,7 @@ RectTransform: m_Children: - {fileID: 8883190761245195523} m_Father: {fileID: 4309760135240299837} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2032,7 +1482,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4309760135240299837} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2114,7 +1564,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4309760135240299837} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2149,8 +1599,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff2b25bfd721e54448fd65bc8c233e02, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2172,96 +1622,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &7105197009549459647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6985429145293598935} - - component: {fileID: 3429212053999626116} - - component: {fileID: 3129089518524021732} - - component: {fileID: 3536631514561068222} - m_Layer: 5 - m_Name: attr_btn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6985429145293598935 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7105197009549459647} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3792927607697497462} - m_Father: {fileID: 4309760135240299837} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -140, y: 93} - m_SizeDelta: {x: 196, y: 80} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &3429212053999626116 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7105197009549459647} - m_CullTransparentMesh: 1 ---- !u!114 &3129089518524021732 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7105197009549459647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c10dcfbc15220d48a8f7786aac76c9c, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3536631514561068222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7105197009549459647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &7901796640104032233 GameObject: m_ObjectHideFlags: 0 @@ -2294,7 +1654,7 @@ RectTransform: m_Children: - {fileID: 7473633628125359465} m_Father: {fileID: 4309760135240299837} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2329,7 +1689,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c10dcfbc15220d48a8f7786aac76c9c, type: 3} + m_Sprite: {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2421,7 +1781,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2c10dcfbc15220d48a8f7786aac76c9c, type: 3} + m_Sprite: {fileID: 21300000, guid: c005d0dc9d400304ca941b48135dcb04, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index 97b23399f..958654889 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -537,7 +537,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4