diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png new file mode 100644 index 0000000000..2396b4ef04 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png.meta new file mode 100644 index 0000000000..8f446edc61 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_banner.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 95a5df5d07c445a4f9666cd6ddf9e2b8 +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: 3dc23f889201f7f47a8c249e41528f18 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png new file mode 100644 index 0000000000..db5f666fd7 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png.meta new file mode 100644 index 0000000000..c9e411f364 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon1_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a4f69149775089f4b806881591644a7f +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: 85f37a0521318f344a8add614f61a168 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png new file mode 100644 index 0000000000..2c58a1e0c9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png.meta new file mode 100644 index 0000000000..087e71572d --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_xianjingleichong_icon2_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9d009f083308a91489f833acbaf063a6 +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: 4eed6b7445293774c8a9c4cc5026ca33 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png new file mode 100644 index 0000000000..4171b61ae9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png.meta new file mode 100644 index 0000000000..0fc5929f4e --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_banner.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 62677a14dfe3ab640814ec09c6e32985 +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: 3cc12193e73566542ac2b7be01efc1d0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png new file mode 100644 index 0000000000..053066273e Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png.meta new file mode 100644 index 0000000000..cd438acae3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon1_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: d3b1563b9629da74b8cc83ec285600a2 +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: 7af9e74cb6fbfae4fa6cec5da4413433 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png new file mode 100644 index 0000000000..f93a035da2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png.meta new file mode 100644 index 0000000000..1b20a79fba --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_yaojingleichong_icon2_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 2ffc10fd498f63b45979694caa85a561 +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: 767327b4c1c94f74c90f9f70ad710d66 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 9d42d886b1..d993e0cace 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -882,6 +882,8 @@ RedPointType = { --Expert_LuckyTurn= 1118,--秘宝达人 Expert_Expedition= 3126,--天宫达人 Expert_Slhj= 3170,--森罗幻境达人 + Expert_YJLC= 3188,--妖晶累充 + Expert_XJLC= 3189,--仙晶累充 Expert_WeekCard= 3150,--周卡 Expert_YunYouMan = 3128,--云游商人 --战力排行 达标战力 @@ -1490,6 +1492,9 @@ ActivityTypeDef = { shuaChongTeQuan = 10301,--刷冲特权 KaiFuChongBang = 110,--开服冲榜 Song10Wan = 112,--送10万真充 + yaojingleichong = 113,--妖晶累充 + xianjingleichong = 114,--仙晶累充 + } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index c4a4834c36..03889c9591 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -642,6 +642,8 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.Expert_SecretBox) CheckRedPointStatus(RedPointType.Expert_Expedition) CheckRedPointStatus(RedPointType.Expert_Slhj) + CheckRedPointStatus(RedPointType.Expert_YJLC) + CheckRedPointStatus(RedPointType.Expert_XJLC) CheckRedPointStatus(RedPointType.zhognzhichengcheng) --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) @@ -734,6 +736,13 @@ function this.ExpterActivityIsShowRedPoint(activeIndex) activeType = math.floor(activeIndex % 100) ----LogGreen("activeType "..activeType) local expertRewardTabs = this.GetActivityTypeInfo(activeType) + if not expertRewardTabs then + local activityGroupConfig=ConfigManager.GetConfigDataByKey(ConfigName.ActivityGroups,"RpType",activeIndex) + if activityGroupConfig then + activeType=activityGroupConfig.ActiveType + expertRewardTabs = this.GetActivityTypeInfo(activeType) + end + end if expertRewardTabs then for i = 1, #expertRewardTabs.mission do local conFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, expertRewardTabs.mission[i].missionId) @@ -741,6 +750,8 @@ function this.ExpterActivityIsShowRedPoint(activeIndex) --限时累计活动特殊数值读取处理 if activeType == ActivityTypeDef.AccumulativeRechargeExper or activeType == ActivityTypeDef.zhongzhichengcheng then value = conFigData.Values[1][1] + elseif activeType == ActivityTypeDef.yaojingleichong or activeType == ActivityTypeDef.xianjingleichong then + value = conFigData.Values[1][2] else value = conFigData.Values[2][1] end diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua index eddbdfe14f..6205bb8885 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/AllActivityManager.lua @@ -148,6 +148,8 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.Expert_SecretBox) CheckRedPointStatus(RedPointType.Expert_Expedition) CheckRedPointStatus(RedPointType.Expert_Slhj) + CheckRedPointStatus(RedPointType.Expert_YJLC) + CheckRedPointStatus(RedPointType.Expert_XJLC) --战力排行 CheckRedPointStatus(RedPointType.WarPowerSort_Sort) --东海寻仙 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 98473da02a..5095e32495 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -102,6 +102,12 @@ local TypeUpdateFunc = { [ActivityTypeDef.DynamicAct_recharge] = function ()---周累计充值 this.GetMissionData(1,ActivityTypeDef.DynamicAct_recharge) end, + [ActivityTypeDef.yaojingleichong] = function ()---妖晶累充 + this.GetMissionData(1,ActivityTypeDef.yaojingleichong) + end, + [ActivityTypeDef.xianjingleichong] = function ()---仙晶累充 + this.GetMissionData(1,ActivityTypeDef.xianjingleichong) + end, [ActivityTypeDef.TaSuiLingXiao] = function ()--踏碎凌霄 local curData = dataList[ActivityTypeDef.TaSuiLingXiao] local configData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",curData.activityId) @@ -621,6 +627,8 @@ function this.GetMissionData(indexType,actType) end if actType == ActivityTypeDef.DynamicAct_recharge or actType == ActivityTypeDef.AccumulativeRechargeExper then curData.rewards[i].value = actRewardConfigs[j].Values[1][1] + elseif actType == ActivityTypeDef.yaojingleichong or actType == ActivityTypeDef.xianjingleichong then + curData.rewards[i].value = actRewardConfigs[j].Values[1][2] else curData.rewards[i].value = actRewardConfigs[j].Values[2][1] end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 6ce5e27c45..8eaeda5870 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -34,7 +34,7 @@ function MissionPre:InitComponent() self.data = {} self.itemList = {} - if not self.moneyNum then + if not self.moneyNum then self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.type1.transform, 0, MoneyNumViewType.Image_Horizontal, "ArtFont_1_cfont", 42, 1, Vector2.New(46, 46), Vector2.New(0, -25), MoneyNumViewImageType.Small_1) end @@ -158,6 +158,14 @@ function MissionPre:SetContent1() -- self.scrollView.transform.localPosition = Vector3.New(-370,-9,0) self.upLayout.gameObject:SetActive(true) self:SetType1("累计充值",self.data.value,Language[10477].."("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")") + elseif self.actConfig.ActiveType == ActivityTypeDef.yaojingleichong or self.actConfig.ActiveType == ActivityTypeDef.xianjingleichong then + self.upLayout.gameObject:SetActive(true) + self.type1.gameObject:SetActive(true) + self.moneyNum.gameObject:SetActive(false) + local curNumText = "("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")" + local chongzhiName=self.actConfig.ActiveType == ActivityTypeDef.yaojingleichong and "妖晶" or "仙晶" + self.type1Text1.text = string.format("%s%d%s%s%s",Language[11377],self.data.value,chongzhiName,Language[10477],curNumText) + end end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 2bcbcd1db6..58b6d889bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -480,6 +480,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Slhj, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_YJLC, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_XJLC, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_YunYouMan, ActivityGiftManager.CheckYunYouManRedPoint) -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行