diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta new file mode 100644 index 0000000000..4241199926 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ShengXingYouLi/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8565114765606a47bb956272df0d13e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta new file mode 100644 index 0000000000..4fdf17ca14 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5f164d66e71c3046a84ec08e7876cec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png new file mode 100644 index 0000000000..140a3407e3 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta new file mode 100644 index 0000000000..d341a91fbb --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_banner.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5cc1c33c1d836034093a4f176f6bf4ce +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: a049eef8f51208e438d34e2eb2307a49 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png new file mode 100644 index 0000000000..0e9c4f0b5c Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta new file mode 100644 index 0000000000..5aa720091f --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: a56fd55d488984540b24b3cc61bf9b3b +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: 1481ae46f55449f4b83c86679a9166b3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png new file mode 100644 index 0000000000..cc00d7d09f Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta new file mode 100644 index 0000000000..652be56814 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: df0af59bfe29c3b4ab324cca556a1b17 +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: e190dacda045d6b409540a95f7d9665e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png new file mode 100644 index 0000000000..657dff2657 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta new file mode 100644 index 0000000000..263aabe229 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4b2f36db3e1e2b04785a97fc71f4bb6a +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: b2245269c9245cb4095ac5ba1b91ac1f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png new file mode 100644 index 0000000000..714d2aaaed Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta new file mode 100644 index 0000000000..1cc70e8f96 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi/s_suoxiangpimi_zi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: aeff2583cdd4d824b935ccb82a180e60 +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: 7d5e54f57be57a4459747fe4f35b97d4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta new file mode 100644 index 0000000000..6160cfb59a --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangYaoDuoBao/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48cee46354d3dc145af2bf55ced3fde2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png new file mode 100644 index 0000000000..da6ec7f345 Binary files /dev/null and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png.meta b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png.meta new file mode 100644 index 0000000000..e4298692b8 --- /dev/null +++ b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-suoxiangpimi.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d4403e1760278d341afaccbd1c62b30b +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: 490b6716945ebd6418c248ef271a0c71 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: MainAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta new file mode 100644 index 0000000000..0b655a6ac7 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_chou.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 85042cc6ab279fd45aff45e63617ba3a +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: 1c350d9a529efe4448048c19c8121d99 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta new file mode 100644 index 0000000000..a326e45ad9 --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_xinjianglaixi_duihuan.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: fe36762df3bdd83448a342d51008b637 +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: 7c6970e543acbdb46b5afba88ad8773d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + 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 e74c6e3645..abfdebac23 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -63,8 +63,8 @@ local tabs = { default = "t_tianxiangjiren_icon2", lock = "t_tianxiangjiren_icon2", select = "t_tianxiangjiren_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, - [15] = { --第十六周 降龙伏虎 - default = "x_xianglongfuhu_icon2", lock = "x_xianglongfuhu_icon2", select = "x_xianglongfuhu_icon1", + [15] = { --第十六周 所向披靡 + default = "s_suoxiangpimi_icon2", lock = "s_suoxiangpimi_icon2", select = "s_suoxiangpimi_icon1", rpType = RedPointType.DynamicActTask,panelType = PanelType.Main,ActType = ActivityTypeDef.DynamicAct }, [16] = { --第十七周 降龙伏虎 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index 497ccc29ec..5dcf23e95a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -20,6 +20,7 @@ local bannerType = { [12] = {compent = "bg1",titilebg1 = "b_bianhuanmoce_banner"}, [13] = {compent = "bg1",titilebg1 = "b_bowenduoshi_banner"}, [14] = {compent = "bg1",titilebg1 = "t_tianxiangjiren_banner"}, + [15] = {compent = "bg1",titilebg1 = "s_suoxiangpimi_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 ebb9c3556f..8ce02c8687 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -157,7 +157,7 @@ local activityType = { hero = { [1]={name="Bg2/hero1",id=10008,hero="b_bowenduoshi_shenjiang1"}, ----精卫 [2]={name="Bg2/hero2",id=10014,hero="c_ccfy_kuang01"}, ---哪吒 - [3]={name="Bg2/hero3",id=10013,hero="y_yishandaohai_shenjiang2"}, --吕洞宾 + [3]={name="Bg2/hero3",id=10002,hero="y_yishandaohai_shenjiang2"}, --吕洞宾 }, title = "b_bowenduoshi_zi", helptype = HELP_TYPE.TimeLimitedCall @@ -173,6 +173,17 @@ local activityType = { title = "t_tianxiangjiren_zi", helptype = HELP_TYPE.TimeLimitedCall }, + --博文多识 限时召唤 + [4315] = { + bg = "Bg2", + hero = { + [1]={name="Bg2/hero1",id=10003,hero="s_shibukedang_shenjiang1"}, ----哪吒 + [2]={name="Bg2/hero2",id=10043,hero="s_suoxiangpimi_shenjiang2"}, ---猪八戒 + [3]={name="Bg2/hero3",id=10002,hero="b_bianhuanmoce_shenjiang1"}, --洛神 + }, + 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 752197ac28..fea4bfded9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -64,6 +64,7 @@ local mainDynamicActivityIcon = { [12] = "r_zjm_huodongicon-bianhuanmoce", ----变幻莫测 [13] = "r_zjm_huodongicon-bowenduoshi", ----博文多识 [14] = "r_zjm_huodongicon-tianxiangjiren", ----天相吉人 + [15] = "r_zjm_huodongicon-suoxiangpimi", ----所向披靡 } function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}