diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui.png.meta new file mode 100644 index 0000000000..23aa75e170 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-baibaoshanghui.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b0ad34711c14d4647bc6bf6c0c8306f2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d685b601201d6424cbccd7b667a8b7bb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta new file mode 100644 index 0000000000..80532512b0 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bianhuanmoce.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: daa9e87fe41ba8e40acf1c62ad462013 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 69ea88a2111c4b34596a465b2ff1b1cb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi.png.meta new file mode 100644 index 0000000000..6af5d88aaa --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-bowenduoshi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ae0207b0336cd8b479fdcc2a60ed4172 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 454a575509c07e746b5e631ee16fc213 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue.png.meta new file mode 100644 index 0000000000..72b421df44 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-danxinbixue.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0171c9a586e0b3a48bd1b6f2291dd72d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: c1be525e002b22145a16a2711c896f07 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-kaifuli.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-kaifuli.png.meta new file mode 100644 index 0000000000..a317dd1daf --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-kaifuli.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 7e14aef7e16f0fe40a13a114bf9096d0 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4894c5541f9fa0849b4f45d7e85833da + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong.png.meta new file mode 100644 index 0000000000..a438ea1931 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-niuqichongchong.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b3104794d5c79cd47ba8ae9a9dfa508d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8cd89dfafa33a0e4a97cca4e56ed7499 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng.png.meta new file mode 100644 index 0000000000..98e514997a --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qikaidesheng.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2f674f9e897ab0c43a88f1c2bef75547 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 49c3bdd00372d864c8be23b84d1f5817 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji.png.meta new file mode 100644 index 0000000000..4c8fb9ec86 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon_dengfengzaoji.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 04f7cc0d024eecc44a1b895d622723a1 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5b4dff058676161419f986a69b39bf5c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang.png similarity index 100% rename from Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png rename to Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang.png diff --git a/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang.png.meta similarity index 96% rename from Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta rename to Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang.png.meta index 0a0c13914c..9222a6d026 100644 --- a/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang_zh.png.meta +++ b/Assets/ManagedResources/Atlas/MonsterCampAtlas/ArtFont/r_paihang.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2bdb53b239504a94384457d20b331b97 +guid: e2dae0b844cfe4445a060f2477e7ffdf TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 0d4c320276c5eae4583ade5f5169fed1 + spriteID: 439f57ef751380243b4719265e8cf209 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004.png similarity index 100% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004.png diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004.png.meta similarity index 96% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004.png.meta index 21b436331f..f5f8c305f0 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner004.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec0341d1274b36d45bda8e67198bf94c +guid: 98a06c6aba220ec499387c9261b1a6ca TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: fda98aff76f95ab46ac118d58245d0ae + spriteID: 3ff7cdd09dcf0904a96aee3df02f9322 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01.png similarity index 100% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01.png diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01.png.meta similarity index 96% rename from Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01.png.meta index d1d76c4c76..4c74d6ea92 100644 --- a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 44215d30c7968104bb14cc43d10c6a35 +guid: f1bcaadbe208c7b4ea80fd40516859c8 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 460edfb40a6a06e49b9897301e00bff1 + spriteID: f084b9c4cff6bf641bf4ca91ca32714f vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta deleted file mode 100644 index 75aa4d9cd6..0000000000 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner01_zh.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: 7fa9d3736bf094a478fddff35e5aee7f -TextureImporter: - fileIDToRecycleName: - 21300000: r_zjm_paihangbang_banner01_zh - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: r_zjm_paihangbang_banner01_zh - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 958 - height: 334 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 891cc87e1bc9a21458e50101b7fb6511 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 1a9a98629dbba9442abc5f7047ba34c4 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: lz4/dynamicatlas/artfont/r_zjm_paihangbang_banner01_zh - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02.png similarity index 100% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02.png diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02.png.meta similarity index 69% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02.png.meta index 44891f6647..7253388c82 100644 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner02.png.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 47193cd77cc3fc04d86aa463e3720803 +guid: 828548f1477700e4280ed50f0b2a4f88 TextureImporter: - fileIDToRecycleName: - 21300000: r_zjm_paihangbang_banner02_zh + fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: @@ -92,44 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: r_zjm_paihangbang_banner02_zh - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 958 - height: 334 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 603690e89eebd5b41ad80b72e5b5e705 - vertices: [] - indices: - edges: [] - weights: [] + sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 6ecf4b5fcc2d3234e8023717da698863 + spriteID: 492a3ef4a87dc8a4db0503603d070e86 vertices: [] indices: edges: [] @@ -138,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/artfont/r_zjm_paihangbang_banner02_zh - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03.png similarity index 100% rename from Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03.png diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03.png.meta new file mode 100644 index 0000000000..9e67b94537 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2f4ed9daea1c7bc4bb8eae47adb68c1f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f8974c6297f3dd549ac61aa5107b75d4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta deleted file mode 100644 index 74d9524f05..0000000000 --- a/Assets/ManagedResources/DynamicAtlas/ArtFont/r_zjm_paihangbang_banner03_zh.png.meta +++ /dev/null @@ -1,142 +0,0 @@ -fileFormatVersion: 2 -guid: 90c7594ee5d3082408475924c3bac2d7 -TextureImporter: - fileIDToRecycleName: - 21300000: r_zjm_paihangbang_banner03_zh - externalObjects: {} - serializedVersion: 9 - 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 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 2 - aniso: -1 - mipBias: -100 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: iPhone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 57 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: r_zjm_paihangbang_banner03_zh - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 958 - height: 334 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: cb38273cad21d3748a70dd6df3a36135 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: e09810d6b67d7c9448b6bb3c6f1599da - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: lz4/dynamicatlas/artfont/r_zjm_paihangbang_banner03_zh - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4.png similarity index 100% rename from Assets/ManagedResources/DynamicAtlas/r_richang_banner_4_zh.png rename to Assets/ManagedResources/DynamicAtlas/r_richang_banner_4.png diff --git a/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4.png.meta b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4.png.meta new file mode 100644 index 0000000000..e18ffece0f --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/r_richang_banner_4.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a400a93d7b7ace441a1cda323ef8dfea +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 03dc6ab1859c4a5448a82e512906f528 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 757962c720..93dfe6ca02 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3057,10 +3057,10 @@ BATTLE_TYPE = { } --isRankingMainPanelShow:_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人) --本服排行 -rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "山河排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1,sort=2}, - [2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2,sort=3}, - [3] = { bgImage = "r_zjm_paihangbang_banner03_zh", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3,sort=5}, - [4] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12099] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 4,sort=4}, +rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004", name = "山河排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1,sort=2}, + [2] = { bgImage = "r_zjm_paihangbang_banner02", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2,sort=3}, + [3] = { bgImage = "r_zjm_paihangbang_banner03", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3,sort=5}, + [4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12099] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 4,sort=4}, --达人部分 [5] = { bgImage = "", name = Language[12100] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = 0,RankingListMainSortId = 9}, [6] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 10}, @@ -3101,7 +3101,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "山 [35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [37] = { bgImage = "", name = "探索排行" ,rankType = RANK_TYPE.ExploreRank,activiteId = 0,isRankingMainPanelShow = false}, - [38] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 9,sort = 1}, + [38] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 9,sort = 1}, [39] = { bgImage = "", name = "升星排行" ,rankType = RANK_TYPE.UpStar,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [40] = { bgImage = "", name = "装备排行" ,rankType = RANK_TYPE.EquipRank,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [41] = { bgImage = "", name = "法术排行" ,rankType = RANK_TYPE.SoulSign,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 6113bee5f7..7e0f5ff70c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -17,7 +17,7 @@ local titleBg={ --金币 [1]={bg="z_zhaohuan_banner_01", titleImg = "驭灵副本", titleTip = GetLanguageStrById(specialConfig[41].Value),pos = Vector3.New(257.08,658.37,0)}, --经验 - [2]={bg="r_richang_banner_4_zh", titleImg = "仙灵副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, + [2]={bg="r_richang_banner_4", titleImg = "仙灵副本", titleTip = GetLanguageStrById(specialConfig[42].Value),pos = Vector3.New(257.08,651.24,0)}, --神将 [3]={bg="r_richang_banner_3_zh", titleImg = "神将副本", titleTip = GetLanguageStrById(specialConfig[43].Value),pos = Vector3.New(257.08,658.37,0)}, --法宝