diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_12801_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_12801_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_12801_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_12801_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_128_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_128_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_128_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_128_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta index 569398095b..2c3449566e 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7d326efded35273479ca213776851301 +guid: 7237ddc52a9935342b0d7b976bd2ec26 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 7b8af099034756448b8b448e8795858f + spriteID: 42948dc7529d5cc4ba8b9dad5f982b96 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta index d349d2ffcb..03b9984a3b 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 38a25ea50f2918544b450a8b0c53d069 +guid: 65b470166ee2c1841abf324011a74115 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 2f9a0bf65e1413e48ba42ef1c162634f + spriteID: 281980e28e8be244a88f80a295632882 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_3001_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_3001_zh.png.meta index 112f660230..97cf6e66b6 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_3001_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_3001_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9781bd16df34fe342a8e05e35c5faa83 +guid: 9c4c5407596d5544183ba71947155a5b TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 55385ea3d98996844bbc160730e38039 + spriteID: 3135e7a60a5b04445b8b9aa88cfbb42f vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_30_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_30_zh.png.meta index 72a5112fc2..5cd161a462 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_30_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_30_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f1c57ea4b31ed846a0467453950c61f +guid: ff8a8594c08f2ac4dbaf0035b9a82c83 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 0630ddc02ac10df4caf8cda972114af1 + spriteID: 46b2a298e178c994a9b88840d453b24f vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_32801_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_32801_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_32801_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_32801_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_328_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_328_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_328_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_328_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_64801_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_64801_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_64801_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_64801_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_648_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_648_zh.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_648_zh.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_648_zh.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_6801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_6801_zh.png.meta index dfeefccd20..8d79c57843 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_6801_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_6801_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e26c62ef16ec49459309c4dc23e6203 +guid: 3443cbc107da78a45bb84ad95baf6212 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 9b98dcdb8f0fe3341ba12e41d9a14c83 + spriteID: ef5e1670e9c2ab54c9349642aaea263b vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_68_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_68_zh.png.meta index beff0ac176..2436498243 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_68_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_68_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f09e12a20c52bf43aa5b7b485afb802 +guid: f72b2f5754c24c24a935ad11347f50e3 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,17 +58,6 @@ TextureImporter: 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: DefaultTexturePlatform maxTextureSize: 2048 @@ -80,6 +69,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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 @@ -97,7 +97,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 908940bd9ad091741a86d9cb86639450 + spriteID: 36de3e36ce813f14e9287acb667a5951 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta index 203267cdf8..ca44e74422 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_9801_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78ef5a2e12c7b874ba187ece4e09f331 +guid: 09b31198682c1e145850ebd62b6fafb0 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +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: [] outline: [] physicsShape: [] bones: [] - spriteID: 4c84bb0de6f3b064cbb1372a3c5aa168 + spriteID: e156e5efb0bc07d478c4f9d1c5d7c634 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta index 2ede2d2bd9..78df1ed3ab 100644 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_98_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c65f45305b109444a7da398f28803c5 +guid: cf0186c0acf55f042ac4812fcf628007 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +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: [] outline: [] physicsShape: [] bones: [] - spriteID: b6c4838b4c47f164eb680c2edb74df2e + spriteID: d5843219d58144e44b3ad01dd83ccc1a vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png deleted file mode 100644 index 853fdcba0b..0000000000 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png.meta deleted file mode 100644 index 8b60dfee2d..0000000000 --- a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: d2dbe3e9691e0044a96d9db98f68dc83 -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: c7e5415b8b4fc634a908c6a27dd5623c - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: ActivityAltas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_yunmenghaoli.png similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_yunmenghaoli.png diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_yunmenghaoli.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png.meta rename to Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_yunmenghaoli.png.meta diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png deleted file mode 100644 index 853fdcba0b..0000000000 Binary files a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png and /dev/null differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta deleted file mode 100644 index 25585db5ef..0000000000 --- a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta +++ /dev/null @@ -1,110 +0,0 @@ -fileFormatVersion: 2 -guid: de105e0b502669b4a8d041080102f3f3 -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: 18e67996862c09348ae40c8435f79e23 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: ActivityAltas - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab index 10728eb675..49b2c2669f 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -10413,7 +10413,7 @@ GameObject: - component: {fileID: 1840810670127487897} - component: {fileID: 133398133577368481} m_Layer: 5 - m_Name: Image + m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -73207,6 +73207,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6134713526808563783} + - {fileID: 1387155719728620643} m_Father: {fileID: 1827622887959451477} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -73550,6 +73551,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 289} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8263640375141437750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1387155719728620643} + - component: {fileID: 1365787314003315482} + - component: {fileID: 8926982133153186192} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1387155719728620643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8263640375141437750} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3380624864063840572} + 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} + m_AnchoredPosition: {x: 0, y: -92.4} + m_SizeDelta: {x: 350, y: 62.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1365787314003315482 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8263640375141437750} + m_CullTransparentMesh: 0 +--- !u!114 &8926982133153186192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8263640375141437750} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 300 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7ACB\u5373\u5145\u503C" + LanguageIndex: 0 --- !u!1 &8271044505972646621 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index e958f0950e..1fafc30466 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -585,6 +585,7 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.recruitTreasure_one) CheckRedPointStatus(RedPointType.recruitTreasure_two) CheckRedPointStatus(RedPointType.recruitTreasure_three) + CheckRedPointStatus(RedPointType.yunmenghaoli) end function this.GetContinuityRechargeRedPoint() diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index c35db3a0c1..1be74c5436 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -21,7 +21,7 @@ function DailyRechargePanel:InitComponent() cursortingOrder = 0 self.backBtnNew = Util.GetGameObject(self.transform, "BG") self.backBtn = Util.GetGameObject(self.transform, "frame") - self.title = Util.GetGameObject(self.backBtn, "bg/title/Image (1)"):GetComponent("Image") + self.title = Util.GetGameObject(self.backBtn, "bg/title"):GetComponent("Image") self.select = Util.GetGameObject(self.backBtn, "bg/select") self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image") @@ -37,7 +37,8 @@ function DailyRechargePanel:InitComponent() --提示框 self.titleParent = Util.GetGameObject(self.backBtn, "bg/Image") - self.titleIcon = Util.GetGameObject(self.titleParent, "Image"):GetComponent("Image") + self.titleParent.gameObject:SetActive(true) + self.titleIcon = Util.GetGameObject(self.titleParent, "icon"):GetComponent("Image") self.titleText = Util.GetGameObject(self.titleParent, "Text"):GetComponent("Text") self.extra = Util.GetGameObject(self.backBtn,"bg/descbg") @@ -66,6 +67,7 @@ function DailyRechargePanel:InitComponent() self.dealBtn = Util.GetGameObject(self.backBtn,"bg/dealBtn") self.dealText = Util.GetGameObject(self.dealBtn, "Text"):GetComponent("Text") + self.dealTipText = Util.GetGameObject(self.dealBtn, "tip"):GetComponent("Text") self.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.transform, "frame/UI_effect_DailyRechargePanel_particle") if self.moneyNum then @@ -74,10 +76,10 @@ function DailyRechargePanel:InitComponent() end if not self.moneyNum then self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.extra.transform, - 0, MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) + 0, MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 0.85, Vector2.New(60, 100), Vector2.New(20, -7.44), MoneyNumViewImageType.Big_1) end - self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) - self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) + + self.moneyNum.transform:SetSiblingIndex(2) end @@ -105,13 +107,16 @@ end function DailyRechargePanel:OnOpen(actType) self.actType = actType + LogGreen("self.actType:"..self.actType) self.data = {} if self.actType == ActivityTypeDef.DailyRecharge then self.data.title = "r_mrcz_biaoti_zh" self.data.tip = "免\n费\n领\n取\n1\n次" + self.data.tip2 = "免费领取1次" else self.data.title = "r_yunmenghaoli" self.data.tip = "每\n日\n仅\n限\n1\n次" + self.data.tip2 = "每日仅限1次" end isFirstOpen = true Timer.New(function () @@ -131,7 +136,9 @@ function DailyRechargePanel:OnSortingOrderChange() end function DailyRechargePanel:OnShow() self.title.sprite = self.spLoader:LoadSprite(self.data.title) + self.title:SetNativeSize() self.titleText.text = self.data.tip + self.dealTipText.text = self.data.tip2 self.actInfo = ActivityGiftManager.GetActivityTypeInfo(self.actType) if not self.actInfo then @@ -156,19 +163,30 @@ function DailyRechargePanel:SetGrid() self.items[i].go.gameObject:SetActive(false) else self.items[i].go.gameObject:SetActive(true) + local config = actRewardConfig[self.actInfo.mission[i].missionId] if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]].defaultImaRMB) + self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultImaRMB) else - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]].defaultIma) + self.items[i].priceText.sprite = self.spLoader:LoadSprite(missionIndex[config.Values[1][1]].defaultIma) end + self.items[i].priceText:SetNativeSize() end end + index = 0 for i = 1,#self.actInfo.mission do - if self.actInfo.mission[i].state == 0 then + if self.actInfo.mission[i].state == 2 then index = i break end end + if index == 0 then + for i = 1,#self.actInfo.mission do + if self.actInfo.mission[i].state == 0 then + index = i + break + end + end + end if index == 0 then index = #self.actInfo.mission end @@ -210,7 +228,11 @@ function DailyRechargePanel:RefreshPanel() self.missionInfo = self.actInfo.mission[index] local actRewardConfig1 = actRewardConfig[self.missionInfo.missionId] if self.actType == ActivityTypeDef.DailyRecharge then + self.titleIcon.gameObject:SetActive(true) + self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) + self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) if self.missionInfo.state == 0 then + self.dealTipText.gameObject:SetActive(true) if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) then self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1]) self.extraTip.gameObject:SetActive(false) @@ -230,28 +252,25 @@ function DailyRechargePanel:RefreshPanel() self.extraTip.gameObject:SetActive(false) self.dealText.text = Language[10101] self.moneyNum.gameObject:SetActive(false) + self.dealTipText.gameObject:SetActive(false) end else + self.moneyNum:SetOffsetPosition(Vector2.New(436.4, -99.24)) + self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, 0)) + self.titleIcon.gameObject:SetActive(false) + self.extraTip.gameObject:SetActive(true) + self.extraIcon.sprite = self.spLoader:LoadSprite(icon[2]) + self.moneyNum.gameObject:SetActive(true) + self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) + self.moneyNum:SetRateEnabled(false) + self.extraTip.text = actRewardConfig1.ContentsShow + self.dealTipText.gameObject:SetActive(true) if self.missionInfo.state == 0 then - self.extraTip.gameObject:SetActive(true) - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[3]) - self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) - self.extraTip.text = actRewardConfig1.ContentsShow self.dealText.text = "立即前往" elseif self.missionInfo.state == 2 then - self.extraTip.gameObject:SetActive(true) - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[3]) - self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) - self.extraTip.text = actRewardConfig1.ContentsShow self.dealText.text = Language[10018] else - self.extraTip.gameObject:SetActive(true) - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[3]) - self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) - self.extraTip.text = actRewardConfig1.ContentsShow + self.dealTipText.gameObject:SetActive(false) self.dealText.text = Language[10101] end end @@ -295,7 +314,7 @@ function DailyRechargePanel:OnDealBtnClicked() CheckRedPointStatus(RedPointType.yunmenghaoli) end) else - JumpManager.GoJump(actRewardConfig[self.missionInfo.missionId].Jump,function(isJump) + JumpManager.GoJump(actRewardConfig[self.missionInfo.missionId].Jump[1],function(isJump) if isJump then self:ClosePanel() end @@ -308,8 +327,8 @@ end function DailyRechargePanel:RefreshRedShow() for i = 1,#self.actInfo.mission do if self.items[i] and self.items[i].redpot then - if self.actInfo.mission[i].state == 0 - and (DailyRechargeManager.ReceivedEnabled(self.actInfo.mission[i].missionId) or self.actInfo.mission[i].state == 2) then + if (self.actInfo.mission[i].state == 0 and DailyRechargeManager.ReceivedEnabled(self.actInfo.mission[i].missionId)) + or self.actInfo.mission[i].state == 2 then self.items[i].redpot:SetActive(true) else self.items[i].redpot:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua index c5425270cc..2b0f813c70 100644 --- a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua +++ b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua @@ -176,6 +176,7 @@ function MoneyNumView:SetNumShow(numList,num) ForceRebuildLayout(self.Image_Num_Horizontal.transform) ForceRebuildLayout(self.Image_Num_Vertical.transform) end + -- 设置图片数字显示 function MoneyNumView:SetMarkShow(img1, img2) local config = ImageTypeConfig[self.imgType][MoneyUtil.MT] @@ -199,6 +200,30 @@ function MoneyNumView:SetMarkShow(img1, img2) end end +function MoneyNumView:SetRateEnabled(isShow) + local config = ImageTypeConfig[self.imgType][MoneyUtil.MT] + if not config then + return + end + local imgGo + + if self.viewType == MoneyNumViewType.Image_Vertical then + if config.type == PositionType.Down_Or_Right then + imgGo = self.V_Image_2 + elseif config.type == PositionType.Up_Or_Left then + imgGo = self.V_Image_1 + end + elseif self.viewType == MoneyNumViewType.Image_Horizontal then + if config.type == PositionType.Down_Or_Right then + imgGo = self.H_Image_2 + elseif config.type == PositionType.Up_Or_Left then + imgGo = self.H_Image_1 + end + end + + imgGo.gameObject:SetActive(isShow) +end + function MoneyNumView:SetNum(num) if not num then return