diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi.meta new file mode 100644 index 0000000000..a65432fcdb --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a384edf206ac25748a014340c6820720 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg new file mode 100644 index 0000000000..bdf6c52141 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta new file mode 100644 index 0000000000..fbaee8d627 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_banner.jpg.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d6b0914474a59bc4a8fa970669f21b01 +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: 572b02d28840ccc40967d13c42e2039c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png new file mode 100644 index 0000000000..dc30ed91d2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta new file mode 100644 index 0000000000..be8abf420c --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: cbe2771aaa28d5941b3f5b41eaa7ed7b +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: 3aecb221347188c4a8985be91209c23b + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png new file mode 100644 index 0000000000..f6eeaeb481 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta new file mode 100644 index 0000000000..222bb2ed9b --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 8b2c21a41a3e9a542a7a5c167d248f4c +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: c1512493378dd0645992c82c74b5c9a0 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png new file mode 100644 index 0000000000..b7fe002c01 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta new file mode 100644 index 0000000000..f7e2a3a826 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 87a35d7849b39d0409ba032f025e1940 +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: 5448feb8b6bcbbe4189dcc30014fb3ea + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png new file mode 100644 index 0000000000..170d387610 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta new file mode 100644 index 0000000000..aff8b512dc --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a36b5320665dbd44aa519b4375f9fff5 +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: f2c0c971e93d7bf41b364a0aad51c9dc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png new file mode 100644 index 0000000000..f99d88a0a7 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta new file mode 100644 index 0000000000..f7f964b7c4 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_shenjiang3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b395e17e8fa680945a37aae9ae1465b7 +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: b82719859460c10488ac3151ed357069 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png new file mode 100644 index 0000000000..ce7d07dcee Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta new file mode 100644 index 0000000000..2ea74d3b3e --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TongQiangTieBi/t_tongqiangtiebi_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 01d6d7538b5306c4bb17aca42647b4d7 +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: e8ecb906c668f424a998c2ce14db3976 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png new file mode 100644 index 0000000000..f4d9e1e78c Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png.meta new file mode 100644 index 0000000000..edfdd15a87 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tongqiangtiebi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fb53ba7b06f85134a820df286063981c +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: 6d4ebec4160d2e34c8f4c333e961f5d5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index ce050f627c..80912845b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -71,8 +71,8 @@ local tabs = { default = "x_xialuxiangfeng_icon2", lock = "x_xialuxiangfeng_icon2", select = "x_xialuxiangfeng_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [17] = { --第十八周 降龙伏虎 - default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1", + [17] = { --第十八周 铜墙铁壁 + default = "t_tongqiangtiebi_icon2", lock = "t_tongqiangtiebi_icon2", select = "t_tongqiangtiebi_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, [18] = { --第十九周 降龙伏虎 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index b1daad25be..62409033e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -22,6 +22,7 @@ local bannerType = { [14] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner"}, [15] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_banner"}, [16] = {compent = "bg1",titilebg1 = "x_xialuxiangfeng_banner"}, + [17] = {compent = "bg1",titilebg1 = "t_tongqiangtiebi_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 540c3f1da1..4307984e84 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -195,6 +195,17 @@ local activityType = { title = "x_xialuxiangfeng_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --铜墙铁壁 限时召唤 + [4317] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10043,hero="t_tongqiangtiebi_shenjiang1"}, ----太阴星君 + [2]={name="Bg2/hero2",id=10019,hero="t_tongqiangtiebi_shenjiang2"}, ---巨灵神 + [3]={name="Bg2/hero3",id=10016,hero="t_tongqiangtiebi_shenjiang3"}, --蚩尤 + }, + title = "t_tongqiangtiebi_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 9185c55496..23df1450f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -66,6 +66,7 @@ local mainDynamicActivityIcon = { [14] = "r_zjm_huodongicon-tianxiangjiren", ----天相吉人 [15] = "r_zjm_huodongicon-suoxiangpimi", ----所向披靡 [16] = "r_zjm_huodongicon-xialuxiangfeng", ----狭路相逢 + [17] = "r_zjm_huodongicon-tongqiangtiebi", ----铜墙铁壁 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}