diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen.meta new file mode 100644 index 0000000000..c1d9187d18 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4418196ae164662449090ce4dd4b09d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png new file mode 100644 index 0000000000..621d58b203 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png.meta new file mode 100644 index 0000000000..357e89e025 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 236f93b545cdac946b7c20ca1987e283 +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: eea076da6433ebe428b69c9056a2e640 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png new file mode 100644 index 0000000000..f663f23109 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png.meta new file mode 100644 index 0000000000..a841cf1976 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 835007be1a121e94892816588b73f7ab +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: cd0dc53b09c185741993dc8823aa0c3f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png new file mode 100644 index 0000000000..e8cfcf2908 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png.meta new file mode 100644 index 0000000000..6c23cf0f8b --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e2ec0a77bc42b9345b919983727d428a +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: cc1a6dde1b9281e4782684676ff886b9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png new file mode 100644 index 0000000000..00b8f4952b Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png.meta new file mode 100644 index 0000000000..f759219d45 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4d17b6a2a2916b249b5b4d6cef5deefd +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: 58ab0c00471ee3047803744a10fcc84c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png new file mode 100644 index 0000000000..75964261ed Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png.meta new file mode 100644 index 0000000000..11b89d3a45 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a8a2f43df80efb840b237db1a9f745b7 +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: 2e1bac262930dad439d5c48b9648057f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png new file mode 100644 index 0000000000..22dad505cc Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png.meta new file mode 100644 index 0000000000..945bbdb899 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_shenjiang3.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 364c89339b638704b99c18e4cf637eff +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: 79d7455ce93f87e43b7f2d4d9fd27227 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png new file mode 100644 index 0000000000..24e178ef2e Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png.meta new file mode 100644 index 0000000000..60ee57a57f --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/TianXiangJiRen/t_tianxiangjiren_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 10848f96fba0eba41a567ab9ad5a9fd8 +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: 81226d7ee61354d409cf93c8f400772d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png new file mode 100644 index 0000000000..da82dcd19f Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png.meta new file mode 100644 index 0000000000..c3e6fb84ff --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-tianxiangjiren.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: b33dbeffd3af3984d9bff8e55577cff2 +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: afae77cf277304e42bd9efe9edd5649c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta new file mode 100644 index 0000000000..b53fe0b3a6 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_01.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 696df8709a12455479a651a73fe7a03b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta new file mode 100644 index 0000000000..3095c03d09 --- /dev/null +++ b/Assets/ManagedResources/Audio/Skill/skill/Audio_100912bgj_exskill_02.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cca5442cd3995a846bb82edb43d34dc5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index a44740d4c6..e74c6e3645 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -59,8 +59,8 @@ local tabs = { default = "b_bowenduoshi_icon2", lock = "b_bowenduoshi_icon2", select = "b_bowenduoshi_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [14] = { --第十五周 降龙伏虎 - default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1", + [14] = { --第十五周 天相几人 + default = "t_tianxiangjiren_icon2", lock = "t_tianxiangjiren_icon2", select = "t_tianxiangjiren_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, [15] = { --第十六周 降龙伏虎 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index ddb2707f7a..497ccc29ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -19,6 +19,7 @@ local bannerType = { [11] = {compent = "bg1",titilebg1 = "q_qikaidesheng_banner"}, [12] = {compent = "bg1",titilebg1 = "b_bianhuanmoce_banner"}, [13] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner"}, + [14] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_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 c6cd7dab79..6bd0d81037 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -162,6 +162,17 @@ local activityType = { title = "b_bowenduoshi_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --博文多识 限时召唤 + [4314] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10087,hero="t_tianxiangjiren_shenjiang1"}, ----娥皇 + [2]={name="Bg2/hero2",id=10043,hero="c_ccfy_kuang01"}, ---太阴星君 + [3]={name="Bg2/hero3",id=10033,hero="y_yishandaohai_shenjiang2"}, --净光天女 + }, + title = "t_tianxiangjiren_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 f61fd01c06..752197ac28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -63,6 +63,7 @@ local mainDynamicActivityIcon = { [11] = "r_zjm_huodongicon-qikaidesheng", ----旗开得胜 [12] = "r_zjm_huodongicon-bianhuanmoce", ----变幻莫测 [13] = "r_zjm_huodongicon-bowenduoshi", ----博文多识 + [14] = "r_zjm_huodongicon-tianxiangjiren", ----天相吉人 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}