diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png new file mode 100644 index 0000000000..853fdcba0b Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png 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 new file mode 100644 index 0000000000..8b60dfee2d --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi 1.png.meta @@ -0,0 +1,110 @@ +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/ArtFont/r_mrcz_danbichognzhi.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi.png new file mode 100644 index 0000000000..853fdcba0b Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi.png.meta new file mode 100644 index 0000000000..4db4e1b167 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_danbichognzhi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6eb3c99ac2d4b904498f8587fbd9875a +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: 136898efae74fd04e9198dea93cfc2ec + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png new file mode 100644 index 0000000000..58ee74a5c2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png.meta new file mode 100644 index 0000000000..e334069a98 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_12801_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: ff4060e3471137c43b2bbc86aa02c870 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8b6d8da9ba890c240823db8f9fa03f96 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png new file mode 100644 index 0000000000..2918d9a119 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png.meta new file mode 100644 index 0000000000..ad869a1803 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_128_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d5d185133908a7642a144f470a8ca1e6 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 60549735043066b4f849fec5c9034814 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png new file mode 100644 index 0000000000..62c8a9b14c Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png.meta new file mode 100644 index 0000000000..90c3557111 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_32801_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: bc48f95829fd76b4fabc00197e2b6564 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 925db9ffd8bdd264fa174e1f9ab7d3ff + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png new file mode 100644 index 0000000000..c70818be00 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png.meta new file mode 100644 index 0000000000..3b6e30b213 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_328_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b5a1d7810a9e01e4f9f1f552bbaa1c16 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a6dce130815d21745b5d48852841cc32 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png new file mode 100644 index 0000000000..005244544a Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png.meta new file mode 100644 index 0000000000..7f975bd5f8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_64801_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 0e8e6546abb5e0a47b3e3f3ec0bf3b54 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: df4de340c81dc2645a21d27d70b512ab + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png new file mode 100644 index 0000000000..b64bed6199 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png.meta new file mode 100644 index 0000000000..619909bb50 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_648_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 52559cc0d0f97554dbf7392f45129c14 +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2ce1692273dcccb42abf86742c14e708 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png new file mode 100644 index 0000000000..853fdcba0b Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta new file mode 100644 index 0000000000..25585db5ef --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_mrcz_danbichognzhi.png.meta @@ -0,0 +1,110 @@ +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/Atlas/ActivityAltas/r_yunmenghaoli.png b/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png new file mode 100644 index 0000000000..0c35ae65d1 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png.meta new file mode 100644 index 0000000000..4605ababeb --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/r_yunmenghaoli.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b8826c511812d2d4380e6c8d15be077b +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: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6fae94e969cace24d8de7cad86d5822f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ExploreAtlas.meta b/Assets/ManagedResources/Atlas/ExploreAtlas.meta new file mode 100644 index 0000000000..d96f8e6d31 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ExploreAtlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe6ccb1eb9d47f84b8145f1eaa2bb62b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta b/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta new file mode 100644 index 0000000000..04a7c38d00 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/icon_laohu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fd84a911e75574940b78b5f7af498666 +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: -1 + 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: 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: a42760fd031893342b13514a87cd16f8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta b/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta new file mode 100644 index 0000000000..14b59df1e8 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 1502ed9fbc718e746bed78959c8525a2 +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: -1 + 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: 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: 5688656a951efb54f84cc853d6127f65 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + 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 79cd3a5810..10728eb675 100644 --- a/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DailyRecharge/DailyRechargePanel.prefab @@ -5478,7 +5478,7 @@ ParticleSystem: --- !u!199 &2354433741197601756 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10342,7 +10342,7 @@ ParticleSystem: --- !u!199 &5956073811931346453 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15188,7 +15188,7 @@ ParticleSystem: --- !u!199 &3084721924200596586 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19852,7 +19852,7 @@ ParticleSystem: --- !u!199 &7219835548946671208 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24582,7 +24582,7 @@ ParticleSystem: --- !u!199 &4483407068625840474 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29399,7 +29399,7 @@ ParticleSystem: --- !u!199 &5281604567971093730 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34065,7 +34065,7 @@ ParticleSystem: --- !u!199 &960990334070116420 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38735,7 +38735,7 @@ ParticleSystem: --- !u!199 &2908334587361720478 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -44124,7 +44124,7 @@ ParticleSystem: --- !u!199 &5267689660684975518 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -49062,7 +49062,7 @@ ParticleSystem: --- !u!199 &502326602796470647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53866,7 +53866,7 @@ ParticleSystem: --- !u!199 &7096311306230442960 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58866,7 +58866,7 @@ ParticleSystem: --- !u!199 &6385063830131163877 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63708,7 +63708,7 @@ ParticleSystem: --- !u!199 &2064444826016825663 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68412,7 +68412,7 @@ ParticleSystem: --- !u!199 &7345999168660669427 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -73116,7 +73116,7 @@ ParticleSystem: --- !u!199 &6490173722387353867 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -78189,7 +78189,7 @@ ParticleSystem: --- !u!199 &2835172599494294876 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83224,7 +83224,7 @@ ParticleSystem: --- !u!199 &6724645511641999293 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87965,7 +87965,7 @@ ParticleSystem: --- !u!199 &7612499050146219184 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 756bb391bc..3b65d999ee 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -743,6 +743,8 @@ RedPointType = { SecretBox = 257, --秘盒 Recruit = 258,-- 招募 DailyRecharge = 259,--每日首充 + yunmenghaoli = 9301,--每日首充 + --- 外敌------------- Alien = 260, ---招财猫 @@ -1398,6 +1400,7 @@ ActivityTypeDef = { chaozhifanli30 = 92, XinRenShop = 91, -- 新人商城 + yunmenghaoli = 93, --云梦好礼 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua index 4f5f535936..aeeb6e46f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargeManager.lua @@ -62,6 +62,18 @@ function this.CheckRedPoint() return false end +function this.CheckRedPointYunmeng() + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.yunmenghaoli) + if dailyActInfo and #dailyActInfo.mission > 0 then + for i = 1, #dailyActInfo.mission do + if dailyActInfo.mission[i].state == 2 then + return true + end + end + end + return false +end + function this.DailyRechargeReset() this.InitRechargeStatus() Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { @@ -82,4 +94,17 @@ function this.GetDailyRechargeExist() return true end +function this.GetyunmengyouliExist() + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.yunmenghaoli) + if not dailyActInfo or #dailyActInfo.mission < 1 then + return false + end + for i = 1,#dailyActInfo.mission do + if dailyActInfo.mission[i].state ~= 1 then + return true + end + end + return false +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index b3c149981a..c35db3a0c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -6,18 +6,26 @@ local index = 0 local cursortingOrder local isFirstOpen = false local missionIndex = { - [1] = {tipText = "免费领取超值豪礼",selectImaRMB = "r_mrcz_18_zh",selectIma = "r_mrcz_18_zh",defaultImaRMB = "r_mrcz_1801_zh",defaultIma = "r_mrcz_1801_zh"}, - [2] = {tipText = "免费领取18元,30元两档超级豪礼",selectImaRMB = "r_mrcz_30_zh",selectIma = "r_mrcz_30_zh",defaultImaRMB = "r_mrcz_3001_zh",defaultIma = "r_mrcz_3001_zh"}, - [3] = {tipText = "三重档位超值豪礼尽收囊中",selectImaRMB = "r_mrcz_98_zh",selectIma = "r_mrcz_98_zh",defaultImaRMB = "r_mrcz_9801_zh",defaultIma = "r_mrcz_9801_zh"}, + [18] = {selectIma = "r_mrcz_18_zh",selectImaRMB = "r_mrcz_18_zh",defaultIma = "r_mrcz_1801_zh",defaultImaRMB = "r_mrcz_1801_zh"}, + [30] = {selectIma = "r_mrcz_30_zh",selectImaRMB = "r_mrcz_30_zh",defaultIma = "r_mrcz_3001_zh",defaultImaRMB = "r_mrcz_3001_zh"}, + [68] = {selectIma = "r_mrcz_68_zh",selectImaRMB = "r_mrcz_68_zh",defaultIma = "r_mrcz_6801_zh",defaultImaRMB = "r_mrcz_6801_zh"}, + [98] = {selectIma = "r_mrcz_98_zh",selectImaRMB = "r_mrcz_98_zh",defaultIma = "r_mrcz_9801_zh",defaultImaRMB = "r_mrcz_9801_zh"}, + [128] = {selectIma = "r_mrcz_128_zh",selectImaRMB = "r_mrcz_128_zh",defaultIma = "r_mrcz_12801_zh",defaultImaRMB = "r_mrcz_12801_zh"}, + [328] = {selectIma = "r_mrcz_328_zh",selectImaRMB = "r_mrcz_328_zh",defaultIma = "r_mrcz_32801_zh",defaultImaRMB = "r_mrcz_32801_zh"}, + [648] = {selectIma = "r_mrcz_648_zh",selectImaRMB = "r_mrcz_648_zh",defaultIma = "r_mrcz_64801_zh",defaultImaRMB = "r_mrcz_64801_zh"}, } + function DailyRechargePanel:InitComponent() self.spLoader = SpriteLoader.New() 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.select = Util.GetGameObject(self.backBtn, "bg/select") self.selectIma = Util.GetGameObject(self.select, "Text"):GetComponent("Image") + self.grid = Util.GetGameObject(self.backBtn, "bg/grid") self.items = {} for i = 1,self.grid.transform.childCount do @@ -25,13 +33,9 @@ function DailyRechargePanel:InitComponent() self.items[i].go = Util.GetGameObject(self.grid,"item"..i) self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Image") self.items[i].redpot = Util.GetGameObject(self.items[i].go,"red") - if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[i].defaultImaRMB) - else - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[i].defaultIma) - end end + --提示框 self.titleParent = Util.GetGameObject(self.backBtn, "bg/Image") self.titleIcon = Util.GetGameObject(self.titleParent, "Image"):GetComponent("Image") self.titleText = Util.GetGameObject(self.titleParent, "Text"):GetComponent("Text") @@ -99,17 +103,24 @@ function DailyRechargePanel:BindEvent() end end -function DailyRechargePanel:OnOpen() +function DailyRechargePanel:OnOpen(actType) + self.actType = actType + self.data = {} + if self.actType == ActivityTypeDef.DailyRecharge then + self.data.title = "r_mrcz_biaoti_zh" + self.data.tip = "免\n费\n领\n取\n1\n次" + else + self.data.title = "r_yunmenghaoli" + self.data.tip = "每\n日\n仅\n限\n1\n次" + end isFirstOpen = true Timer.New(function () isFirstOpen = false end, 1.5):Start() end function DailyRechargePanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, self.RefreshPanel, self) end function DailyRechargePanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, self.RefreshPanel, self) end function DailyRechargePanel:OnSortingOrderChange() Util.AddParticleSortLayer( self.UI_effect_DailyRechargePanel_particle, self.sortingOrder - cursortingOrder) @@ -119,8 +130,12 @@ function DailyRechargePanel:OnSortingOrderChange() cursortingOrder = self.sortingOrder end function DailyRechargePanel:OnShow() - self.actInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + self.title.sprite = self.spLoader:LoadSprite(self.data.title) + self.titleText.text = self.data.tip + + self.actInfo = ActivityGiftManager.GetActivityTypeInfo(self.actType) if not self.actInfo then + self:ClosePanel() return end self.activityId = self.actInfo.activityId @@ -141,7 +156,11 @@ function DailyRechargePanel:SetGrid() self.items[i].go.gameObject:SetActive(false) else self.items[i].go.gameObject:SetActive(true) - --self.items[i].priceText.text = MoneyUtil.GetMoneyUnitNameWithMoney(actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]) + if MoneyUtil.MT == MoneyType.RMB then + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]].defaultImaRMB) + else + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[i].missionId].Values[1][1]].defaultIma) + end end end for i = 1,#self.actInfo.mission do @@ -171,6 +190,7 @@ end local icon = { [0] = "r_mrcz_zi_111_zh", [1] = "r_mrcz_zi_33_zh", + [2] = "r_mrcz_danbichognzhi", } function DailyRechargePanel:SetSelectBtn() @@ -179,9 +199,9 @@ function DailyRechargePanel:SetSelectBtn() self.select.transform:SetSiblingIndex(1) self.select.transform.localPosition = Vector3.zero if MoneyUtil.MT == MoneyType.RMB then - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[index].selectImaRMB) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectImaRMB) else - self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[index].selectIma) + self.selectIma.sprite = self.spLoader:LoadSprite(missionIndex[actRewardConfig[self.actInfo.mission[index].missionId].Values[1][1]].selectIma) end end @@ -189,27 +209,53 @@ function DailyRechargePanel:RefreshPanel() self:SetSelectBtn() self.missionInfo = self.actInfo.mission[index] local actRewardConfig1 = actRewardConfig[self.missionInfo.missionId] - if self.missionInfo.state == 0 then - if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) then + if self.actType == ActivityTypeDef.DailyRecharge then + if self.missionInfo.state == 0 then + if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) then + self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1]) + self.extraTip.gameObject:SetActive(false) + self.dealText.text = Language[10018] + self.moneyNum.gameObject:SetActive(false) + else + self.extraIcon.sprite = self.spLoader:LoadSprite(icon[0]) + self.extraTip.gameObject:SetActive(true) + self.extraTip.text = actRewardConfig1.ContentsShow + self.dealText.text = "立即前往" + self.moneyNum.gameObject:SetActive(true) + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + self.moneyNum:SetNumShow(1,(actRewardConfig1.Values[1][1] - dailyActInfo.value)) + end + else self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1]) self.extraTip.gameObject:SetActive(false) - self.dealText.text = Language[10018] + self.dealText.text = Language[10101] self.moneyNum.gameObject:SetActive(false) - else - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[0]) - self.extraTip.gameObject:SetActive(true) - self.extraTip.text = missionIndex[index].tipText - self.dealText.text = "立即前往" - self.moneyNum.gameObject:SetActive(true) - local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) - self.moneyNum:SetNumShow(1,(actRewardConfig1.Values[1][1] - dailyActInfo.value)) end else - self.extraIcon.sprite = self.spLoader:LoadSprite(icon[1]) - self.extraTip.gameObject:SetActive(false) - self.dealText.text = Language[10101] - self.moneyNum.gameObject:SetActive(false) + 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.dealText.text = Language[10101] + end end + self.extraIcon:SetNativeSize() table.walk(self.rewardList, function(rewardPosItem) rewardPosItem.gameObject:SetActive(false) @@ -231,9 +277,7 @@ function DailyRechargePanel:RefreshPanel() self.rewardContentbg[i].gameObject:SetActive(true) end end) - self.titleText.text = "免\n费\n领\n取\n1\n次" SetTextVerTial(self.titleText,Vector3.New(102.07,18.2,0)) - -- 刷新红点显示 self:RefreshRedShow() end @@ -242,21 +286,20 @@ function DailyRechargePanel:OnDealBtnClicked() if self.missionInfo.state == 1 then PopupTipPanel.ShowTip(Language[10421]) else - if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) then + if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) or self.missionInfo.state == 2 then NetManager.GetActivityRewardRequest(self.missionInfo.missionId, self.activityId, function(_drop) UIManager.OpenPanel(UIName.RewardItemPopup, _drop, 1) - Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose, { - type = ActivityTypeDef.DailyRecharge, - status = 0 - }) + self:RefreshPanel() + Game.GlobalEvent:DispatchEvent(GameEvent.Activity.OnActivityOpenOrClose,{type = self.actType}) + CheckRedPointStatus(RedPointType.DailyRecharge) + CheckRedPointStatus(RedPointType.yunmenghaoli) end) else - if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then - PopupTipPanel.ShowTip(Language[10422]) - return - end - JumpManager.GoJump(36008) - self:ClosePanel() + JumpManager.GoJump(actRewardConfig[self.missionInfo.missionId].Jump,function(isJump) + if isJump then + self:ClosePanel() + end + end) end end end @@ -266,7 +309,7 @@ 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) then + 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/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6a93a3325e..92ef3f99ce 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1009,7 +1009,7 @@ function this:TabBtnAction(id,actType,data) elseif id == ActivityTypeDef.WarPowerSort then UIManager.OpenPanel(UIName.WarPowerSortPanel) elseif id == ActivityTypeDef.DailyRecharge then - UIManager.OpenPanel(UIName.DailyRechargePanel) + UIManager.OpenPanel(UIName.DailyRechargePanel,id) elseif id == ActivityTypeDef.DemonSlayer then UIManager.OpenPanel(UIName.DemonSlayerPanel) elseif id == ActivityTypeDef.DemonSlayerNew then @@ -1076,6 +1076,8 @@ function this:TabBtnAction(id,actType,data) local day = TimeToD(GetTimeStamp()) PlayerPrefs.SetInt("chaozhifanli"..PlayerManager.uid,day) CheckRedPointStatus(RedPointType.chaozhifanli) + elseif id == ActivityTypeDef.yunmenghaoli then + UIManager.OpenPanel(UIName.DailyRechargePanel,id) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then @@ -1576,6 +1578,8 @@ function this.RefreshActivityBtn(context) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.FunType and v.FunType == 41 then showTab = DailyRechargeManager.GetDailyRechargeExist() + elseif v.ActiveType == ActivityTypeDef.yunmenghaoli then + showTab = DailyRechargeManager.GetyunmengyouliExist() elseif v.ActiveType == 20000 then local tempConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[activityId].ShowArt,"PageType",0,"ActiveType",v.ActiveType) if not tempConfig then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 0a3678c47c..4c3d11478b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -429,6 +429,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.SevenDayCarnival, SevenDayCarnivalManager.GetSevenDayCarnivalRedPoint) --每日首充 RPData:AddCheckFunc(RedPointType.DailyRecharge, DailyRechargeManager.CheckRedPoint, FUNCTION_OPEN_TYPE.DailyRecharge) + --每日首充 + RPData:AddCheckFunc(RedPointType.yunmenghaoli, DailyRechargeManager.CheckRedPointYunmeng) --累计签到 RPData:AddCheckFunc(RedPointType.CumulativeSignIn,OperatingManager.GetSignInRedPointStatus) RPData:AddCheckFunc(RedPointType.Setting_Ride,PlayerManager.GetPlayerRideRedPoint)