diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 89e49d556..d8c1c069e 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -24,6 +24,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 85e741dcfd8f49442aeb8c4312368284, type: 3} - {fileID: 21300000, guid: 1897f70a24c544805a8f49875deed806, type: 3} - {fileID: 21300000, guid: 7e76c5c0bc5094487819ae959505d911, type: 3} + - {fileID: 21300000, guid: 6b434e39d39a744539f9f26657e09b5c, type: 3} - {fileID: 21300000, guid: 48d0ce961c004480496b0f8c4dc07755, type: 3} - {fileID: 21300000, guid: a9f3c445050d741e295f32d4f791279a, type: 3} - {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} @@ -183,4 +184,4 @@ MonoBehaviour: - {fileID: 21300000, guid: ea999318fddbe45f3876d9d152fcc20c, type: 3} - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a121385034973951349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 + spriteNameList: e9a43d8deaa43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a7712e57a7712f57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a296d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a4a6d861a4b6d861a4c6d861a8e243e8d626d861a636d861a646d861a656d861a666d861a676d861a686d861a696d861a6a6d861a6b6d861a8f243e8d816d861a826d861a91243e8d92243e8d93243e8d5ff0dec4f7dba86df8dba86df9dba86dfadba86da3c7820ca4c7820ca5c7820c01853b1974546eb890c9348d7fea0537be2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590e8b0b1a47776d27553a6ac67d33eeca7e33eeca7f33eecab833eeca20ecadc9a4a121385034973951349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30160398e369606d8f83e25472704398e34ac4708fb4e19f42b5e19f42b6e19f427a737b477b737b477c737b477d737b477e737b477f737b47f116cb47252af848262af848272af848282af848292af8486e97448da07f7c4ea17f7c4ea27f7c4ea37f7c4e26d06cd827d06cd828d06cd8f03a2d357551fb694faf2d359d83f5979e83f5979f83f597a083f597a183f597611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bb66a811be8a0d140b76a811ba9a4d14003f2ab54ed355bf9f022f4ccf122f4ccf222f4ccf322f4ccf422f4ccf522f4ccf622f4ccf722f4cca15c468dbe552355bf552355c0552355c1552355c2552355c569b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index a0568aefc..9f5a0eaa7 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -168,6 +168,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} - {fileID: 21300000, guid: b9e8cd393ec7543a39842eba6fe4f055, type: 3} + - {fileID: 21300000, guid: 6b434e39d39a744539f9f26657e09b5c, type: 3} - {fileID: 21300000, guid: e307a649d1c444bb89c5fc94044f2b41, type: 3} - {fileID: 21300000, guid: f777fe49e692d4008bf92f7a1ee40fd4, type: 3} - {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} @@ -339,6 +340,7 @@ SpriteAtlas: - common_btn_blue_2 - common_bg_2 - common_tab_bg + - common_arrow_9 - common_star_3 - common_bg_31 - common_bottom_bg_1 diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png index c038e3199..4cdebc21b 100644 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png and b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png.meta index 80a06d08c..173967421 100644 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png.meta +++ b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png deleted file mode 100644 index 07e0bd1d8..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png.meta deleted file mode 100644 index 885e26f25..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_2.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: e7fb7e3443d40764ea757c1cbb08e5f7 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png deleted file mode 100644 index 716ad9e74..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png.meta deleted file mode 100644 index f02e12fb3..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_3.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: b29feedb9b84593419af5b7e101449e5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png deleted file mode 100644 index 51d107e79..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png deleted file mode 100644 index c2b4e80a9..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png.meta deleted file mode 100644 index 1a5992199..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_5.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 1c198e213aae94c93a75a3dc5250d387 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png deleted file mode 100644 index 276c6b021..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png.meta deleted file mode 100644 index 91be8e980..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_6.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 4ff78b3258c7e4676be0442ef0f1f6f4 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png deleted file mode 100644 index 7fa4695ec..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png.meta deleted file mode 100644 index 72b2eeb64..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_7.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 081db0f1b11344ca381649d93109c8da -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png deleted file mode 100644 index 2edf7bda7..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png.meta deleted file mode 100644 index 288a9995e..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_board_1.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: a55da99d6e1df4e5d977ba7a15ad8a87 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 45 - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png deleted file mode 100644 index 485d58352..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png.meta deleted file mode 100644 index 317f4afec..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_1.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 1d265d031a9a84c01bddae7106ce473e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png deleted file mode 100644 index 6ae7c8de1..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png.meta deleted file mode 100644 index 843e775b6..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_2.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 8a9de50ab792b4a9a8c1a17700072df0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png deleted file mode 100644 index 78c10f8e3..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png.meta deleted file mode 100644 index a342d5248..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_3.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: f9aeac305664c4e00be85f82f9c71065 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png deleted file mode 100644 index d36bb03fa..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png.meta deleted file mode 100644 index f4af1c1e4..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_4.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 1e5b05f7a6a0043f4b06ec5c32a5309d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png deleted file mode 100644 index 3cd0827cd..000000000 Binary files a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png and /dev/null differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png.meta b/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png.meta deleted file mode 100644 index 9eca31a77..000000000 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_dec_5.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: b60c8facb75184f89b8afa7ed6881405 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png index 5ae19b6b3..10746b7a3 100644 Binary files a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png and b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png differ diff --git a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png.meta b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png.meta index 11218a7e9..18ec226f4 100644 --- a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png.meta +++ b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png b/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png index 325cfa04d..611f39b29 100644 Binary files a/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png and b/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png differ diff --git a/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png.meta b/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png.meta index faf66e5a8..0a8736b43 100644 --- a/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png.meta +++ b/Assets/arts/textures/background/act_sevenday_signin/act_sevenday_signin_banner.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_2.png b/Assets/arts/textures/background/dungeon/dungeon_banner_2.png index 637feee5a..af36aea90 100644 Binary files a/Assets/arts/textures/background/dungeon/dungeon_banner_2.png and b/Assets/arts/textures/background/dungeon/dungeon_banner_2.png differ diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_2.png.meta b/Assets/arts/textures/background/dungeon/dungeon_banner_2.png.meta index 106fbdbaa..897e79d92 100644 --- a/Assets/arts/textures/background/dungeon/dungeon_banner_2.png.meta +++ b/Assets/arts/textures/background/dungeon/dungeon_banner_2.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_3.png b/Assets/arts/textures/background/dungeon/dungeon_banner_3.png index 00b624e01..dd9f277b6 100644 Binary files a/Assets/arts/textures/background/dungeon/dungeon_banner_3.png and b/Assets/arts/textures/background/dungeon/dungeon_banner_3.png differ diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_3.png.meta b/Assets/arts/textures/background/dungeon/dungeon_banner_3.png.meta index 07dc06330..6357930d8 100644 --- a/Assets/arts/textures/background/dungeon/dungeon_banner_3.png.meta +++ b/Assets/arts/textures/background/dungeon/dungeon_banner_3.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_4.png b/Assets/arts/textures/background/dungeon/dungeon_banner_4.png index 8d87aca31..6c99a3f4b 100644 Binary files a/Assets/arts/textures/background/dungeon/dungeon_banner_4.png and b/Assets/arts/textures/background/dungeon/dungeon_banner_4.png differ diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_4.png.meta b/Assets/arts/textures/background/dungeon/dungeon_banner_4.png.meta index 8b48985bf..6fdfd239d 100644 --- a/Assets/arts/textures/background/dungeon/dungeon_banner_4.png.meta +++ b/Assets/arts/textures/background/dungeon/dungeon_banner_4.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_5.png b/Assets/arts/textures/background/dungeon/dungeon_banner_5.png index 44bf78c8e..69f042bc0 100644 Binary files a/Assets/arts/textures/background/dungeon/dungeon_banner_5.png and b/Assets/arts/textures/background/dungeon/dungeon_banner_5.png differ diff --git a/Assets/arts/textures/background/dungeon/dungeon_banner_5.png.meta b/Assets/arts/textures/background/dungeon/dungeon_banner_5.png.meta index 6f52f42d9..14e071261 100644 --- a/Assets/arts/textures/background/dungeon/dungeon_banner_5.png.meta +++ b/Assets/arts/textures/background/dungeon/dungeon_banner_5.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/fund/fund_banner_1.png b/Assets/arts/textures/background/fund/fund_banner_1.png index 14ca58be3..7d1c7f909 100644 Binary files a/Assets/arts/textures/background/fund/fund_banner_1.png and b/Assets/arts/textures/background/fund/fund_banner_1.png differ diff --git a/Assets/arts/textures/background/fund/fund_banner_1.png.meta b/Assets/arts/textures/background/fund/fund_banner_1.png.meta index c52ea838e..84d46b2f7 100755 --- a/Assets/arts/textures/background/fund/fund_banner_1.png.meta +++ b/Assets/arts/textures/background/fund/fund_banner_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/fund/fund_banner_2.png b/Assets/arts/textures/background/fund/fund_banner_2.png index 7540cffab..f75dedca0 100644 Binary files a/Assets/arts/textures/background/fund/fund_banner_2.png and b/Assets/arts/textures/background/fund/fund_banner_2.png differ diff --git a/Assets/arts/textures/background/fund/fund_banner_2.png.meta b/Assets/arts/textures/background/fund/fund_banner_2.png.meta index 9df1b3242..29e224333 100755 --- a/Assets/arts/textures/background/fund/fund_banner_2.png.meta +++ b/Assets/arts/textures/background/fund/fund_banner_2.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/fund/fund_banner_3.png b/Assets/arts/textures/background/fund/fund_banner_3.png deleted file mode 100644 index a438c44bd..000000000 Binary files a/Assets/arts/textures/background/fund/fund_banner_3.png and /dev/null differ diff --git a/Assets/arts/textures/background/fund/fund_banner_3.png.meta b/Assets/arts/textures/background/fund/fund_banner_3.png.meta deleted file mode 100755 index d6cb20114..000000000 --- a/Assets/arts/textures/background/fund/fund_banner_3.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 0b531fc9751de794cacc8ac0361cdd4b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/background/fund/fund_banner_3.png.ab - assetBundleVariant: diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png b/Assets/arts/textures/background/hero/hero_bg_1.png deleted file mode 100644 index 06e2cd0b7..000000000 Binary files a/Assets/arts/textures/background/hero/hero_bg_1.png and /dev/null differ diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png.meta b/Assets/arts/textures/background/hero/hero_bg_1.png.meta deleted file mode 100644 index 6cac198f7..000000000 --- a/Assets/arts/textures/background/hero/hero_bg_1.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: c1391c00779f94042a70980a40ea66b1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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 - ignoreMasterTextureLimit: 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: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - 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: 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: Standalone - 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: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: arts/textures/background/hero/hero_bg_1.png.ab - assetBundleVariant: diff --git a/Assets/arts/textures/background/hero/hero_bg_2.png b/Assets/arts/textures/background/hero/hero_bg_2.png index 2741b34d3..9a1ed13ce 100644 Binary files a/Assets/arts/textures/background/hero/hero_bg_2.png and b/Assets/arts/textures/background/hero/hero_bg_2.png differ diff --git a/Assets/arts/textures/background/hero/hero_bg_2.png.meta b/Assets/arts/textures/background/hero/hero_bg_2.png.meta index 467857cbf..d2008849e 100644 --- a/Assets/arts/textures/background/hero/hero_bg_2.png.meta +++ b/Assets/arts/textures/background/hero/hero_bg_2.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/background/login/login_1.png b/Assets/arts/textures/background/login/login_1.png index 0d523bb8b..03c6db8ec 100644 Binary files a/Assets/arts/textures/background/login/login_1.png and b/Assets/arts/textures/background/login/login_1.png differ diff --git a/Assets/arts/textures/background/login/login_1.png.meta b/Assets/arts/textures/background/login/login_1.png.meta index 6da388dae..b27d85f15 100644 --- a/Assets/arts/textures/background/login/login_1.png.meta +++ b/Assets/arts/textures/background/login/login_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -69,7 +69,7 @@ TextureImporter: buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 45 + textureFormat: 47 textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/arts/textures/background/shop/shop_bg_1.png b/Assets/arts/textures/background/shop/shop_bg_1.png index f3e7d1518..379ba5625 100644 Binary files a/Assets/arts/textures/background/shop/shop_bg_1.png and b/Assets/arts/textures/background/shop/shop_bg_1.png differ diff --git a/Assets/arts/textures/background/shop/shop_bg_1.png.meta b/Assets/arts/textures/background/shop/shop_bg_1.png.meta index 95a5ba230..dff43abbc 100755 --- a/Assets/arts/textures/background/shop/shop_bg_1.png.meta +++ b/Assets/arts/textures/background/shop/shop_bg_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta b/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta index a3107c2cc..83741cccb 100644 --- a/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta +++ b/Assets/arts/textures/background/summon/bg_a_cj_shixiang01.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/summon/bg_cj_2_shixiang02.png.meta b/Assets/arts/textures/background/summon/bg_cj_2_shixiang02.png.meta index d80236127..d24cce639 100644 --- a/Assets/arts/textures/background/summon/bg_cj_2_shixiang02.png.meta +++ b/Assets/arts/textures/background/summon/bg_cj_2_shixiang02.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/summon/bg_cj_3_shitai.png.meta b/Assets/arts/textures/background/summon/bg_cj_3_shitai.png.meta index 26a24613d..89f90e943 100644 --- a/Assets/arts/textures/background/summon/bg_cj_3_shitai.png.meta +++ b/Assets/arts/textures/background/summon/bg_cj_3_shitai.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/summon/bg_cj_4_beijing01.png.meta b/Assets/arts/textures/background/summon/bg_cj_4_beijing01.png.meta index b777107fa..518f2bf8c 100644 --- a/Assets/arts/textures/background/summon/bg_cj_4_beijing01.png.meta +++ b/Assets/arts/textures/background/summon/bg_cj_4_beijing01.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/summon/bg_cj_5_beijing02.png.meta b/Assets/arts/textures/background/summon/bg_cj_5_beijing02.png.meta index 6a0dab91b..7bcba9847 100644 --- a/Assets/arts/textures/background/summon/bg_cj_5_beijing02.png.meta +++ b/Assets/arts/textures/background/summon/bg_cj_5_beijing02.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/background/talent/talent_bg_1.png b/Assets/arts/textures/background/talent/talent_bg_1.png index ea17ed3c1..ddb83e6d6 100644 Binary files a/Assets/arts/textures/background/talent/talent_bg_1.png and b/Assets/arts/textures/background/talent/talent_bg_1.png differ diff --git a/Assets/arts/textures/background/talent/talent_bg_1.png.meta b/Assets/arts/textures/background/talent/talent_bg_1.png.meta index d70b8119f..693e381f4 100644 --- a/Assets/arts/textures/background/talent/talent_bg_1.png.meta +++ b/Assets/arts/textures/background/talent/talent_bg_1.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 diff --git a/Assets/arts/textures/ui/common/common_arrow_9.png b/Assets/arts/textures/ui/common/common_arrow_9.png new file mode 100644 index 000000000..9d1d171c3 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_arrow_9.png differ diff --git a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png.meta b/Assets/arts/textures/ui/common/common_arrow_9.png.meta similarity index 93% rename from Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png.meta rename to Assets/arts/textures/ui/common/common_arrow_9.png.meta index 85dce5c59..4ea538b10 100644 --- a/Assets/arts/textures/background/act_gogogo/act_gogogo_bg_4.png.meta +++ b/Assets/arts/textures/ui/common/common_arrow_9.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb9cb5eaf78dd4ba585a596928dc82dc +guid: 6b434e39d39a744539f9f26657e09b5c TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -39,10 +39,10 @@ TextureImporter: wrapU: 1 wrapV: 1 wrapW: 1 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -90,19 +90,19 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: DefaultTexturePlatform + buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 + textureFormat: 12 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Standalone + buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -131,7 +131,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/arts/textures/ui/common/common_btn_blue_1.png b/Assets/arts/textures/ui/common/common_btn_blue_1.png index b2929a37b..b449ef843 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_blue_1.png and b/Assets/arts/textures/ui/common/common_btn_blue_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_blue_2.png b/Assets/arts/textures/ui/common/common_btn_blue_2.png index 6a182082e..a2f49f2fb 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_blue_2.png and b/Assets/arts/textures/ui/common/common_btn_blue_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_blue_3.png b/Assets/arts/textures/ui/common/common_btn_blue_3.png index 8dd89467a..aa35d1cf2 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_blue_3.png and b/Assets/arts/textures/ui/common/common_btn_blue_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_green_1.png b/Assets/arts/textures/ui/common/common_btn_green_1.png index 9aad78b9f..1ea9062af 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_green_1.png and b/Assets/arts/textures/ui/common/common_btn_green_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_green_3.png b/Assets/arts/textures/ui/common/common_btn_green_3.png index 874288f7f..6be229508 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_green_3.png and b/Assets/arts/textures/ui/common/common_btn_green_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_green_l.png b/Assets/arts/textures/ui/common/common_btn_green_l.png index 1aee61e18..23bc422f4 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_green_l.png and b/Assets/arts/textures/ui/common/common_btn_green_l.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_grey_1.png b/Assets/arts/textures/ui/common/common_btn_grey_1.png index c2844e365..eaf5a1ca0 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_grey_1.png and b/Assets/arts/textures/ui/common/common_btn_grey_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_grey_2.png b/Assets/arts/textures/ui/common/common_btn_grey_2.png index fe7daed5f..f137b3740 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_grey_2.png and b/Assets/arts/textures/ui/common/common_btn_grey_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_grey_3.png b/Assets/arts/textures/ui/common/common_btn_grey_3.png index 241755b27..9531250b5 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_grey_3.png and b/Assets/arts/textures/ui/common/common_btn_grey_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_red_3.png b/Assets/arts/textures/ui/common/common_btn_red_3.png index a9d9c1217..bab2bc85f 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_red_3.png and b/Assets/arts/textures/ui/common/common_btn_red_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_1.png b/Assets/arts/textures/ui/common/common_btn_yellow_1.png index 86cbf3d33..4e94b918b 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_1.png and b/Assets/arts/textures/ui/common/common_btn_yellow_1.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_2.png b/Assets/arts/textures/ui/common/common_btn_yellow_2.png index ad1f53121..27a1f697a 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_2.png and b/Assets/arts/textures/ui/common/common_btn_yellow_2.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_3.png b/Assets/arts/textures/ui/common/common_btn_yellow_3.png index e2a36f9b9..b02d9926d 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_3.png and b/Assets/arts/textures/ui/common/common_btn_yellow_3.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_yellow_l.png b/Assets/arts/textures/ui/common/common_btn_yellow_l.png index 46e6d44fe..62f32a86d 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_yellow_l.png and b/Assets/arts/textures/ui/common/common_btn_yellow_l.png differ diff --git a/Assets/lua/app/ui/dungeon/cell/dungeon_cell.lua.bytes b/Assets/lua/app/ui/dungeon/cell/dungeon_cell.lua.bytes index 9071905cf..a75f5ab09 100644 Binary files a/Assets/lua/app/ui/dungeon/cell/dungeon_cell.lua.bytes and b/Assets/lua/app/ui/dungeon/cell/dungeon_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab index 29413c4f3..6969dc07b 100644 --- a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab @@ -5653,7 +5653,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 13, y: 0} - m_SizeDelta: {x: 726, y: 927} + m_SizeDelta: {x: 1024, y: 1024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1915219615784406703 CanvasRenderer: diff --git a/Assets/prefabs/ui/activity/common/comp/act_bounty_comp_v1.prefab b/Assets/prefabs/ui/activity/common/comp/act_bounty_comp_v1.prefab index 9373b889e..34f1133a7 100644 --- a/Assets/prefabs/ui/activity/common/comp/act_bounty_comp_v1.prefab +++ b/Assets/prefabs/ui/activity/common/comp/act_bounty_comp_v1.prefab @@ -2064,7 +2064,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 370} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7334495464591488787 CanvasRenderer: diff --git a/Assets/prefabs/ui/activity/common/comp/act_gift_comp_v1.prefab b/Assets/prefabs/ui/activity/common/comp/act_gift_comp_v1.prefab index 3e723810b..0c3737eac 100644 --- a/Assets/prefabs/ui/activity/common/comp/act_gift_comp_v1.prefab +++ b/Assets/prefabs/ui/activity/common/comp/act_gift_comp_v1.prefab @@ -208,7 +208,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 370} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2628499158174732495 CanvasRenderer: diff --git a/Assets/prefabs/ui/activity/common/comp/act_score_task_comp_v1.prefab b/Assets/prefabs/ui/activity/common/comp/act_score_task_comp_v1.prefab index cd62954fd..046354935 100644 --- a/Assets/prefabs/ui/activity/common/comp/act_score_task_comp_v1.prefab +++ b/Assets/prefabs/ui/activity/common/comp/act_score_task_comp_v1.prefab @@ -212,7 +212,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 370} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2108152701834269729 CanvasRenderer: diff --git a/Assets/prefabs/ui/activity/common/comp/act_task_comp_v1.prefab b/Assets/prefabs/ui/activity/common/comp/act_task_comp_v1.prefab index 7ac452425..cc11ef0ad 100644 --- a/Assets/prefabs/ui/activity/common/comp/act_task_comp_v1.prefab +++ b/Assets/prefabs/ui/activity/common/comp/act_task_comp_v1.prefab @@ -596,7 +596,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 370} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5277821167436912804 CanvasRenderer: diff --git a/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab b/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab index 5760b513f..f7e99d685 100644 --- a/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab +++ b/Assets/prefabs/ui/dungeon/cell/dungeon_cell.prefab @@ -508,8 +508,8 @@ RectTransform: m_GameObject: {fileID: 1575849421638856931} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5828080759366237347} m_Father: {fileID: 3027587056725166769} @@ -518,7 +518,7 @@ RectTransform: 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: 690, y: 210} + m_SizeDelta: {x: 1024, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4583328214801080642 CanvasRenderer: @@ -588,7 +588,7 @@ RectTransform: - {fileID: 1811134697225347678} - {fileID: 8003089876935758996} m_Father: {fileID: 813747427171530857} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -626,7 +626,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 813747427171530857} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -730,6 +730,79 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2553043031852816196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2300969258920823826} + - component: {fileID: 5185247871180306810} + - component: {fileID: 3491275997487675973} + m_Layer: 5 + m_Name: banner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2300969258920823826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553043031852816196} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 813747427171530857} + 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: 1024, y: 512} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5185247871180306810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553043031852816196} + m_CullTransparentMesh: 1 +--- !u!114 &3491275997487675973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2553043031852816196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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_Texture: {fileID: 2800000, guid: 35afce24affb64e03a96ff1152a836d6, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &2557271225632598772 GameObject: m_ObjectHideFlags: 0 @@ -1032,6 +1105,7 @@ GameObject: - component: {fileID: 1272546627481621148} - component: {fileID: 2364627489923594421} - component: {fileID: 7676584532651441369} + - component: {fileID: 6442386555401123411} m_Layer: 5 m_Name: dungeon_cell m_TagString: Untagged @@ -1142,6 +1216,30 @@ MonoBehaviour: hashName: 3607521908 objectType: 0 gameObject: {fileID: 188610727632987720} + - name: dungeon_cell.content.banner + hashName: 3000994632 + objectType: 0 + gameObject: {fileID: 2553043031852816196} +--- !u!114 &6442386555401123411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6095855634328596335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: [] --- !u!1 &6860730755800138793 GameObject: m_ObjectHideFlags: 0 @@ -1176,7 +1274,7 @@ RectTransform: - {fileID: 2368121253222837672} - {fileID: 3204193875136214285} m_Father: {fileID: 813747427171530857} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1228,7 +1326,6 @@ GameObject: m_Component: - component: {fileID: 813747427171530857} - component: {fileID: 7812422020817896563} - - component: {fileID: 1632150713427517439} m_Layer: 5 m_Name: content m_TagString: Untagged @@ -1248,6 +1345,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2300969258920823826} - {fileID: 7059909669517154590} - {fileID: 3648193327629179679} - {fileID: 9100612839475556804} @@ -1267,33 +1365,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7227597757940300044} m_CullTransparentMesh: 1 ---- !u!114 &1632150713427517439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7227597757940300044} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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_Texture: {fileID: 2800000, guid: 35afce24affb64e03a96ff1152a836d6, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1001 &21532775641642624 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab index 6c0582766..bd09f4114 100644 --- a/Assets/prefabs/ui/fund/fund_chapter_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_chapter_comp.prefab @@ -2463,7 +2463,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 373} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4594304111367787504 CanvasRenderer: diff --git a/Assets/prefabs/ui/fund/fund_level_comp.prefab b/Assets/prefabs/ui/fund/fund_level_comp.prefab index 4ad081d30..9a811c7d9 100644 --- a/Assets/prefabs/ui/fund/fund_level_comp.prefab +++ b/Assets/prefabs/ui/fund/fund_level_comp.prefab @@ -3247,7 +3247,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 373} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4594304111367787504 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index bad671b83..6e219e005 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -12849,7 +12849,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 820} - m_SizeDelta: {x: 1280, y: 704} + m_SizeDelta: {x: 2048, y: 1024} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1001773250344339554 CanvasRenderer: diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index 29abc2290..0e022d731 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -648,7 +648,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 704} + m_SizeDelta: {x: 2048, y: 1024} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5776738430689340897 CanvasRenderer: diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index 15481ed09..4c47ebefc 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -710,7 +710,7 @@ RectTransform: 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: 1280, y: 1800} + m_SizeDelta: {x: 2048, y: 2048} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3490449373812790973 CanvasRenderer: diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index 797a4d810..678be6000 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -2026,7 +2026,7 @@ RectTransform: 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: 1280, y: 1800} + m_SizeDelta: {x: 2048, y: 2048} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3490449373812790973 CanvasRenderer: diff --git a/Assets/prefabs/ui/shop/shop_comp.prefab b/Assets/prefabs/ui/shop/shop_comp.prefab index 5ccb9b628..15e9bfc20 100644 --- a/Assets/prefabs/ui/shop/shop_comp.prefab +++ b/Assets/prefabs/ui/shop/shop_comp.prefab @@ -4211,7 +4211,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 358} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7930238584372898267 CanvasRenderer: diff --git a/Assets/prefabs/ui/sign/sign_week_comp.prefab b/Assets/prefabs/ui/sign/sign_week_comp.prefab index 21a3f30d1..bcb142f61 100644 --- a/Assets/prefabs/ui/sign/sign_week_comp.prefab +++ b/Assets/prefabs/ui/sign/sign_week_comp.prefab @@ -36,7 +36,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 28} - m_SizeDelta: {x: 1280, y: 390} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1967765976660475271 CanvasRenderer: diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab index a0cfb4e2b..d7ebd5ef9 100644 --- a/Assets/prefabs/ui/talent/talent_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -1979,7 +1979,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1280, y: 360} + m_SizeDelta: {x: 2048, y: 512} m_Pivot: {x: 0.5, y: 1} --- !u!222 &175397954408035054 CanvasRenderer: