diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_beijin.jpg b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_beijin.jpg index 34827f24dd..e618fcda33 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_beijin.jpg and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_beijin.jpg differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_kuang.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_kuang.png index cee856ece1..db1674f2e9 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_kuang.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShenYiTianJiang/s_shenyitianjiang_kuang.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan.meta new file mode 100644 index 0000000000..da6d7e5445 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a522d68c12037b247a3f5a5a2f091a06 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png new file mode 100644 index 0000000000..5ff41cfe38 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png.meta new file mode 100644 index 0000000000..cd78affee8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 802024d2a3d9b8244b95e0fcdea88041 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e5c39bcaa2c8d9b428369f6533f73ec8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png new file mode 100644 index 0000000000..cdf1244078 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png.meta new file mode 100644 index 0000000000..9714872061 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6cc45565b31fe5247aecc76a045064c3 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f8314c35478b1454ebc37318bc52d7a0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png new file mode 100644 index 0000000000..1eab848173 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png.meta new file mode 100644 index 0000000000..c7415db8eb --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d315cb4fb0cf2624384c9038f429c914 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8379eb7f1bbac7a42982b43d08c16c5d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png new file mode 100644 index 0000000000..666f30beb9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png.meta new file mode 100644 index 0000000000..4b625deee7 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 7b6159c67de3b214eb1f2430bf5d2e36 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bdd5623ae61d706449c24428e80696f0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png new file mode 100644 index 0000000000..97c71882c9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png.meta new file mode 100644 index 0000000000..82620b8c1f --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_shenjiang3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c69eec75fddf83f459d90c4343dc5a98 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6a96464329ae2d04b9a40118b1e84d39 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png new file mode 100644 index 0000000000..7d0336f8ec Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png.meta new file mode 100644 index 0000000000..48a575a046 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XuanJiMiaoSuan/x_xuanjimiaosuan_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a88e81eaaac321a448e98c8e03e84926 +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 7cd67803abd16704aaa0468e442226f8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png new file mode 100644 index 0000000000..68aab3b07b Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png.meta new file mode 100644 index 0000000000..a4010f9089 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 80d29e9e97313874a83d5ae89ab8fc7a +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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6f8c25af4342b044eb56ef037bf4d684 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_huodong_dingguashenchu.png.meta b/Assets/ManagedResources/Icon/Item/r_huodong_dingguashenchu.png.meta new file mode 100644 index 0000000000..74f8bcc4fc --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_huodong_dingguashenchu.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5cd7c3f69b6845248bce0f27b6c627c9 +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: ab535fc9a6247d44aaa45d5bc533e610 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 5a273251b2..b5c629b0d7 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -29076,7 +29076,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &806215998379899667 RectTransform: m_ObjectHideFlags: 0 @@ -33516,7 +33516,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -458.15002, y: -0.000030517578} - m_SizeDelta: {x: 0, y: 178.2} + m_SizeDelta: {x: 78, y: 178.2} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1866614607429293979 MonoBehaviour: @@ -50958,7 +50958,7 @@ RectTransform: 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: 23.1, y: -339.5} + m_AnchoredPosition: {x: 23.1, y: -363.91} m_SizeDelta: {x: 916.3, y: 178.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2798425983373437117 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index e0ea2deaa9..2c96bd55b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -39,8 +39,8 @@ local tabs = { default = "y_yishandaohai_anniu_02", lock = "y_yishandaohai_anniu_02", select = "y_yishandaohai_anniu_01", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [9] = { --第十周 - default = "s_shibukedang_bicon1", lock = "s_shibukedang_bicon1", select = "s_shibukedang_bicon2", + [9] = { --第十周 玄机妙算 + default = "x_xuanjimiaosuan_icon2", lock = "x_xuanjimiaosuan_icon2", select = "x_xuanjimiaosuan_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, [10] = { --第十一周 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 0b8263029d..65e46ce793 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -14,6 +14,7 @@ local bannerType = { [6] = {compent = "bg1",titilebg1 = "s_yongwangzhiqian_banner"}, [7] = {compent = "bg1",titilebg1 = "y_yunchouweiwo_banner"}, [8] = {compent = "bg1",titilebg1 = "y_yishandaohai_banner"}, + [9] = {compent = "bg1",titilebg1 = "x_xuanjimiaosuan_banner"}, } local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) function DynamicTaskPage:ctor(mainPanel, gameObject) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 3dac480c26..5ba2e9fee9 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -96,7 +96,7 @@ local activityType = { title = "y_yunchouweiwo_zi", helptype = HELP_TYPE.TimeLimitedCall }, - --运筹帷幄 限时召唤 + --移山倒海 限时召唤 [4308] = { bg = "Bg2", hero = { @@ -107,6 +107,17 @@ local activityType = { title = "y_yishandaohai_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --玄机妙算 限时召唤 + [4309] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10003,hero="d_danxinbixue_shenjiang1"}, --猪八戒 + [2]={name="Bg2/hero2",id=10023,hero="x_xuanjimiaosuan_shenjiang2"}, --孙悟空 + [2]={name="Bg2/hero3",id=10041,hero="x_xuanjimiaosuan_shenjiang3"}, --通天教主 + }, + title = "x_xuanjimiaosuan_zi", + helptype = HELP_TYPE.TimeLimitedCall + }, } --type与lotterySetting表中的id对应 local btns={ [bType.Btn1]={name="btngroup/once",isInfo=Language[10644]}, [bType.Btn10]={name="btngroup/ten",isInfo=Language[12182]}} diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2fa8cf74bd..fdf1d133f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -58,6 +58,7 @@ local mainDynamicActivityIcon = { [6] = "r_zjm_huodongicon-yongwangzhiqian", ----勇往直前 [7] = "r_zjm_huodongicon-yunchouweiwo", ----运筹帷幄 [8] = "r_zjm_huodongicon-yishandaohai", ----移山倒海 + [9] = "r_zjm_huodongicon-xuanjimiaosuan", ----玄机妙算 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}